From de235e54aaac23b71934c8b8d9b2efca9eec326b Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Tue, 23 Jan 2024 13:36:54 +0330 Subject: [PATCH] Add more logs for importing failed donations --- .../donationSaveBackupAdapter.ts | 53 +++++++++++-------- .../cronJobs/backupDonationImportJob.ts | 11 ++-- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/adapters/donationSaveBackup/donationSaveBackupAdapter.ts b/src/adapters/donationSaveBackup/donationSaveBackupAdapter.ts index 0d619842b..dea9bd4f8 100644 --- a/src/adapters/donationSaveBackup/donationSaveBackupAdapter.ts +++ b/src/adapters/donationSaveBackup/donationSaveBackupAdapter.ts @@ -33,33 +33,40 @@ export class DonationSaveBackupAdapter implements DonationSaveBackupInterface { async getNotImportedDonationsFromBackup(params: { limit: number; }): Promise { - const result = await axios.post( - `${baseUrl}find`, - { - collection: DONATION_SAVE_BACKUP_COLLECTION, - database: DONATION_SAVE_BACKUP_DATABASE, - dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE, - limit: params.limit, - filter: { - imported: { $exists: false }, - importError: { $exists: false }, + try { + const result = await axios.post( + `${baseUrl}find`, + { + collection: DONATION_SAVE_BACKUP_COLLECTION, + database: DONATION_SAVE_BACKUP_DATABASE, + dataSource: DONATION_SAVE_BACKUP_DATA_SOURCE, + limit: params.limit, + filter: { + imported: { $exists: false }, + importError: { $exists: false }, + }, + sort: { _id: 1 }, }, - sort: { _id: 1 }, - }, - { - headers: { - 'api-key': DONATION_SAVE_BACKUP_API_SECRET, - 'Content-Type': 'application/json', - 'Access-Control-Request-Headers': '*', + { + headers: { + 'api-key': DONATION_SAVE_BACKUP_API_SECRET, + 'Content-Type': 'application/json', + 'Access-Control-Request-Headers': '*', + }, }, - }, - ); + ); - if (result.status !== 200) { - logger.error('getNotImportedDonationsFromBackup error', result.data); - throw new Error('getNotImportedDonationsFromBackup error'); + if (result.status !== 200) { + logger.error('getNotImportedDonationsFromBackup error', result.data); + throw new Error( + 'getNotImportedDonationsFromBackup error, status: ' + result.status, + ); + } + return result.data.documents; + } catch (e) { + logger.error('getNotImportedDonationsFromBackup error', e); + throw e; } - return result.data.documents; } async getSingleDonationFromBackupByTxHash( diff --git a/src/services/cronJobs/backupDonationImportJob.ts b/src/services/cronJobs/backupDonationImportJob.ts index 43e422220..f2364c9e0 100644 --- a/src/services/cronJobs/backupDonationImportJob.ts +++ b/src/services/cronJobs/backupDonationImportJob.ts @@ -17,7 +17,7 @@ const cronJobTime = '0 0 * * 0'; export const runSyncBackupServiceDonations = () => { - logger.debug('importBackupServiceDonations() has been called'); + logger.debug('runSyncBackupServiceDonations() has been called'); schedule(cronJobTime, async () => { await importBackupServiceDonations(); }); @@ -32,7 +32,7 @@ export const importBackupServiceDonations = async () => { limit, }); logger.info( - 'importBackupServiceDonations() donations.length: ', + 'importBackupServiceDonations() donations.length:', donations.length, ); while (donations.length > 0) { @@ -52,8 +52,11 @@ export const importBackupServiceDonations = async () => { donation._id, e.message, ); - logger.error(`donation error with id ${donation._id}: `, e); - logger.error('donation error with params: ', donation); + logger.error( + `Import failed donation error with id ${donation._id}: `, + e, + ); + logger.error('Import failed donation error with params: ', donation); } } donations =