Merge pull request #7982 from Turbo87/fix-inviter-column

Fix "Invited by" column
rust-lang · Jan 23, 2024 · 50aa541 · 50aa541
2 parents eb5eaf2 + 548e0b4
commit 50aa541
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/app/components/pending-owner-invite-row.hbs b/app/components/pending-owner-invite-row.hbs
@@ -19,8 +19,8 @@
     </div>
     <div>
       Invited by:
-      <LinkTo @route="user" @model={{@invite.invited_by_username}} data-test-inviter-link>
-        {{@invite.invited_by_username}}
+      <LinkTo @route="user" @model={{@invite.inviter.login}} data-test-inviter-link>
+        {{@invite.inviter.login}}
       </LinkTo>
     </div>
     <div local-class="date-column" data-test-date>

diff --git a/app/models/crate-owner-invite.js b/app/models/crate-owner-invite.js
@@ -1,9 +1,10 @@
-import Model, { attr } from '@ember-data/model';
+import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class CrateOwnerInvite extends Model {
-  @attr invited_by_username;
   @attr crate_name;
   @attr crate_id;
   @attr('date') created_at;
   @attr accepted;
+  @belongsTo('user', { async: false, inverse: null }) invitee;
+  @belongsTo('user', { async: false, inverse: null }) inviter;
 }
diff --git a/app/serializers/crate-owner-invite.js b/app/serializers/crate-owner-invite.js
@@ -3,19 +3,19 @@ import ApplicationSerializer from './application';
 export default class CrateOwnerInviteSerializer extends ApplicationSerializer {
   primaryKey = 'crate_id';
 
-  modelNameFromPayloadKey() {
+  modelNameFromPayloadKey(payloadKey) {
+    if (payloadKey === 'users') return 'user';
     return 'crate-owner-invite';
   }
 
   payloadKeyFromModelName() {
     return 'crate_owner_invite';
   }
 
-  normalizeResponse(store, schema, payload, id, requestType) {
-    if (payload.users) {
-      delete payload.users;
-    }
-
-    return super.normalizeResponse(store, schema, payload, id, requestType);
+  keyForRelationship(key) {
+    // Ember Data expects e.g. an `inviter` key in the payload, but the backend
+    // uses `inviter_id` instead. This method makes sure that Ember Data can
+    // find the correct relationship.
+    return `${key}_id`;
   }
 }
diff --git a/mirage/serializers/crate-owner-invitation.js b/mirage/serializers/crate-owner-invitation.js
@@ -31,8 +31,5 @@ export default BaseSerializer.extend({
 
     hash.invitee_id = Number(hash.invitee_id);
     hash.inviter_id = Number(hash.inviter_id);
-
-    let inviter = this.schema.users.find(hash.inviter_id);
-    hash.invited_by_username = inviter.login;
   },
 });
diff --git a/tests/mirage/me/crate-owner-invitations/list-test.js b/tests/mirage/me/crate-owner-invitations/list-test.js
@@ -52,15 +52,13 @@ module('Mirage | GET /api/v1/me/crate_owner_invitations', function (hooks) {
           crate_id: Number(nanomsg.id),
           crate_name: 'nanomsg',
           created_at: '2016-12-24T12:34:56Z',
-          invited_by_username: 'janed',
           invitee_id: Number(user.id),
           inviter_id: Number(inviter.id),
         },
         {
           crate_id: Number(ember.id),
           crate_name: 'ember-rs',
           created_at: '2020-12-31T12:34:56Z',
-          invited_by_username: 'wycats',
           invitee_id: Number(user.id),
           inviter_id: Number(inviter2.id),
         },

diff --git a/tests/mirage/private/crate-owner-invitations/get-test.js b/tests/mirage/private/crate-owner-invitations/get-test.js
@@ -43,15 +43,13 @@ module('Mirage | GET /api/private/crate_owner_invitations', function (hooks) {
           crate_id: Number(nanomsg.id),
           crate_name: 'nanomsg',
           created_at: '2016-12-24T12:34:56Z',
-          invited_by_username: 'janed',
           invitee_id: Number(user.id),
           inviter_id: Number(inviter.id),
         },
         {
           crate_id: Number(ember.id),
           crate_name: 'ember-rs',
           created_at: '2020-12-31T12:34:56Z',
-          invited_by_username: 'wycats',
           invitee_id: Number(user.id),
           inviter_id: Number(inviter2.id),
         },
@@ -159,7 +157,6 @@ module('Mirage | GET /api/private/crate_owner_invitations', function (hooks) {
           crate_id: Number(ember.id),
           crate_name: 'ember-rs',
           created_at: '2020-12-31T12:34:56Z',
-          invited_by_username: 'wycats',
           invitee_id: Number(user.id),
           inviter_id: Number(inviter2.id),
         },