From db0925864b1b9943a4a3ea95b7dba2a783271eca Mon Sep 17 00:00:00 2001 From: Ramin Date: Tue, 23 Jul 2024 20:48:18 +0330 Subject: [PATCH] add email to project in adminjs --- config/example.env | 2 +- package.json | 2 +- src/server/adminJs/tabs/projectsTab.ts | 1 - .../updateStreamOldRecurringDonationsJob.ts | 3 ++- src/services/recurringDonationStreamQueue.ts | 16 +++++++++++----- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/config/example.env b/config/example.env index bf1c2c001..2e31ad273 100644 --- a/config/example.env +++ b/config/example.env @@ -267,7 +267,7 @@ ENABLE_UPDATE_RECURRING_DONATION_STREAM=true NUMBER_OF_UPDATE_RECURRING_DONATION_CONCURRENT_JOB=1 # Default value is 0 0 * * * that means one day at 00:00 -UPDATE_RECURRING_DONATIONS_STREAM=0 0 * * * +UPDATE_RECURRING_DONATIONS_STREAM_CRONJOB=0 0 * * * # Default value is 0.4 PROJECT_SEARCH_SIMILARITY_THRESHOLD=0.4 diff --git a/package.json b/package.json index 583c1659c..95392122a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "giveth-graphql-api", - "version": "1.24.0", + "version": "1.24.1", "description": "Backend GraphQL server for Giveth originally forked from Topia", "main": "./dist/index.js", "dependencies": { diff --git a/src/server/adminJs/tabs/projectsTab.ts b/src/server/adminJs/tabs/projectsTab.ts index 4ad849d95..18694b050 100644 --- a/src/server/adminJs/tabs/projectsTab.ts +++ b/src/server/adminJs/tabs/projectsTab.ts @@ -663,7 +663,6 @@ export const projectsTab = { }, }, adminUserId: { - type: 'Number', isVisible: { list: true, filter: false, diff --git a/src/services/cronJobs/updateStreamOldRecurringDonationsJob.ts b/src/services/cronJobs/updateStreamOldRecurringDonationsJob.ts index d0f7bf878..38b7ce628 100644 --- a/src/services/cronJobs/updateStreamOldRecurringDonationsJob.ts +++ b/src/services/cronJobs/updateStreamOldRecurringDonationsJob.ts @@ -7,7 +7,8 @@ import { } from '../recurringDonationStreamQueue'; const cronJobTime = - (config.get('UPDATE_RECURRING_DONATIONS_STREAM') as string) || '0 0 * * *'; // one day at 00:00 + (config.get('UPDATE_RECURRING_DONATIONS_STREAM_CRONJOB') as string) || + '0 0 * * *'; // one day at 00:00 export const runUpdateRecurringDonationStream = () => { logger.debug( diff --git a/src/services/recurringDonationStreamQueue.ts b/src/services/recurringDonationStreamQueue.ts index 647aa915c..4df0e13f9 100644 --- a/src/services/recurringDonationStreamQueue.ts +++ b/src/services/recurringDonationStreamQueue.ts @@ -25,14 +25,20 @@ setInterval(async () => { }, TWO_MINUTES); export const updateRecurringDonationsStream = async () => { - logger.debug('addJobToQueue() has been called'); + logger.debug('updateRecurringDonationsStream Job Queue has been called'); const recurringDonations = await findActiveRecurringDonations(); - logger.debug('Active recurring donations length', recurringDonations.length); + logger.debug( + 'updateRecurringDonationsStream-Active recurring donations length', + recurringDonations.length, + ); recurringDonations.forEach(recurringDonation => { - logger.debug('Add pending recurringDonation to queue', { - recurringDonationId: recurringDonation.id, - }); + logger.debug( + 'updateRecurringDonationsStream-Add pending recurringDonation to queue', + { + recurringDonationId: recurringDonation.id, + }, + ); updateRecurringDonationsStreamQueue.add( { recurringDonationId: recurringDonation.id,