fix approve and claim date and state

impactMarket · Oct 31, 2023 · b6cf40d · b6cf40d
1 parent 72c0b83
commit b6cf40d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 23 deletions.
diff --git a/packages/worker/src/chainSubscribers.ts b/packages/worker/src/chainSubscribers.ts
@@ -87,14 +87,14 @@ class ChainSubscribers {
             try {
                 const r = await this._getLogs(startFromBlock, provider);
                 rawLogs = r.logs;
-                startFromBlock = r.lastBlock;
+                startFromBlock = r.toBlock;
                 isLastBlock = r.isLastBlock;
                 utils.Logger.info('Got logs from main provider!');
             } catch (error) {
                 utils.Logger.error('Failed to get logs from main provider!', error);
                 const r = await this._getLogs(startFromBlock, fallbackProvider);
                 rawLogs = r.logs;
-                startFromBlock = r.lastBlock;
+                startFromBlock = r.toBlock;
                 isLastBlock = r.isLastBlock;
                 utils.Logger.info('Got logs from fallback provider!');
             }
@@ -141,9 +141,9 @@ class ChainSubscribers {
             toBlock,
             topics: this.filterTopics
         });
-        return {
+                return {
             logs,
-            lastBlock,
+            toBlock,
             isLastBlock: lastBlock === toBlock
         };
     }
@@ -459,22 +459,27 @@ class ChainSubscribers {
             if (parsedLog.name === 'LoanAdded') {
                 utils.Logger.info('Add Loan event');
 
-                const [user, application, transactionsReceipt] = await Promise.all([
+                const [user, transactionsReceipt] = await Promise.all([
                     database.models.appUser.findOne({
                         attributes: ['id', 'language', 'walletPNT', 'appPNT'],
                         where: {
                             address: getAddress(userAddress)
-                        }
-                    }),
-                    database.models.microCreditApplications.findOne({
-                        where: {
-                            userId: userAddress
                         },
-                        order: [['id', 'DESC']]
+                        include: [
+                            {
+                                model: database.models.microCreditApplications,
+                                as: 'microCreditApplications',
+                                attributes: ['id'],
+                                order: [['id', 'DESC']],
+                                limit: 1,
+                                required: false
+                            }
+                        ]
                     }),
                     this.provider.getTransaction(log.transactionHash)
                 ]);
                 if (user) {
+                    const application = user.microCreditApplications?.[0];
                     const [loanManagerUser] = await Promise.all([
                         database.models.appUser.findOne({
                             attributes: ['id'],
@@ -495,7 +500,7 @@ class ChainSubscribers {
                             }
                         ),
                         this.microCreditService.updateApplication(
-                            application !== null ? [application.id] : [userAddress],
+                            application !== undefined ? [application.id] : [userAddress],
                             [interfaces.microcredit.microCreditApplications.MicroCreditApplicationStatus.APPROVED],
                             transaction
                         )
@@ -513,17 +518,26 @@ class ChainSubscribers {
                 const parsedLog = this.ifaceMicrocredit.parseLog(log);
                 const userAddress = parsedLog.args[0];
 
-                await database.models.microCreditApplications.update(
-                    {
-                        claimedOn: new Date()
+                const user = await database.models.appUser.findOne({
+                    attributes: ['id'],
+                    where: {
+                        address: getAddress(userAddress)
                     },
-                    {
-                        where: {
-                            userId: userAddress
-                        },
-                        transaction
-                    }
-                );
+                    include: [
+                        {
+                            model: database.models.microCreditApplications,
+                            as: 'microCreditApplications',
+                            attributes: ['id'],
+                            order: [['id', 'DESC']],
+                            limit: 1,
+                            required: false
+                        }
+                    ]
+                });
+
+                await user?.microCreditApplications?.[0]?.update({
+                    claimedOn: new Date(),
+                }, { transaction });
             } else if (parsedLog.name === 'ManagerChanged') {
                 utils.Logger.info('ManagerChanged event');
 

diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
@@ -29,7 +29,7 @@ export const start = async (): Promise<void> => {
     process.on('uncaughtException', (error: any) => {
         // close all RPC connections and restart when available again
         const strError = JSON.stringify(error);
-        utils.Logger.error('uncaughtException: ', strError);
+        utils.Logger.error('uncaughtException: ', strError, error);
         if (
             strError.indexOf('eth_') !== -1 && // any eth_ surely is related to the RPC
             (strError.indexOf('figment') !== -1 || strError.indexOf('celo') !== -1) &&