fix: get trust relationships issue

Greenstand · May 21, 2024 · 585b2be · 585b2be
1 parent e563a49
commit 585b2be
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 78 deletions.
diff --git a/server/models/Trust.js b/server/models/Trust.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 const Joi = require('joi');
 const log = require('loglevel');
 const TrustRepository = require('../repositories/TrustRepository');
@@ -49,35 +48,7 @@ class Trust {
     if (request_type) {
       filter.and.push({ request_type });
     }
-    return this._trustRepository.getByFilter(filter, { offset, limit });
-  }
-
-  /*
-   * Get all trust relationships by filters, setting filter to undefined to allow all data
-   */
-  async getAllTrustRelationships({
-    walletId,
-    state,
-    type,
-    request_type,
-    offset,
-    limit,
-    sort_by,
-    order,
-  }) {
-    const filter = {
-      and: [{ 'originator_wallet.id': walletId }],
-    };
-    if (state) {
-      filter.and.push({ state });
-    }
-    if (type) {
-      filter.and.push({ type });
-    }
-    if (request_type) {
-      filter.and.push({ request_type });
-    }
-    return this._trustRepository.getAllByFilter(filter, {
+    return this._trustRepository.getByFilter(filter, {
       offset,
       limit,
       sort_by,

diff --git a/server/services/TrustService.js b/server/services/TrustService.js
@@ -3,6 +3,8 @@ const Session = require('../infra/database/Session');
 const WalletService = require('./WalletService');
 const EventService = require('./EventService');
 const EventEnums = require('../utils/event-enum');
+const HttpError = require('../utils/HttpError');
+const Wallet = require('../models/Wallet');
 
 class TrustService {
   constructor() {
@@ -13,12 +15,22 @@ class TrustService {
 
   async getTrustRelationships(
     loggedInWalletId,
-    { walletId, state, type, request_type, offset, limit,sort_by, order },
+    { walletId, state, type, request_type, offset, limit, sort_by, order },
   ) {
     // check if wallet exists first
     // throws error if no wallet matching walletId exists
     const walletService = new WalletService();
-    await walletService.getWallet(loggedInWalletId, walletId);
+    const hasControl = await walletService.hasControlOver(
+      loggedInWalletId,
+      walletId,
+    );
+
+    if (!hasControl) {
+      throw new HttpError(
+        422,
+        'You do not have permission to update this wallet',
+      );
+    }
 
     return this._trust.getTrustRelationships({
       walletId,
@@ -28,31 +40,48 @@ class TrustService {
       offset,
       limit,
       sort_by,
-      order
+      order,
     });
   }
 
-  async getAllTrustRelationships({
-    walletId,
-    state,
-    type,
-    request_type,
-    offset,
-    limit,
-    sort_by,
-    order,
-
-  }) {
-    return this._trust.getAllTrustRelationships({
+  // limit and offset not feasible using the current implementation
+  // except if done manually or coming up with a single query
+  async getAllTrustRelationships({ walletId, state, type, request_type }) {
+    const walletModel = new Wallet(this._session);
+    const { wallets } = await walletModel.getAllWallets(
       walletId,
-      state,
-      type,
-      request_type,
-      offset,
-      limit,
-      sort_by,
-      order
+      undefined,
+      undefined,
+      'created_at',
+      'desc',
+    );
+
+    const alltrustRelationships = [];
+
+    await Promise.all(
+      wallets.map(async (w) => {
+        const trustRelationships = await this.getTrustRelationships({
+          walletId: w.id,
+          state,
+          type,
+          request_type,
+        });
+        alltrustRelationships.push(...trustRelationships);
+      }),
+    );
+
+    // remove possible duplicates
+    const ids = {};
+    const finalTrustRelationships = [];
+
+    alltrustRelationships.forEach((tr) => {
+      if (!ids[tr.id]) {
+        finalTrustRelationships.push(tr);
+        ids[tr.id] = 1;
+      }
     });
+
+    return finalTrustRelationships;
   }
 
   async createTrustRelationship({

diff --git a/server/services/TrustService.spec.js b/server/services/TrustService.spec.js
@@ -5,6 +5,7 @@ const TrustService = require('./TrustService');
 const WalletService = require('./WalletService');
 const Trust = require('../models/Trust');
 const EventService = require('./EventService');
+const Wallet = require('../models/Wallet');
 
 const { expect } = chai;
 
@@ -29,6 +30,10 @@ describe('TrustService', () => {
       .stub(WalletService.prototype, 'getWallet')
       .resolves({ id: 'walletId' });
 
+    const hasControlOverStub = sinon
+      .stub(WalletService.prototype, 'hasControlOver')
+      .resolves(true);
+
     const trustRelationship = await trustService.getTrustRelationships(
       authenticatedWalletId,
       {
@@ -58,9 +63,15 @@ describe('TrustService', () => {
         limit: 1,
         offset: 0,
         sort_by: 'sort_by',
-        order: 'order'
+        order: 'order',
       }),
     ).eql(true);
+    expect(
+      hasControlOverStub.calledOnceWithExactly(
+        authenticatedWalletId,
+        'walletId',
+      ),
+    ).eql(true);
   });
 
   it('acceptTrustRequestSentToMe', async () => {
@@ -189,39 +200,67 @@ describe('TrustService', () => {
   });
 
   it('getAllTrustRelationships', async () => {
-    const data = {
-      result: [
+    const getAllWalletsStub = sinon
+      .stub(Wallet.prototype, 'getAllWallets')
+      .resolves({ wallets: [{ id: 'id1' }, { id: 'id2' }] });
+    const getTrustRelationshipsStub = sinon.stub(
+      TrustService.prototype,
+      'getTrustRelationships',
+    );
+    getTrustRelationshipsStub
+      .onFirstCall()
+      .resolves([
         { id: 'trustId1' },
         { id: 'trustId2' },
         { id: 'trustId3' },
         { id: 'trustId4' },
-      ],
-      count: 4,
-    };
-
-    const getAllTrustRelationshipsStub = sinon.stub(
-      TrustService.prototype,
-      'getAllTrustRelationships',
-    );
-    getAllTrustRelationshipsStub.resolves(data);
+      ]);
+    getTrustRelationshipsStub
+      .onSecondCall()
+      .resolves([
+        { id: 'trustId1' },
+        { id: 'trustId2' },
+        { id: 'trustId5' },
+        { id: 'trustId6' },
+      ]);
 
     const trustRelationships = await trustService.getAllTrustRelationships({
-      state: 'requested',
-      type: 'send',
-      request_type: 'send',
-      limit: 10,
-      offset: 0,
+      walletId: 'walletId',
+      state: 'state',
+      type: 'type',
+      request_type: 'request_type',
     });
-
-    expect(trustRelationships).eql(data);
-
+    expect(trustRelationships).eql([
+      { id: 'trustId1' },
+      { id: 'trustId2' },
+      { id: 'trustId3' },
+      { id: 'trustId4' },
+      { id: 'trustId5' },
+      { id: 'trustId6' },
+    ]);
     expect(
-      getAllTrustRelationshipsStub.calledWithExactly({
-        state: 'requested',
-        type: 'send',
-        request_type: 'send',
-        limit: 10,
-        offset: 0,
+      getAllWalletsStub.calledOnceWithExactly(
+        'walletId',
+        undefined,
+        undefined,
+        'created_at',
+        'desc',
+      ),
+    ).eql(true);
+    expect(
+      getTrustRelationshipsStub.getCall(0).calledWithExactly({
+        walletId: 'id1',
+        state: 'state',
+        type: 'type',
+        request_type: 'request_type',
+      }),
+    ).eql(true);
+    expect(
+      getTrustRelationshipsStub.getCall(1).calledWithExactly({
+        walletId: 'id2',
+        state: 'state',
+        type: 'type',
+        request_type: 'request_type',
       }),
     ).eql(true);
   });