@lyxa.ai/core 1.4.261 → 1.4.263

package/dist/libraries/cash-settlement/providers/bob.d.ts

@@ -16,6 +16,7 @@ export declare class BOBService implements ICashSettlementService {
     private BOB_USER_NAME;
     private BOB_PASSWORD;
     private BOB_URL;
+    private logger;
     constructor(secrets: BOBSecrets);
     initiateSettlement(amount: number, currency: string, reference: string, firstName: string, lastName: string, riderId: mongoose.Types.ObjectId, location?: string): Promise<boolean>;
     markSettlementAsPaid(settlementId: mongoose.Types.ObjectId): Promise<boolean>;

package/dist/libraries/cash-settlement/providers/bob.js

@@ -18,7 +18,6 @@ const models_1 = require("../../mongo/models");
 const typedi_1 = require("typedi");
 const https_1 = __importDefault(require("https"));
 const zlib_1 = __importDefault(require("zlib"));
-const server_1 = require("@trpc/server");
 const enum_1 = require("../../../utilities/enum");
 const __1 = require("../../..");
 const error_common_1 = require("../../../utilities/error-common");
@@ -38,17 +37,18 @@ let BOBService = class BOBService {
     BOB_USER_NAME;
     BOB_PASSWORD;
     BOB_URL;
+    logger;
     constructor(secrets) {
         this.BOB_USER_NAME = secrets.BOB_USER_NAME;
         this.BOB_PASSWORD = secrets.BOB_PASSWORD;
         this.BOB_URL = secrets.BOB_URL;
+        this.logger = (0, __1.getLibraries)().getLoggerKit();
         this.model = models_1.BOBFinanceModel;
         this.riderModel = models_1.RiderModel;
         this.financeSettlementModel = models_1.FinanceSettlementModel;
     }
     async initiateSettlement(amount, currency, reference, firstName, lastName, riderId, location) {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Initiating BOB settlement', {
+        this.logger.info('Initiating BOB settlement', {
             tag: enum_1.LogTag.BOB_TRANSACTION_INITIATE,
             data: {
                 amount,
@@ -77,23 +77,41 @@ let BOBService = class BOBService {
             Amount: String(amount),
             Currency: currency,
         };
-        const { data } = await axios_1.default.post(`${this.BOB_URL}InsertTransferData`, bobData, {
-            httpsAgent: new https_1.default.Agent({ rejectUnauthorized: false }),
-        });
+        let data;
+        try {
+            data = await axios_1.default.post(`${this.BOB_URL}InsertTransferData`, bobData, {
+                httpsAgent: new https_1.default.Agent({ rejectUnauthorized: false }),
+            });
+        }
+        catch (error) {
+            this.logger.error('Error posting to BOB API:', error, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_INITIATE,
+                data: {
+                    crmNumber,
+                },
+            });
+            throw (0, error_common_1.internalServerError)('Failed to post data to BOB API.');
+        }
         if (data.ErrorCode != 100) {
-            console.error(`Error in BOB initiateSettlement: ${data.ErrorDescription}`);
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to post data to BOB API.',
+            this.logger.error('Error in BOB initiateSettlement:', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_INITIATE,
+                data: {
+                    crmNumber,
+                    errorCode: data.ErrorCode,
+                    errorDescription: data.ErrorDescription,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to post data to BOB API.');
         }
         const responseObject = await this.decompressResponse(data.Response);
         if (!responseObject || !responseObject.isSuccess) {
-            console.error('Failed to initiate settlement in BOB');
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to initiate settlement in BOB.',
+            this.logger.error('Failed to initiate settlement in BOB', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_INITIATE,
+                data: {
+                    crmNumber,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to initiate settlement in BOB.');
         }
         const bobSettlement = await this.model.create({
             amount: currency === 'USD' ? amount : 0,
@@ -106,7 +124,7 @@ let BOBService = class BOBService {
             bobModel: enum_1.BobModel.C2B,
             bobType: enum_1.BobType.INWARD,
         });
-        logger.info('Created BOB settlement in database', {
+        this.logger.info('Created BOB settlement in database', {
             tag: enum_1.LogTag.BOB_TRANSACTION_INITIATE,
             data: {
                 bobSettlementId: bobSettlement._id.toString(),
@@ -116,8 +134,7 @@ let BOBService = class BOBService {
         return true;
     }
     async markSettlementAsPaid(settlementId) {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Marking BOB settlement as paid', {
+        this.logger.info('Marking BOB settlement as paid', {
             tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
             data: {
                 settlementId: settlementId.toString(),
@@ -125,31 +142,28 @@ let BOBService = class BOBService {
         });
         const settlement = await this.model.findById(settlementId);
         if (!settlement) {
-            logger.info('Settlement not found', {
+            this.logger.error('Settlement not found', undefined, {
                 tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
                 data: {
                     settlementId: settlementId.toString(),
                 },
             });
-            throw new server_1.TRPCError({
-                code: 'NOT_FOUND',
-                message: 'Settlement not found.',
-            });
+            throw (0, error_common_1.notFoundError)('Settlement not found.');
         }
         if (settlement.status === enum_1.BobSettlementStatus.PAID) {
-            logger.info('Settlement is already marked as paid', {
+            this.logger.error('Settlement is already marked as paid', undefined, {
                 tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
                 data: {
                     settlementId: settlementId.toString(),
                 },
             });
-            (0, error_common_1.badRequestError)('Settlement is already marked as paid.');
+            throw (0, error_common_1.badRequestError)('Settlement is already marked as paid.');
         }
         await this.settlePayment(settlement);
         if (settlement.status === enum_1.BobSettlementStatus.NOT_PAID) {
             await this.removeTransfer(settlement.crmNumber);
         }
-        logger.info('BOB settlement marked as paid', {
+        this.logger.info('BOB settlement marked as paid', {
             tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
             data: {
                 settlementId: settlementId.toString(),
@@ -158,8 +172,7 @@ let BOBService = class BOBService {
         return true;
     }
     async settlePayment(settlement) {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Settling BOB payment', {
+        this.logger.info('Settling BOB payment', {
             tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
             data: {
                 settlementId: settlement._id.toString(),
@@ -176,11 +189,13 @@ let BOBService = class BOBService {
         });
         const rider = await this.riderModel.findById(settlement.rider);
         if (!rider) {
-            console.error(`Rider with ID ${settlement.rider} not found.`);
-            throw new server_1.TRPCError({
-                code: 'NOT_FOUND',
-                message: 'Rider not found.',
+            this.logger.error(`Rider with ID ${settlement.rider} not found.`, undefined, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
+                data: {
+                    settlementId: settlement._id.toString(),
+                },
             });
+            throw (0, error_common_1.notFoundError)('Rider not found.');
         }
         const settings = (await (0, __1.getLibraries)().getCachedSettingsService().getSettings());
         const exchangeRate = settings?.currencySetting?.exchangeRate || 1;
@@ -209,7 +224,7 @@ let BOBService = class BOBService {
             },
             $unset: unsetUpdate,
         }, { new: true, runValidators: true });
-        logger.info('Settled BOB payment and updated rider cash in hand', {
+        this.logger.info('Settled BOB payment and updated rider cash in hand', {
             tag: enum_1.LogTag.BOB_TRANSACTION_SETTLE,
             data: {
                 settlementId: settlement._id.toString(),
@@ -254,8 +269,7 @@ let BOBService = class BOBService {
         return { deltaPrimary, deltaSecondary };
     }
     async revokeSettlement(reference) {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Revoking BOB settlement', {
+        this.logger.info('Revoking BOB settlement', {
             tag: enum_1.LogTag.BOB_TRANSACTION_REVOKE,
             data: {
                 reference,
@@ -266,11 +280,13 @@ let BOBService = class BOBService {
             status: enum_1.BobSettlementStatus.NOT_PAID,
         });
         if (!settlement) {
-            console.error(`Settlement with reference ${reference} not found.`);
-            throw new server_1.TRPCError({
-                code: 'NOT_FOUND',
-                message: 'Settlement not found.',
+            this.logger.error('Settlement with reference not found', undefined, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_REVOKE,
+                data: {
+                    reference,
+                },
             });
+            throw (0, error_common_1.notFoundError)('Settlement not found.');
         }
         await this.removeTransfer(reference);
         const result = await this.model.findOneAndUpdate({
@@ -279,7 +295,7 @@ let BOBService = class BOBService {
         }, {
             status: enum_1.BobSettlementStatus.REVOKED,
         }, { new: true, runValidators: true });
-        logger.info('BOB settlement revoked', {
+        this.logger.info('BOB settlement revoked', {
             tag: enum_1.LogTag.BOB_TRANSACTION_REVOKE,
             data: {
                 reference,
@@ -290,8 +306,7 @@ let BOBService = class BOBService {
         return true;
     }
     async revokeRiderSettlements(rider) {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Revoking BOB settlements for rider', {
+        this.logger.info('Revoking BOB settlements for rider', {
             tag: enum_1.LogTag.BOB_TRANSACTION_REVOKE,
             data: {
                 riderId: rider.toString(),
@@ -302,7 +317,7 @@ let BOBService = class BOBService {
             status: enum_1.BobSettlementStatus.NOT_PAID,
         });
         if (!settlements.length) {
-            logger.info('No unpaid BOB settlements found for rider', {
+            this.logger.info('No unpaid BOB settlements found for rider', {
                 tag: enum_1.LogTag.BOB_TRANSACTION_REVOKE,
                 data: {
                     riderId: rider.toString(),
@@ -316,7 +331,7 @@ let BOBService = class BOBService {
                 status: enum_1.BobSettlementStatus.REVOKED,
             });
         }
-        logger.info('BOB settlements revoked for rider', {
+        this.logger.info('BOB settlements revoked for rider', {
             tag: enum_1.LogTag.BOB_TRANSACTION_REVOKE,
             data: {
                 riderId: rider.toString(),
@@ -326,8 +341,7 @@ let BOBService = class BOBService {
         return true;
     }
     async removeTransfer(crmNumber) {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Removing transfer from BOB', {
+        this.logger.info('Removing transfer from BOB', {
             tag: enum_1.LogTag.BOB_TRANSACTION_REMOVE,
             data: {
                 crmNumber,
@@ -335,7 +349,7 @@ let BOBService = class BOBService {
         });
         const transferExists = await this.hasUnpaidTransfer(crmNumber);
         if (!transferExists) {
-            logger.info('No transfer exists for this crm number in bob', {
+            this.logger.error('No transfer exists for this crm number in bob', undefined, {
                 tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
                 data: {
                     crmNumber,
@@ -359,21 +373,26 @@ let BOBService = class BOBService {
             return;
         }
         if (data.ErrorCode != 100) {
-            console.error(`Error in BOB removeTransfer: ${data.ErrorDescription}`);
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to post data to BOB API.',
+            this.logger.error('Error in BOB removeTransfer', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_REMOVE,
+                data: {
+                    crmNumber,
+                    errorDescription: data.ErrorDescription,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to post data to BOB API.');
         }
         const responseObject = await this.decompressResponse(data.Response);
         if (!responseObject || !responseObject.isSuccess) {
-            console.error('Failed to remove transfer in BOB');
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to remove transfer in BOB.',
+            this.logger.error('Failed to remove transfer in BOB', responseObject, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_REMOVE,
+                data: {
+                    crmNumber,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to remove transfer in BOB.');
         }
-        logger.info('Removed transfer from BOB', {
+        this.logger.info('Removed transfer from BOB', {
             tag: enum_1.LogTag.BOB_TRANSACTION_REMOVE,
             data: {
                 crmNumber,
@@ -392,6 +411,7 @@ let BOBService = class BOBService {
         const pendingSettlements = await this.model.find({
             rider: riderId,
             status: enum_1.BobSettlementStatus.NOT_PAID,
+            settlementType: enum_1.BobSettlementType.SETTLE_CASH,
         });
         return pendingSettlements.length > 0;
     }
@@ -416,6 +436,7 @@ let BOBService = class BOBService {
         const lastSettlement = await this.model
             .findOne({
             rider: rider,
+            settlementType: enum_1.BobSettlementType.SETTLE_CASH,
         })
             .sort({ createdAt: -1 });
         if (!lastSettlement)
@@ -429,7 +450,7 @@ let BOBService = class BOBService {
             updatedAt: lastSettlement.updatedAt ?? new Date(),
         };
     }
-    async getTransfers(timeframe) {
+    async getTransfers(timeframe, model = enum_1.BobModel.C2B) {
         const DateTimeFrom = new Date(timeframe.startDate).toISOString().split('.')[0] + 'Z';
         const DateTimeTo = new Date(timeframe.endDate).toISOString().split('.')[0] + 'Z';
         const bobData = {
@@ -438,7 +459,7 @@ let BOBService = class BOBService {
                 User: this.BOB_USER_NAME,
                 Password: this.BOB_PASSWORD,
             },
-            Model: enum_1.BobModel.C2B,
+            Model: model,
             DateTimeFrom,
             DateTimeTo,
         };
@@ -446,19 +467,24 @@ let BOBService = class BOBService {
             httpsAgent: new https_1.default.Agent({ rejectUnauthorized: false }),
         });
         if (data.ErrorCode != 100) {
-            console.error(`Error in BOB getTransfers: ${data.ErrorDescription}`);
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to post data to BOB API.',
+            this.logger.error('Error in BOB getTransfers', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
+                data: {
+                    timeframe,
+                    errorDescription: data.ErrorDescription,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to post data to BOB API.');
         }
         const responseObject = await this.decompressResponse(data.Response);
         if (!responseObject) {
-            console.error('Failed to get transfers in BOB');
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to get transfers in BOB.',
+            this.logger.error('Failed to get transfers in BOB', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
+                data: {
+                    timeframe,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to get transfers in BOB.');
         }
         return responseObject;
     }
@@ -467,11 +493,18 @@ let BOBService = class BOBService {
             const decodedBuffer = Buffer.from(response, 'base64');
             zlib_1.default.gunzip(decodedBuffer, (err, decompressedBuffer) => {
                 if (err) {
-                    console.error('Error decompressing GZIP:', err);
-                    throw new server_1.TRPCError({
-                        code: 'INTERNAL_SERVER_ERROR',
-                        message: 'Failed to decompress data from BOB API.',
+                    this.logger.error('Error decompressing GZIP', err, {
+                        tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
+                        data: {
+                            responseLength: response?.length,
+                        },
                     });
+                    try {
+                        reject((0, error_common_1.internalServerError)('Failed to decompress data from BOB API.'));
+                    }
+                    catch (error) {
+                        reject(error);
+                    }
                 }
                 else {
                     const decodedString = decompressedBuffer.toString('utf-8');
@@ -498,33 +531,36 @@ let BOBService = class BOBService {
             return false;
         }
         if (data.ErrorCode != 100) {
-            console.error(`Error in BOB getTransferStatus: ${data.ErrorDescription}`);
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to post data to BOB API.',
+            this.logger.error('Error in BOB getTransferStatus', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
+                data: {
+                    crmNumber,
+                    errorDescription: data.ErrorDescription,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to post data to BOB API.');
         }
         const responseObject = await this.decompressResponse(data.Response);
         if (!responseObject) {
-            console.error('Failed to get settlement status in BOB');
-            throw new server_1.TRPCError({
-                code: 'INTERNAL_SERVER_ERROR',
-                message: 'Failed to get settlement status in BOB.',
+            this.logger.error('Failed to get settlement status in BOB', data, {
+                tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
+                data: {
+                    crmNumber,
+                },
             });
+            throw (0, error_common_1.internalServerError)('Failed to get settlement status in BOB.');
         }
         const hasUnpaidTransfer = responseObject.some((item) => item.CRMNumber == crmNumber && item.Status == BOBTransferStatus.NOT_PAID);
         return hasUnpaidTransfer;
     }
     async checkAllPendingTransfers() {
-        const logger = (0, __1.getLibraries)().getLoggerKit();
-        logger.info('Checking pending BOB settlements', { tag: enum_1.LogTag.BOB_TRANSACTION_CHECK });
         const notPaidSettlements = await this.model.find({
             status: enum_1.BobSettlementStatus.NOT_PAID,
         });
         if (!notPaidSettlements.length) {
             return;
         }
-        logger.info('Checking pending settlements', {
+        this.logger.info('Checking pending settlements', {
             tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
             data: {
                 count: notPaidSettlements.length,
@@ -544,11 +580,11 @@ let BOBService = class BOBService {
             startDate: minDateMinusOneDay,
             endDate: maxDatePlusOneDay,
         });
-        logger.info('Transactions on BOB', {
+        this.logger.info('Transactions on BOB', {
             tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
             data: {
                 count: transfers.length,
-                transfers,
+                transfers: transfers.map(t => ({ ReferenceNumber: t.ReferenceNumber, Status: t.Status })),
                 startDate: minDateMinusOneDay,
                 endDate: maxDatePlusOneDay,
             },
@@ -560,25 +596,19 @@ let BOBService = class BOBService {
         for (const trx of transfers) {
             transferStatusMap.set(trx.ReferenceNumber, trx.Status);
         }
-        logger.info('Mapped transfer statuses', {
-            tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
-            data: {
-                transferStatusMap,
-            },
-        });
         await Promise.all(notPaidSettlements.map(async (settlement) => {
             try {
                 const status = transferStatusMap.get(settlement.crmNumber);
                 if (status == BOBTransferStatus.PAID) {
                     await this.settlePayment(settlement);
                 }
-                logger.info(`Settled payment for crmNumber ${settlement.crmNumber}`, {
+                this.logger.info(`Settled payment for crmNumber ${settlement.crmNumber}`, {
                     tag: enum_1.LogTag.BOB_TRANSACTION_CHECK,
                     data: { status },
                 });
             }
             catch (err) {
-                logger.error(`Failed settlement with crmNumber ${settlement.crmNumber}, id: ${settlement._id}`, err, { tag: enum_1.LogTag.BOB_TRANSACTION_CHECK });
+                this.logger.error(`Failed settlement with crmNumber ${settlement.crmNumber}, id: ${settlement._id}`, err, { tag: enum_1.LogTag.BOB_TRANSACTION_CHECK });
             }
         }));
     }