feat: removed getcount param for transfers

Greenstand · Aug 10, 2023 · c459281 · c459281
1 parent 2aa9127
commit c459281
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/server/handlers/transferHandler/index.js b/server/handlers/transferHandler/index.js
@@ -95,7 +95,14 @@ const transferIdGet = async (req, res) => {
  req.params.transfer_id,
  req.wallet_id,
  );
- res.json(result);
+
+ const modifiedTransfer = {
+ ...result,
+ token_count:
+ +result.parameters?.bundle?.bundleSize || +result.parameters?.tokens?.length,
+ }
+
+ res.json(modifiedTransfer);
 };
 
 const transferIdTokenGet = async (req, res) => {

diff --git a/server/models/Transfer.js b/server/models/Transfer.js
@@ -26,20 +26,20 @@ class Transfer {
  return transferObjectCopy;
  }
 
- async getByFilter(filter, limitOptions, getCount) {
- const {count, result} = await this._transferRepository.getByFilter(
+ async getByFilter(filter, limitOptions) {
+ const {result, count} = await this._transferRepository.getByFilter(
  filter,
  limitOptions,
- getCount
  );
 
+
  const transfers = result.map((t) => this.constructor.removeWalletIds(t));
 
  return { transfers, count }
  }
 
  async getById({ transferId, walletLoginId }) {
- const transfers = await this.getTransfers({ walletLoginId, transferId });
+ const {transfers} = await this.getTransfers({ walletLoginId, transferId });
  return transfers[0];
  }
 
@@ -65,7 +65,6 @@ class Transfer {
  transferId,
  before,
  after,
- getCount
  }) {
  const filter = {
  and: [],
@@ -98,7 +97,7 @@ class Transfer {
  if (after) {
  filter.and.push({ after: { 'transfer.created_at': after } });
  }
- return this.getByFilter(filter, { offset, limit }, getCount);
+ return this.getByFilter(filter, { offset, limit });
  }
 
  /*

diff --git a/server/repositories/TransferRepository.js b/server/repositories/TransferRepository.js
@@ -93,7 +93,7 @@ class TransferRepository extends BaseRepository {
  return transfer;
  }
 
- async getByFilter(filter, limitOptions, getCount) {
+ async getByFilter(filter, limitOptions) {
  let promise = this._session
  .getDB()
  .select(
@@ -136,10 +136,7 @@ class TransferRepository extends BaseRepository {
  const result = await promise;
  Joi.assert(result, Joi.array().required());
 
- if (getCount)
- return { result, count: +count[0].count };
-
- return result;
+ return { result, count: +count[0].count };
  }
 
  async getPendingTransfers(wallet_id) {

diff --git a/server/services/TransferService.js b/server/services/TransferService.js
@@ -13,7 +13,7 @@ class TransferService {
  }
 
  async getByFilter(query, walletLoginId) {
- const { state, wallet, limit, offset, before, after, getCount = true } = query;
+ const { state, wallet, limit, offset, before, after } = query;
 
  let walletId;
 
@@ -29,8 +29,7 @@ class TransferService {
  limit,
  walletLoginId,
  before,
- after,
- getCount
+ after
  });