Merge pull request #201 from borkarsaish65/bugfix/program_listing

Bugfix/program listing
project-sunbird · Jan 20, 2025 · c9ecf67 · c9ecf67
2 parents 10206f0 + dc4a144
commit c9ecf67
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/module/programs/helper.js b/module/programs/helper.js
@@ -433,10 +433,9 @@ module.exports = class ProgramsHelper {
     return new Promise( async (resolve, reject) => {
 
       try {
-
         let programDocument = [];
 
-        let matchQuery = { status : constants.common.ACTIVE };
+        let matchQuery = { status: constants.common.ACTIVE };
 
         if( Object.keys(filter).length > 0 ) {
           matchQuery = _.merge(matchQuery,filter);
@@ -498,6 +497,8 @@ module.exports = class ProgramsHelper {
 
         programDocument.push({ $match : matchQuery }, sortQuery,{ $project : projection1 }, facetQuery, projection2);
 
+
+
         let programDocuments = 
         await database.models.programs.aggregate(programDocument);
 
@@ -529,7 +530,7 @@ module.exports = class ProgramsHelper {
    * @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) => {
 
@@ -542,6 +543,12 @@ module.exports = class ProgramsHelper {
         if( !queryData.success ) {
           return resolve(queryData);
         }
+
+        if (programId !== "") {
+          queryData.data._id = gen.utils.convertStringToObjectId(programId);
+        }
+        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
@@ -711,10 +711,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 +737,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 +755,8 @@ module.exports = class SolutionsHelper {
             matchQuery["programId"] = ObjectId(programId);
           }
 
+          matchQuery["startDate"] = { $lte: new Date() };
+
           let targetedSolutions = await this.list(
             type,
             subType,
@@ -901,7 +921,8 @@ module.exports = class SolutionsHelper {
             "language",
             "creator",
             "link",
-            "certificateTemplateId"
+            "certificateTemplateId",
+            "endDate"
           ]
         );