fix: include instance id on server seed data (#757)

* fix: include instance id on server seed data * fix: wallet address detail of unlockable content * fix: fixed testing
myriadsocial · Feb 1, 2023 · b12c558 · b12c558
1 parent 5624fe7
commit b12c558
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/seed-data/server.json b/seed-data/server.json
@@ -1,4 +1,5 @@
 {
+  "id": 0,
   "name": "Instance",
   "sourceImageFileName": "profile",
   "targetImagePath": "general/servers",

diff --git a/src/__tests__/acceptance/unlockable-content.acceptance.ts b/src/__tests__/acceptance/unlockable-content.acceptance.ts
@@ -72,6 +72,10 @@ describe('UnlockableContentApplication', () => {
     await unlockableContentRepository.deleteAll();
   });
 
+  afterEach(async () => {
+    await serverRepository.deleteAll();
+  });
+
   after(async () => {
     await deleteAllRepository(app);
   });

diff --git a/src/__tests__/helpers/given-instances.ts b/src/__tests__/helpers/given-instances.ts
@@ -849,6 +849,7 @@ export function givenServer(server?: Partial<Server>) {
 
   const data = Object.assign(
     {
+      id: 0,
       name: 'Myriad Social',
       serverImageURL: 'https://image.com/myriad-logo.svg',
       description: 'Welcome to myriad social',

diff --git a/src/application.ts b/src/application.ts
@@ -468,6 +468,7 @@ export class MyriadApiApplication extends BootMixin(
             }
 
             const accountId = {myriad: address};
+            const serverId = data.id;
             const serverName =
               data.name === 'Instance'
                 ? `${data.name} ${Math.floor(Math.random() * 1000)}`
@@ -488,6 +489,7 @@ export class MyriadApiApplication extends BootMixin(
             const rawServer = Object.assign(
               omit(data, ['sourceImageFileName', 'targetImagePath']),
               {
+                id: serverId,
                 name: serverName,
                 serverImageURL: serverImageURL,
                 accountId: {

diff --git a/src/models/server.model.ts b/src/models/server.model.ts
@@ -13,12 +13,10 @@ export class Server extends Entity {
   @property({
     type: 'string',
     id: true,
-    generated: true,
-    mongodb: {
-      dataType: 'ObjectId',
-    },
+    generated: false,
+    required: true,
   })
-  id?: string;
+  id: number;
 
   @property({
     type: 'string',

diff --git a/src/services/wallet-address.service.ts b/src/services/wallet-address.service.ts
@@ -245,7 +245,10 @@ export class WalletAddressService {
     const tipsBalanceInfo = {
       serverId: serverId,
       referenceType: referenceType,
-      referenceId: referenceId,
+      referenceId:
+        referenceType === ReferenceType.UNLOCKABLECONTENT
+          ? `${server.id}/${referenceId}`
+          : referenceId,
     };
 
     return tipsBalanceInfo;