From ffbe89ef42e9138d3ccbb6e734eb9c2fc73d9aa9 Mon Sep 17 00:00:00 2001 From: borkarsaish65 Date: Wed, 15 Jan 2025 12:46:13 +0530 Subject: [PATCH 1/6] savepoint --- module/programs/helper.js | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/module/programs/helper.js b/module/programs/helper.js index a8b7e1b..193a3b0 100644 --- a/module/programs/helper.js +++ b/module/programs/helper.js @@ -436,9 +436,31 @@ module.exports = class ProgramsHelper { try { + const moment = require('moment'); + +// Create a moment object for the current time +let currentMoment = moment(); + +// Convert timeZoneDifference to the total minutes (e.g. +5:30 -> 330 minutes) +console.log(timeZoneDifference,'timeZoneDifference') +const [sign, hours, minutes] = timeZoneDifference.match(/([+-])(\d{2}):(\d{2})/).slice(1); +const totalMinutes = (parseInt(hours) * 60 + parseInt(minutes)) * (sign === '+' ? 1 : -1); + +var responseDate = moment().utcOffset(timeZoneDifference).format('DD/MM/YYYY'); +console.log(responseDate,'responseDate') +// Adjust the moment object by the time zone difference +let adjustedMoment = currentMoment.utcOffset(timeZoneDifference); +console.log(adjustedMoment,'adjustedMoment') +// Print the adjusted moment +console.log(adjustedMoment.format('MM/DD/YYYY')); // or use .format("YYYY-MM-DD HH:mm:ss") for specific format + +console.log(stopppppppppppp) let programDocument = []; - let matchQuery = { status : constants.common.ACTIVE }; + let matchQuery = { status : constants.common.ACTIVE, + startDate: { $gt: new Date() }, + endDate: { $lt: new Date() } + }; if( Object.keys(filter).length > 0 ) { matchQuery = _.merge(matchQuery,filter); @@ -500,6 +522,8 @@ module.exports = class ProgramsHelper { programDocument.push({ $match : matchQuery }, sortQuery,{ $project : projection1 }, facetQuery, projection2); + console.log(programDocument[0], "programDocument"); + let programDocuments = await database.models.programs.aggregate(programDocument); From 234e2d005fb6d63e91aae3e5aeab23b29e993f99 Mon Sep 17 00:00:00 2001 From: borkarsaish65 Date: Fri, 17 Jan 2025 11:11:44 +0530 Subject: [PATCH 2/6] savepoint --- module/programs/helper.js | 3 +++ module/solutions/helper.js | 31 ++++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/module/programs/helper.js b/module/programs/helper.js index 36906eb..027c124 100644 --- a/module/programs/helper.js +++ b/module/programs/helper.js @@ -566,6 +566,9 @@ console.log(stopppppppppppp) if( !queryData.success ) { return resolve(queryData); } + + queryData.data.startDate = { $lte: new Date() }; + queryData.data.endDate = { $gte: new Date() }; let targetedPrograms = await this.list( pageNo, diff --git a/module/solutions/helper.js b/module/solutions/helper.js index 55ea0b3..d887add 100644 --- a/module/solutions/helper.js +++ b/module/solutions/helper.js @@ -16,6 +16,7 @@ const userExtensionsHelperV2 = require(MODULES_BASE_PATH + "/user-extension/help const userService = require(ROOT_PATH + "/generics/services/users"); const timeZoneDifference = process.env.TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC; + const moment = require('moment'); /** * SolutionsHelper * @class @@ -711,10 +712,20 @@ module.exports = class SolutionsHelper { matchQuery["$or"] = []; targetedTypes.forEach( type => { - - let singleType = { - type : type - }; + let singleType = {}; + if (type === constants.common.SURVEY) { + singleType = { + type: type, + }; + const currentDate = new Date(); + currentDate.setDate(currentDate.getDate() - 15); + singleType["endDate"] = { $gte: currentDate }; + } else { + singleType = { + type: type, + }; + singleType["endDate"] = { $gte: new Date() }; + } if( type === constants.common.IMPROVEMENT_PROJECT ) { singleType["projectTemplateId"] = { $exists : true }; @@ -727,7 +738,15 @@ module.exports = class SolutionsHelper { if( type !== "" ) { matchQuery["type"] = type; } - + + if (type === constants.common.SURVEY) { + const currentDate = new Date(); + currentDate.setDate(currentDate.getDate() - 15); + matchQuery["endDate"] = { $gte: currentDate }; + } else { + matchQuery["endDate"] = { $gte: new Date() }; + } + if( subType !== "" ) { matchQuery["subType"] = subType; } @@ -737,6 +756,8 @@ module.exports = class SolutionsHelper { matchQuery["programId"] = ObjectId(programId); } + matchQuery["startDate"] = { $lte: new Date() }; + let targetedSolutions = await this.list( type, subType, From e2649f22912e5c19f714bf8af070ba38b2021d88 Mon Sep 17 00:00:00 2001 From: borkarsaish65 Date: Fri, 17 Jan 2025 16:47:46 +0530 Subject: [PATCH 3/6] savepoint --- module/programs/helper.js | 17 ++++++++++------- module/solutions/helper.js | 3 ++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/module/programs/helper.js b/module/programs/helper.js index 027c124..38d828d 100644 --- a/module/programs/helper.js +++ b/module/programs/helper.js @@ -440,19 +440,19 @@ module.exports = class ProgramsHelper { let currentMoment = moment(); // Convert timeZoneDifference to the total minutes (e.g. +5:30 -> 330 minutes) -console.log(timeZoneDifference,'timeZoneDifference') + const [sign, hours, minutes] = timeZoneDifference.match(/([+-])(\d{2}):(\d{2})/).slice(1); const totalMinutes = (parseInt(hours) * 60 + parseInt(minutes)) * (sign === '+' ? 1 : -1); var responseDate = moment().utcOffset(timeZoneDifference).format('DD/MM/YYYY'); -console.log(responseDate,'responseDate') + // Adjust the moment object by the time zone difference let adjustedMoment = currentMoment.utcOffset(timeZoneDifference); -console.log(adjustedMoment,'adjustedMoment') + // Print the adjusted moment -console.log(adjustedMoment.format('MM/DD/YYYY')); // or use .format("YYYY-MM-DD HH:mm:ss") for specific format -console.log(stopppppppppppp) + + let programDocument = []; let matchQuery = { status : constants.common.ACTIVE, @@ -520,7 +520,7 @@ console.log(stopppppppppppp) programDocument.push({ $match : matchQuery }, sortQuery,{ $project : projection1 }, facetQuery, projection2); - console.log(programDocument[0], "programDocument"); + let programDocuments = await database.models.programs.aggregate(programDocument); @@ -553,7 +553,7 @@ console.log(stopppppppppppp) * @returns {JSON} - List of programs based on role and location. */ - static forUserRoleAndLocation( bodyData, pageSize, pageNo,searchText = "" ) { + static forUserRoleAndLocation( bodyData, pageSize, pageNo,searchText = "",programId = "" ) { return new Promise(async (resolve, reject) => { @@ -567,6 +567,9 @@ console.log(stopppppppppppp) return resolve(queryData); } + if (programId !== "") { + queryData.data._id = gen.utils.convertStringToObjectId(programId); + } queryData.data.startDate = { $lte: new Date() }; queryData.data.endDate = { $gte: new Date() }; diff --git a/module/solutions/helper.js b/module/solutions/helper.js index d887add..7b2e940 100644 --- a/module/solutions/helper.js +++ b/module/solutions/helper.js @@ -922,7 +922,8 @@ module.exports = class SolutionsHelper { "language", "creator", "link", - "certificateTemplateId" + "certificateTemplateId", + "endDate" ] ); From 82a0a5db73e4dffda2a6e1bf45339cc99e7363c3 Mon Sep 17 00:00:00 2001 From: borkarsaish65 Date: Fri, 17 Jan 2025 16:48:04 +0530 Subject: [PATCH 4/6] savepoint --- .../GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA diff --git a/keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA b/keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA new file mode 100755 index 0000000..e9179c5 --- /dev/null +++ b/keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA @@ -0,0 +1,3 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRbRlp/1x0h5a9Rb3E7+nU17mdnU1Grv2/a6ixhdBr1f9mjKEn7F/5eIfCQL3H82stxZyskeWaetL1mNJkAHFcJx+03DoKnGP6K+PZ3Svbw67ehgqyp+OozZCNXHzrM1DUVpvhYgsnvkqm+E1QyrsmrghSE+bAHqJep4S/70z12t8rwMNB6OxcbhrHBU93TxszxHHLZL9eaa2DCwGsTbYml0V2vFPsN4HUhXtnht9uoC2bjAXyBsrSNy/aoCsoI0erV8Vyw2FKfwEGBDFROjcWhKOdwb36TmEDf+g4OBSqAhEyewhTwcP7ESpjhyA3Ae1cH9cKOBmQTU+OmzS89h8QIDAQAB +-----END PUBLIC KEY----- \ No newline at end of file From 3d4bd6ed74bac03390ed8ad0567c33f38c5ba77d Mon Sep 17 00:00:00 2001 From: borkarsaish65 Date: Fri, 17 Jan 2025 16:49:37 +0530 Subject: [PATCH 5/6] savepoint --- .../GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA diff --git a/keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA b/keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA deleted file mode 100755 index e9179c5..0000000 --- a/keycloak-public-keys/GRxx8ur43pXH3_QMzBWerQPWrX02PJkK9Czl3hc60fA +++ /dev/null @@ -1,3 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRbRlp/1x0h5a9Rb3E7+nU17mdnU1Grv2/a6ixhdBr1f9mjKEn7F/5eIfCQL3H82stxZyskeWaetL1mNJkAHFcJx+03DoKnGP6K+PZ3Svbw67ehgqyp+OozZCNXHzrM1DUVpvhYgsnvkqm+E1QyrsmrghSE+bAHqJep4S/70z12t8rwMNB6OxcbhrHBU93TxszxHHLZL9eaa2DCwGsTbYml0V2vFPsN4HUhXtnht9uoC2bjAXyBsrSNy/aoCsoI0erV8Vyw2FKfwEGBDFROjcWhKOdwb36TmEDf+g4OBSqAhEyewhTwcP7ESpjhyA3Ae1cH9cKOBmQTU+OmzS89h8QIDAQAB ------END PUBLIC KEY----- \ No newline at end of file From dc4a144169d44204f265bbc2b4d88428cb079a3b Mon Sep 17 00:00:00 2001 From: borkarsaish65 Date: Fri, 17 Jan 2025 16:53:56 +0530 Subject: [PATCH 6/6] self review 1 --- module/programs/helper.js | 25 +------------------------ module/solutions/helper.js | 1 - 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/module/programs/helper.js b/module/programs/helper.js index 38d828d..ab30ea5 100644 --- a/module/programs/helper.js +++ b/module/programs/helper.js @@ -433,32 +433,9 @@ module.exports = class ProgramsHelper { return new Promise( async (resolve, reject) => { try { - - const moment = require('moment'); - -// Create a moment object for the current time -let currentMoment = moment(); - -// Convert timeZoneDifference to the total minutes (e.g. +5:30 -> 330 minutes) - -const [sign, hours, minutes] = timeZoneDifference.match(/([+-])(\d{2}):(\d{2})/).slice(1); -const totalMinutes = (parseInt(hours) * 60 + parseInt(minutes)) * (sign === '+' ? 1 : -1); - -var responseDate = moment().utcOffset(timeZoneDifference).format('DD/MM/YYYY'); - -// Adjust the moment object by the time zone difference -let adjustedMoment = currentMoment.utcOffset(timeZoneDifference); - -// Print the adjusted moment - - - let programDocument = []; - let matchQuery = { status : constants.common.ACTIVE, - startDate: { $gt: new Date() }, - endDate: { $lt: new Date() } - }; + let matchQuery = { status: constants.common.ACTIVE }; if( Object.keys(filter).length > 0 ) { matchQuery = _.merge(matchQuery,filter); diff --git a/module/solutions/helper.js b/module/solutions/helper.js index 7b2e940..016821b 100644 --- a/module/solutions/helper.js +++ b/module/solutions/helper.js @@ -16,7 +16,6 @@ const userExtensionsHelperV2 = require(MODULES_BASE_PATH + "/user-extension/help const userService = require(ROOT_PATH + "/generics/services/users"); const timeZoneDifference = process.env.TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC; - const moment = require('moment'); /** * SolutionsHelper * @class