Merge pull request #1954 from OneCommunityGlobal/venkataramanan_filter_blue_square_one_year_old

Venkataramanan 🔥 delete blue squares one year old

Author: one-community

src/controllers/userProfileController.js

@@ -1042,6 +1042,9 @@ const userProfileController = function (UserProfile, Project) {
     //   res.status(200).send(getData);
     //   return;
     // }
+    const ONE_YEAR_AGO = new Date();
+    ONE_YEAR_AGO.setFullYear(ONE_YEAR_AGO.getFullYear() - 1);
+
     UserProfile.findById(userid, '-password -refreshTokens -lastModifiedDate -__v')
       .populate([
         {
@@ -1072,6 +1075,7 @@ const userProfileController = function (UserProfile, Project) {
         },
         {
           path: 'infringements', // Populate infringements field
+          match: { date: { $gte: ONE_YEAR_AGO } },
           select: 'date description',
           options: {
             sort: {

src/helpers/userHelper.js

@@ -1138,30 +1138,29 @@ const userHelper = function () {
   };
 
   const deleteBlueSquareAfterYear = async () => {
-    const currentFormattedDate = moment().tz('America/Los_Angeles').format();
+    const nowLA = moment().tz('America/Los_Angeles');
 
-    logger.logInfo(
-      `Job for deleting blue squares older than 1 year starting at ${currentFormattedDate}`,
-    );
+    logger.logInfo(`Job for deleting blue squares older than 1 year starting at ${nowLA.format()}`);
 
-    const cutOffDate = moment().subtract(1, 'year').format('YYYY-MM-DD');
+    const cutOffDate = nowLA.clone().subtract(1, 'year').toDate();
 
     try {
       const results = await userProfile.updateMany(
         {},
         {
           $pull: {
             infringements: {
-              date: {
-                $lte: cutOffDate,
-              },
+              date: { $lte: cutOffDate },
             },
           },
         },
       );
 
-      logger.logInfo(`Job deleting blue squares older than 1 year finished
-        at ${moment().tz('America/Los_Angeles').format()} \nReulst: ${JSON.stringify(results)}`);
+      logger.logInfo(
+        `Job deleting blue squares older than 1 year finished at ${moment()
+          .tz('America/Los_Angeles')
+          .format()} \nResult: ${JSON.stringify(results)}`,
+      );
     } catch (err) {
       logger.logException(err);
     }