feat(core-api): search transactions by asset (#2618)

ArkEcosystem · May 25, 2019 · 6f810ca · 6f810ca
1 parent b94e419
commit 6f810ca
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 1 deletion.
diff --git a/__tests__/integration/core-api/handlers/transactions.test.ts b/__tests__/integration/core-api/handlers/transactions.test.ts
@@ -416,6 +416,42 @@ describe("API 2.0 - Transactions", () => {
             expect(response.data.data).toBeArray();
             utils.expectTransaction(response.data.data[0]);
         });
+
+        it("should POST a search for transactions with an asset matching any delegate", async () => {
+            const response = await utils.request("POST", "transactions/search", {
+                asset: {
+                    delegate: {},
+                },
+            });
+            expect(response).toBeSuccessfulResponse();
+            expect(response.data.data).toBeArray();
+            expect(response.data.data).toHaveLength(51);
+            utils.expectTransaction(response.data.data[0]);
+        });
+
+        it("should POST a search for transactions with an asset matching any delegate and sender public key", async () => {
+            const response = await utils.request("POST", "transactions/search", {
+                asset: {
+                    delegate: {},
+                },
+                senderPublicKey: "0377f81a18d25d77b100cb17e829a72259f08334d064f6c887298917a04df8f647",
+            });
+            expect(response).toBeSuccessfulResponse();
+            expect(response.data.data).toBeArray();
+            expect(response.data.data).toHaveLength(1);
+            utils.expectTransaction(response.data.data[0]);
+        });
+
+        it("should POST a search for transactions with an wrong asset", async () => {
+            const response = await utils.request("POST", "transactions/search", {
+                asset: {
+                    garbage: {},
+                },
+            });
+            expect(response).toBeSuccessfulResponse();
+            expect(response.data.data).toBeArray();
+            expect(response.data.data).toHaveLength(0);
+        });
     });
 
     describe("POST /transactions", () => {

diff --git a/packages/core-api/src/handlers/transactions/schema.ts b/packages/core-api/src/handlers/transactions/schema.ts
@@ -145,5 +145,6 @@ export const search: object = {
                 .integer()
                 .min(0),
         }),
+        asset: Joi.object(),
     },
 };
diff --git a/packages/core-database-postgres/src/models/transaction.ts b/packages/core-database-postgres/src/models/transaction.ts
@@ -78,7 +78,7 @@ export class Transaction extends Model {
             init: col => {
                 return col.value;
             },
-            supportedOperators: [Database.SearchOperator.OP_EQ],
+            supportedOperators: [Database.SearchOperator.OP_CONTAINS],
         },
     ];
 

diff --git a/packages/core-database/src/repositories/utils/search-parameter-converter.ts b/packages/core-database/src/repositories/utils/search-parameter-converter.ts
@@ -146,6 +146,17 @@ export class SearchParameterConverter implements Database.IISearchParameterConve
                 });
                 continue;
             }
+
+            // if the field supports CONTAINS (@>), then ignore any others.
+            if (fieldDescriptor.supportedOperators.includes(Database.SearchOperator.OP_CONTAINS)) {
+                searchParameters.parameters.push({
+                    field: fieldName,
+                    operator: Database.SearchOperator.OP_CONTAINS,
+                    value: params[fieldName],
+                });
+
+                continue;
+            }
         }
     }
 }
diff --git a/packages/core-interfaces/src/core-database/search/search-parameters.ts b/packages/core-interfaces/src/core-database/search/search-parameters.ts
@@ -4,6 +4,7 @@ export enum SearchOperator {
     OP_GTE = "gte",
     OP_LTE = "lte",
     OP_LIKE = "like",
+    OP_CONTAINS = "contains",
     // placeholder. For parameters that require custom(not a 1-to-1 field to column mapping) filtering logic on the data-layer repo
     OP_CUSTOM = "custom_operator",
 }