From c36de05457a7d5b0d1c4f46d63090134f0658db7 Mon Sep 17 00:00:00 2001
From: Rafael <rafael-dev@hotmail.com>
Date: Thu, 17 Oct 2024 14:09:18 -0300
Subject: [PATCH 1/4] chore(deposit): add a depoist name generator
---
packages/api/src/modules/transaction/utils.ts | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/packages/api/src/modules/transaction/utils.ts b/packages/api/src/modules/transaction/utils.ts
index 3e8ee93cb..0d8a64410 100644
--- a/packages/api/src/modules/transaction/utils.ts
+++ b/packages/api/src/modules/transaction/utils.ts
@@ -31,6 +31,15 @@ export const formatTransactionsResponse = (
}
};
+export const generateDepositName = () => {
+ let depositName = 'Deposit #';
+ for (let i = 0; i < 5; i++) {
+ const randomInt = Math.floor(Math.random() * 10);
+ depositName += randomInt.toString();
+ }
+ return depositName;
+};
+
export const formatFuelTransaction = async (
tx: TransactionResult,
predicate: Predicate,
@@ -53,7 +62,7 @@ export const formatFuelTransaction = async (
const formattedTransaction = {
id: tx.id,
- name: `DEPOSIT_${tx.id}`, // TODO: change this
+ name: generateDepositName(),
hash: tx.id.slice(2),
sendTime: tx.date,
createdAt: tx.date,
From 9b74d7293fd7c8d85fb6fcb4f342737b2ac3f9c6 Mon Sep 17 00:00:00 2001
From: Rafael <rafael-dev@hotmail.com>
Date: Thu, 17 Oct 2024 15:24:53 -0300
Subject: [PATCH 2/4] chore(deposit): create fn to generate dynamic deposit
name like ui but change depoist name just to deposit
---
packages/api/src/modules/transaction/utils.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/api/src/modules/transaction/utils.ts b/packages/api/src/modules/transaction/utils.ts
index 0d8a64410..dbd780f36 100644
--- a/packages/api/src/modules/transaction/utils.ts
+++ b/packages/api/src/modules/transaction/utils.ts
@@ -62,7 +62,7 @@ export const formatFuelTransaction = async (
const formattedTransaction = {
id: tx.id,
- name: generateDepositName(),
+ name: 'Deposit',
hash: tx.id.slice(2),
sendTime: tx.date,
createdAt: tx.date,
From 205427675d795213b1d19455961aab6a32e0ada2 Mon Sep 17 00:00:00 2001
From: Rafael <rafael-dev@hotmail.com>
Date: Tue, 29 Oct 2024 12:48:08 -0300
Subject: [PATCH 3/4] chore(deposit): removed generateDepositName utility fn
---
packages/api/src/modules/transaction/utils.ts | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/packages/api/src/modules/transaction/utils.ts b/packages/api/src/modules/transaction/utils.ts
index dbd780f36..609a950e2 100644
--- a/packages/api/src/modules/transaction/utils.ts
+++ b/packages/api/src/modules/transaction/utils.ts
@@ -31,15 +31,6 @@ export const formatTransactionsResponse = (
}
};
-export const generateDepositName = () => {
- let depositName = 'Deposit #';
- for (let i = 0; i < 5; i++) {
- const randomInt = Math.floor(Math.random() * 10);
- depositName += randomInt.toString();
- }
- return depositName;
-};
-
export const formatFuelTransaction = async (
tx: TransactionResult,
predicate: Predicate,
From 29f7ac3378bab4bd51a3dcc52ba964b5530c0fa5 Mon Sep 17 00:00:00 2001
From: Mateus Paegle <mateus.martinegle@gmail.com>
Date: Tue, 29 Oct 2024 18:18:39 -0300
Subject: [PATCH 4/4] feat: add fields to return on external predicate route
---
packages/api/src/modules/predicate/controller.ts | 8 +++++++-
packages/api/src/modules/predicate/services.ts | 5 ++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/packages/api/src/modules/predicate/controller.ts b/packages/api/src/modules/predicate/controller.ts
index 918be0a58..8275a6e16 100644
--- 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
index 603adf9c2..b863c42ac 100644
--- 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({