last fix

dataesr · Feb 25, 2025 · e18581c · e18581c
1 parent bb46b21
commit e18581c
Showing 1 changed file with 41 additions and 8 deletions.
diff --git a/src/jobs/treatments/set-statuses.js b/src/jobs/treatments/set-statuses.js
@@ -131,8 +131,19 @@ export async function setStructureStatus() {
                     { $ne: ["$normalizedCreationDate", null] },
                     {
                       $gt: [
-                        { $dateFromString: { dateString: "$normalizedCreationDate" } },
-                        "$$NOW"
+                        {
+                          $dateFromString: {
+                            dateString: "$normalizedCreationDate",
+                            timezone: "UTC"
+                          }
+                        },
+                        {
+                          $dateTrunc: {
+                            date: "$$NOW",
+                            unit: "day",
+                            timezone: "UTC"
+                          }
+                        }
                       ]
                     }
                   ]
@@ -145,9 +156,20 @@ export async function setStructureStatus() {
                     else: {
                       $cond: {
                         if: {
-                          $gt: [
-                            { $dateFromString: { dateString: "$normalizedEndDate" } },
-                            { $dateFromString: { dateString: { $dateToString: { date: "$$NOW", format: "%Y-%m-%d" } } } }
+                          $gte: [
+                            {
+                              $dateFromString: {
+                                dateString: "$normalizedEndDate",
+                                timezone: "UTC"
+                              }
+                            },
+                            {
+                              $dateTrunc: {
+                                date: "$$NOW",
+                                unit: "day",
+                                timezone: "UTC"
+                              }
+                            }
                           ]
                         },
                         then: "active",
@@ -259,9 +281,20 @@ export async function setIdentifierStatus() {
                 if: { $eq: ["$normalizedEndDate", null] },
                 then: true,
                 else: {
-                  $gt: [
-                    { $dateFromString: { dateString: "$normalizedEndDate" } },
-                    { $dateFromString: { dateString: { $dateToString: { date: "$$NOW", format: "%Y-%m-%d" } } } }
+                  $gte: [
+                    {
+                      $dateFromString: {
+                        dateString: "$normalizedEndDate",
+                        timezone: "UTC"
+                      }
+                    },
+                    {
+                      $dateTrunc: {
+                        date: "$$NOW",
+                        unit: "day",
+                        timezone: "UTC"
+                      }
+                    }
                   ]
                 }
               }