Update addon service models

CenterForOpenScience · Nov 21, 2023 · 5d1c565 · 5d1c565
1 parent af7a64e
commit 5d1c565
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/app/models/authorized-storage-account.ts b/app/models/authorized-storage-account.ts
@@ -4,12 +4,14 @@ import InternalUserModel from './internal-user';
 import OsfModel from './osf-model';
 
 export default class AuthorizedStorageAccountModel extends OsfModel {
-    @attr('fixstring') storageProvider!: string;
     @attr('fixstring') externalUserId!: string;
     @attr('fixstring') externalUserDisplayName!: string;
     @attr('fixstringarray') scopes!: string[];
     @attr('fixstring') defaultRootFolder!: string;
 
+    @belongsTo('storage-addon-provider')
+    storageProvider!: AsyncBelongsTo<AuthorizedStorageAccountModel> & AuthorizedStorageAccountModel;
+
     @belongsTo('internal-user', { inverse: 'authorizedStorageAccounts' })
     configuringUser!: AsyncBelongsTo<InternalUserModel> & InternalUserModel;
 }

diff --git a/app/models/configured-storage-addon.ts b/app/models/configured-storage-addon.ts
@@ -1,16 +1,19 @@
 import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';
-import InternalResourceModel from 'ember-osf-web/models/internal-resource';
-import InternalUserModel from 'ember-osf-web/models/internal-user';
 
-import OsfModel from './osf-model';
 import AuthorizedStorageAccountModel from './authorized-storage-account';
+import InternalResourceModel from './internal-resource';
+import InternalUserModel from './internal-user';
+import OsfModel from './osf-model';
+import StorageAddonProviderModel from './storage-addon-provider';
 
 export default class ConfiguredStorageAddonModel extends OsfModel {
-    @attr('fixstring') storageProvider!: string;
     @attr('fixstring') externalUserId!: string;
     @attr('fixstring') externalUserDisplayName!: string;
     @attr('fixstring') rootFolder!: string;
 
+    @belongsTo('storage-addon-provider')
+    storageProvider!: AsyncBelongsTo<StorageAddonProviderModel> & StorageAddonProviderModel;
+
     @belongsTo('internal-user', { inverse: 'configuredResources' })
     accountOwner!: AsyncBelongsTo<InternalUserModel> & InternalUserModel;
 

diff --git a/mirage/factories/authorized-storage-account.ts b/mirage/factories/authorized-storage-account.ts
@@ -3,16 +3,14 @@ import faker from 'faker';
 
 import AuthorizedStorageAccountModel from 'ember-osf-web/models/authorized-storage-account';
 
-import Addons from '../fixtures/addons';
-
 export default Factory.extend<AuthorizedStorageAccountModel>({
-    storageProvider: faker.random.arrayElement(Addons).id,
     externalUserId: faker.random.uuid(),
     externalUserDisplayName: faker.name.findName(),
     scopes: [],
     defaultRootFolder: faker.system.filePath(),
 
     configuringUser: belongsTo('internal-user'),
+    storageProvider: belongsTo('storage-addon-provider'),
 });
 
 declare module 'ember-cli-mirage/types/registries/model' {

diff --git a/mirage/factories/configured-storage-addon.ts b/mirage/factories/configured-storage-addon.ts
@@ -3,17 +3,15 @@ import faker from 'faker';
 
 import ConfiguredStorageAddonModel from 'ember-osf-web/models/configured-storage-addon';
 
-import Addons from '../fixtures/addons';
-
 export default Factory.extend<ConfiguredStorageAddonModel>({
-    storageProvider: faker.random.arrayElement(Addons).id,
     externalUserId: faker.random.uuid(),
     externalUserDisplayName: faker.name.findName(),
     rootFolder: faker.system.filePath(),
 
     accountOwner: belongsTo('internal-user'),
     authorizedResource: belongsTo('internal-resource'),
     baseAccount: belongsTo('authorized-storage-account'),
+    storageProvider: belongsTo('storage-addon-provider'),
 });
 
 declare module 'ember-cli-mirage/types/registries/model' {