fix: bug fix and removed commented blocks

Greenstand · Sep 16, 2023 · 1074b69 · 1074b69
1 parent 1320bf3
commit 1074b69
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/server/models/Transfer.js b/server/models/Transfer.js
@@ -375,6 +375,10 @@ class Transfer {
  } else {
  log.debug('transfer tokens');
  const tokens = await this._token.getTokensByPendingTransferId(transferId);
+ // expect(transfer).match({
+ // source_wallet_id: expect.any(String),
+ // });
+
  Joi.assert(
  transfer,
  Joi.object({

diff --git a/server/models/Trust.js b/server/models/Trust.js
@@ -369,6 +369,10 @@ class Trust {
  * target wallet
  */
  async hasTrust(walletLoginId, trustType, senderWallet, receiveWallet) {
+ // expect(trustType).oneOf(
+ // Object.keys(TrustRelationshipEnums.ENTITY_TRUST_REQUEST_TYPE),
+ // );
+
  Joi.assert(
  trustType,
  Joi.string().valid(

diff --git a/server/repositories/BaseRepository.js b/server/repositories/BaseRepository.js
@@ -99,6 +99,11 @@ class BaseRepository {
  .count()
  .table(this._tableName)
  .where(filter);
+ // expect(result).match([
+ // {
+ // count: expect.any(String),
+ // },
+ // ]);
 
  Joi.assert(
  result,
@@ -156,6 +161,7 @@ class BaseRepository {
  .getDB()
  .batchInsert(this._tableName, objects)
  .returning('id');
+ // expect(result).match([expect.any(String)]);
  Joi.assert(result, Joi.array().items(Joi.string()));
  return result;
  }

diff --git a/server/repositories/TokenRepository.js b/server/repositories/TokenRepository.js
@@ -9,20 +9,6 @@ class TokenRepository extends BaseRepository {
  this._session = session;
  }
 
- // async getById(id) {
- // const result = await this._session
- // .getDB()(this._tableName)
- // .where('id', id)
- // .first();
- // expect(
- // result,
- // () => new HttpError(404, `can not found token by id:${id}`),
- // ).match({
- // id: expect.any(String),
- // });
- // return result;
- // }
-
  async getById(id) {
  Joi.assert(id, Joi.string().uuid());
 
@@ -31,12 +17,7 @@ class TokenRepository extends BaseRepository {
  .where('id', id)
  .first();
 
- try {
- Joi.assert(
- result,
- Joi.object({ id: Joi.string().required() }).unknown().required(),
- );
- } catch (error) {
+ if (!result) {
  throw new HttpError(404, `can not found token by id:${id}`);
  }
 

diff --git a/server/repositories/TransferRepository.js b/server/repositories/TransferRepository.js
@@ -45,6 +45,10 @@ class TransferRepository extends BaseRepository {
  'destination_wallet.id',
  );
 
+ // expect(result[0]).match({
+ // id: expect.anything(),
+ // });
+
  Joi.assert(
  result[0],
  Joi.object({