mirage updates

CenterForOpenScience · Aug 25, 2023 · b9ec4dd · b9ec4dd
1 parent ae03b73
commit b9ec4dd
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 9 deletions.
diff --git a/app/models/contributor.ts b/app/models/contributor.ts
@@ -3,6 +3,7 @@ import { not } from '@ember/object/computed';
 import { buildValidations, validator } from 'ember-cp-validations';
 
 import DraftRegistrationModel from './draft-registration';
+import PreprintModel from './preprint';
 import NodeModel from './node';
 import OsfModel, { Permission } from './osf-model';
 import UserModel from './user';
@@ -53,6 +54,9 @@ export default class ContributorModel extends OsfModel.extend(Validations) {
     @belongsTo('node', { inverse: 'contributors', polymorphic: true })
     node!: AsyncBelongsTo<NodeModel> & NodeModel;
 
+    @belongsTo('preprint', { inverse: 'contributors'})
+    preprint!: AsyncBelongsTo<PreprintModel> & PreprintModel;
+
     @belongsTo('draft-registration', { inverse: 'contributors' })
     draftRegistration!: AsyncBelongsTo<DraftRegistrationModel> & DraftRegistrationModel;
 

diff --git a/app/models/preprint.ts b/app/models/preprint.ts
@@ -25,7 +25,7 @@ export default class PreprintModel extends OsfModel {
     @attr('date') dateLastTransitioned!: Date;
     @attr('date') preprintDoiCreated!: Date;
 
-    @belongsTo('node', { inverse: 'preprints' })
+    @belongsTo('node', { inverse: 'preprint' })
     node!: AsyncBelongsTo<NodeModel> & NodeModel;
 
     @belongsTo('license', { inverse: null })
@@ -40,8 +40,8 @@ export default class PreprintModel extends OsfModel {
     @hasMany('review-action', { inverse: 'target' })
     reviewActions!: AsyncHasMany<ReviewActionModel>;
 
-    @hasMany('contributor')
-    contributors!: AsyncHasMany<ContributorModel>;
+    @hasMany('contributors', { inverse: 'preprint'})
+    contributors!: AsyncHasMany<ContributorModel> & ContributorModel;
 
     @hasMany('subject', { inverse: null, async: false })
     subjects!: SyncHasMany<SubjectModel>;

diff --git a/app/preprints/detail/controller.ts b/app/preprints/detail/controller.ts
@@ -114,8 +114,8 @@ export default class PrePrintsDetailController extends Controller {
         return this.model.subjects.reduce((acc: SubjectModel[], val: SubjectModel) => acc.concat(val), []).uniqBy('id');
     }
 
-    authors(): ContributorModel[] {
-        return this.model.preprint.contributors;
+    get authors(): ContributorModel[] {
+        return this.model.contributors;
     }
 
     fullLicenseText(): string {

diff --git a/app/preprints/detail/route.ts b/app/preprints/detail/route.ts
@@ -49,7 +49,7 @@ export default class PreprintsDetail extends Route {
             this.theme.set('id', provider.id);
 
 
-            // const contributors = await preprint?.queryHasMany('contributors');
+            const contributors = await preprint?.queryHasMany('contributors');
 
             // const license = await preprint?.queryHasMany('license');
 
@@ -63,6 +63,7 @@ export default class PreprintsDetail extends Route {
 
             return {
                 preprint,
+                contributors,
             };
 
         } catch (error) {

diff --git a/mirage/config.ts b/mirage/config.ts
@@ -304,7 +304,17 @@ export default function(this: Server) {
         path: '/providers/preprints/:parentID/preprints/',
         relatedModelName: 'preprint',
     });
+
+    /**
+     * Preprint Details
+     */
+
     osfResource(this, 'preprint');
+    osfNestedResource(this, 'preprint', 'contributors', {
+        path: '/preprints/:parentID/contributors/',
+        defaultSortKey: 'index',
+        relatedModelName: 'contributor',
+    });
 
 
     osfResource(this, 'registration-provider', { path: '/providers/registrations' });

diff --git a/mirage/factories/preprint.ts b/mirage/factories/preprint.ts
@@ -9,6 +9,18 @@ export default Factory.extend<PreprintModel>({
     id: guid('preprint'),
     afterCreate(newPreprint, server) {
         guidAfterCreate(newPreprint, server);
+
+        const contributorUser = server.create('user');
+
+        const contributor = server.create('contributor', {
+            preprint: newPreprint,
+            users: contributorUser,
+            index: 0,
+        });
+
+        newPreprint.update({
+            contributors: [contributor],
+        });
     },
 
     title: faker.lorem.sentence(),

diff --git a/mirage/serializers/contributor.ts b/mirage/serializers/contributor.ts
@@ -15,9 +15,15 @@ type MirageContributor = Contributor & { attrs: ContributorAttrs };
 
 export default class ContributorSerializer extends ApplicationSerializer<MirageContributor> {
     buildNormalLinks(model: ModelInstance<MirageContributor>) {
-        const url = model.node
-            ? `${apiUrl}/v2/nodes/${model.node.id}/contributors/${model.id}`
-            : `${apiUrl}/v2/draft_registrations/${model.draftRegistration.id}/contributors/${model.id}`;
+        let url = '';
+        if(model.node) {
+            url = `${apiUrl}/v2/nodes/${model.node.id}/contributors/${model.id}`;
+        } else if (model.preprint) {
+            url = `${apiUrl}/v2/preprints/${model.preprint.id}/contributors/${model.id}`;
+        } else  {
+            url = `${apiUrl}/v2/draft_registrations/${model.draftRegistration.id}/contributors/${model.id}`;
+        }
+
         return {
             self: url,
         };

diff --git a/mirage/serializers/preprint.ts b/mirage/serializers/preprint.ts
@@ -22,6 +22,13 @@ export default class PreprintSerializer extends ApplicationSerializer<PreprintMo
                     },
                 },
             },
+            contributors: {
+                links: {
+                    related: {
+                        href: `${apiUrl}/v2/preprints/${model.id}/contributors`,
+                    },
+                },
+            },
             /*
             subjects: {
                 links: {