Merge pull request #1201 from ReliefApplications/next

Next

Author: AntoineRelief

CHANGELOG/CHANGELOG_next.md

@@ -1,3 +1,10 @@
+# [2.14.0-rc.1](https://github.com/ReliefApplications/ems-backend/compare/v2.13.0...v2.14.0-rc.1) (2025-03-17)
+
+
+### Features
+
+* enable {{now}} placeholder for datetime fields in edition ([#1200](https://github.com/ReliefApplications/ems-backend/issues/1200)) ([f97295b](https://github.com/ReliefApplications/ems-backend/commit/f97295b5b12d0c8bfb321bd33f5de0d8394cd1a0))
+
 # [2.13.0-rc.3](https://github.com/ReliefApplications/ems-backend/compare/v2.13.0-rc.2...v2.13.0-rc.3) (2025-03-04)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ems-backend",
-  "version": "2.13.0",
+  "version": "2.14.0-rc.1",
   "description": "",
   "main": "index.js",
   "scripts": {

package.json

@@ -30,6 +30,16 @@ export const isUsingTodayPlaceholder = (value: any) => {
   );
 };
 
+/**
+ * Tests whether value is using the {{now}} placeholder
+ *
+ * @param value value to test
+ * @returns true if using {{now}}
+ */
+export const isUsingNowPlaceholder = (value: any) => {
+  return value === Placeholder.NOW;
+};
+
 /**
  * Extract string contained into brackets used for placeholders.
  *

src/const/placeholders.ts

@@ -3,6 +3,7 @@ import {
   REGEX_TODAY_PLUS,
   REGEX_TODAY_MINUS,
   isUsingTodayPlaceholder,
+  isUsingNowPlaceholder,
 } from '../../const/placeholders';
 
 /**
@@ -17,6 +18,7 @@ export const getDateForMongo = (
   // today's date
   let startDate: Date;
   if (isUsingTodayPlaceholder(value)) {
+    // Using {{today}}
     startDate = new Date();
     startDate.setHours(0, 0, 0, 0);
     // today + number of days
@@ -31,8 +33,12 @@ export const getDateForMongo = (
         extractStringFromBrackets(value).split('-')[1]
       );
       startDate.setDate(startDate.getDate() + difference);
-    } // classic date
+    }
+  } else if (isUsingNowPlaceholder(value)) {
+    // Using {{now}}
+    startDate = new Date();
   } else {
+    // Other dates
     startDate = new Date(value);
   }
   const endDate = new Date(startDate);