Merge pull request Expensify#712 from Expensify/chirag-moving-fn-libstuff

Moving method to libstuff so thats its accessible in server-e

Author: tylerkaraszewski

libstuff/libstuff.cpp

@@ -2544,3 +2544,27 @@ void STerminateHandler(void) {
     // And we're out.
     abort();
 }
+
+bool SIsValidSQLiteDateModifier(const string& modifier) {
+    // See: https://www.sqlite.org/lang_datefunc.html
+    list<string> parts = SParseList(SToUpper(modifier));
+    for (const string& part : parts) {
+        // Simple regexp validation
+        if (SREMatch("^(\\+|-)\\d{1,3} (YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)S?$", part)) {
+            continue;
+        }
+        if (SREMatch("^START OF (DAY|MONTH|YEAR)$", part)) {
+            continue;
+        }
+        if (SREMatch("^WEEKDAY [0-6]$", part)) {
+            continue;
+        }
+
+        // Couldn't match this part to any valid syntax
+        SINFO("Syntax error, failed parsing date modifier '" << modifier << "' on part '" << part << "'");
+        return false;
+    }
+
+    // Matched all parts, valid syntax
+    return true;
+}

libstuff/libstuff.h

@@ -486,6 +486,7 @@ inline bool SContains(const string& haystack, char needle) { return haystack.fin
 inline bool SContains(const STable& nameValueMap, const string& name) {
     return (nameValueMap.find(name) != nameValueMap.end());
 }
+bool SIsValidSQLiteDateModifier(const string& modifier);
 
 // General testing functions
 inline bool SIEquals(const string& lhs, const string& rhs) { return !strcasecmp(lhs.c_str(), rhs.c_str()); }

plugins/Jobs.cpp

@@ -246,7 +246,7 @@ bool BedrockPlugin_Jobs::peekCommand(SQLite& db, BedrockCommand& command) {
             }
 
             // Validate retryAfter
-            if (SContains(job, "retryAfter") && job["retryAfter"] != "" && !_isValidSQLiteDateModifier(job["retryAfter"])){
+            if (SContains(job, "retryAfter") && job["retryAfter"] != "" && !SIsValidSQLiteDateModifier(job["retryAfter"])){
                 STHROW("402 Malformed retryAfter");
             }
 
@@ -1285,7 +1285,7 @@ string BedrockPlugin_Jobs::_constructNextRunDATETIME(const string& lastScheduled
 
     for (const string& part : parts) {
         // Validate the sqlite date modifiers
-        if (!_isValidSQLiteDateModifier(part)){
+        if (!SIsValidSQLiteDateModifier(part)){
             SWARN("Syntax error, failed parsing repeat "+part);
             return "";
         }
@@ -1314,30 +1314,6 @@ bool BedrockPlugin_Jobs::_hasPendingChildJobs(SQLite& db, int64_t jobID) {
     return !result.empty();
 }
 
-bool BedrockPlugin_Jobs::_isValidSQLiteDateModifier(const string& modifier) {
-    // See: https://www.sqlite.org/lang_datefunc.html
-    list<string> parts = SParseList(SToUpper(modifier));
-    for (const string& part : parts) {
-        // Simple regexp validation
-        if (SREMatch("^(\\+|-)\\d{1,3} (YEAR|MONTH|DAY|HOUR|MINUTE|SECOND)S?$", part)) {
-            continue;
-        }
-        if (SREMatch("^START OF (DAY|MONTH|YEAR)$", part)) {
-            continue;
-        }
-        if (SREMatch("^WEEKDAY [0-6]$", part)) {
-            continue;
-        }
-
-        // Couldn't match this part to any valid syntax
-        SINFO("Syntax error, failed parsing date modifier '" << modifier << "' on part '" << part << "'");
-        return false;
-    }
-
-    // Matched all parts, valid syntax
-    return true;
-}
-
 void BedrockPlugin_Jobs::_validatePriority(const int64_t priority) {
     // We'd initially intended for any value to be allowable here, but for
     // performance reasons, we currently will only allow specific values to

plugins/Jobs.h

@@ -28,5 +28,4 @@ class BedrockPlugin_Jobs : public BedrockPlugin {
     bool _validateRepeat(const string& repeat) { return !_constructNextRunDATETIME("", "", repeat).empty(); }
     void _validatePriority(const int64_t priority);
     bool _hasPendingChildJobs(SQLite& db, int64_t jobID);
-    bool _isValidSQLiteDateModifier(const string& modifier);
 };