Merge pull request #329 from dadiorchen/issue328

feat: neartest wallet case
Greenstand · Jun 4, 2023 · cde628f · cde628f
2 parents f97f53e + 8e1182a
commit cde628f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -12,6 +12,7 @@ module.exports = {
 
   rules: {
     // disabled or modified because too strict
+    'no-nested-ternary': 'off',
     'no-restricted-globals': 'warn',
     'no-console': ['warn', { allow: ['info', 'error'] }],
     'import/prefer-default-export': 'off',

diff --git a/server/infra/database/GisRepository.ts b/server/infra/database/GisRepository.ts
@@ -63,7 +63,9 @@ export default class GisRepository {
     active = true
   ${
     params.wallet_id
-      ? `and (wallet.token.wallet_id::text = '${params.wallet_id}' or wallet.wallet.name = '${params.wallet_id}')`
+      ? /[0-9a-f-]{36}/.test(params.wallet_id)
+        ? `and wallet.token.wallet_id = '${params.wallet_id}' `
+        : `and wallet.wallet.name = '${params.wallet_id}'`
       : ''
   }
   ${params.planter_id ? `and planter_id = ${params.planter_id}` : ''}