Merge pull request #323 from infinitybase/feat/predicates/fields

feat: add field to return on external predicate route
infinitybase · Oct 29, 2024 · ad98224 · ad98224
2 parents ce528c8 + 29f7ac3
commit ad98224
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/api/src/modules/predicate/controller.ts b/packages/api/src/modules/predicate/controller.ts
@@ -272,7 +272,13 @@ export class PredicateController {
       const response = await this.predicateService
         .paginate({ page, perPage })
         .filter({
-          select: ['p.id', 'p.predicateAddress', 'p.createdAt'],
+          select: [
+            'p.id',
+            'p.predicateAddress',
+            'p.createdAt',
+            'p.root',
+            'owner.id',
+          ],
         })
         .listDateMoreThan(d ? new Date(d) : undefined);
 

diff --git a/packages/api/src/modules/predicate/services.ts b/packages/api/src/modules/predicate/services.ts
@@ -349,7 +349,10 @@ export class PredicateService implements IPredicateService {
   }
 
   async listDateMoreThan(d?: Date) {
-    const queryBuilder = Predicate.createQueryBuilder('p');
+    const queryBuilder = Predicate.createQueryBuilder('p').innerJoin(
+      'p.owner',
+      'owner',
+    );
 
     if (d) {
       queryBuilder.where({

diff --git a/packages/api/src/modules/transaction/utils.ts b/packages/api/src/modules/transaction/utils.ts
@@ -53,7 +53,7 @@ export const formatFuelTransaction = async (
 
   const formattedTransaction = {
     id: tx.id,
-    name: `DEPOSIT_${tx.id}`, // TODO: change this
+    name: 'Deposit',
     hash: tx.id.slice(2),
     sendTime: tx.date,
     createdAt: tx.date,