Merge pull request #178 from CheckMateSG/develop

2.7.3
bettersg · Oct 26, 2023 · b710d09 · b710d09
2 parents 05aa461 + 3a8673f
commit b710d09
Show file tree

Hide file tree

Showing 18 changed files with 2,066 additions and 336 deletions.
diff --git a/documentation/dataSchema.md b/documentation/dataSchema.md
@@ -54,6 +54,8 @@ erDiagram
         boolean isInterimPromptSent "Have we sent an interim prompt"
         boolean isInterimUseful "Whether the interim message is useful"
         boolean isInterimReplySent "Have we sent an interim reply"
+        boolean isRationalisationSent "Has the rationalisation been sent"
+        boolean isRationalisationUseful "Is the rationalisation feature useful"
         boolean isReplyForced "track if final reply is forced"
         boolean isMatched "track if message was matched"
         boolean isReplyImmediate "track if final reply is immediate"

diff --git a/functions/.env.local.test b/functions/.env.local.test
@@ -4,8 +4,6 @@ GRAPH_API_VERSION=v15.0
 TEST_SERVER_URL=http://resultserver:12345
 ENVIRONMENT=SIT
 SPREADSHEET_ID=SPREADSHEET_ID
-WHATSAPP_TEST_USER_BOT_PHONE_NUMBER_ID=WHATSAPP_TEST_USER_BOT_PHONE_NUMBER_ID
-WHATSAPP_TEST_CHECKER_BOT_PHONE_NUMBER_ID=WHATSAPP_TEST_CHECKER_BOT_PHONE_NUMBER_ID
 CHECKER1_PHONE_NUMBER=6511111111
 SIMILARITY_THRESHOLD=0.85
 TYPESENSE_HOST=typesense-server
@@ -14,6 +12,4 @@ TYPESENSE_PROTOCOL=http
 EMBEDDER_HOST=http://embedder-server:12344
 TELEGRAM_REPORT_CHANNEL_ID=111111111
 TEST_IMAGE_URL=TEST
-HASHIDS_SALT=SALT
-WHATSAPP_TEST_USERS_WABA_ID=WHATSAPP_TEST_USER_WABA_ID
-WHATSAPP_TEST_CHECKERS_WABA_ID=WHATSAPP_TEST_CHECKER_WABA_ID
+HASHIDS_SALT=SALT
diff --git a/functions/.secret.local.test b/functions/.secret.local.test
@@ -1,5 +1,5 @@
-WHATSAPP_USER_BOT_PHONE_NUMBER_ID=WHATSAPP_USER_BOT_PHONE_NUMBER_ID
-WHATSAPP_CHECKERS_BOT_PHONE_NUMBER_ID=WHATSAPP_CHECKERS_BOT_PHONE_NUMBER_ID
+WHATSAPP_USER_BOT_PHONE_NUMBER_ID=WHATSAPP_TEST_USER_BOT_PHONE_NUMBER_ID
+WHATSAPP_CHECKERS_BOT_PHONE_NUMBER_ID=WHATSAPP_TEST_CHECKER_BOT_PHONE_NUMBER_ID
 WHATSAPP_TOKEN=WHATSAPP_TOKEN
 TELEGRAM_CHECKER_BOT_TOKEN=TELEGRAM_CHECKER_BOT_TOKEN
 TELEGRAM_REPORT_BOT_TOKEN=TELEGRAM_REPORT_BOT_TOKEN
@@ -8,5 +8,5 @@ BITLY_TOKEN=BITLY_TOKEN
 TYPESENSE_TOKEN=TYPESENSE_TOKEN
 ML_SERVER_TOKEN=ML_SERVER_TOKEN
 TELEGRAM_BOT_TOKEN=TELEGRAM_BOT_TOKEN
-WHATSAPP_USERS_WABA_ID=WHATSAPP_USERS_WABA_ID
-WHATSAPP_CHECKERS_WABA_ID=WHATSAPP_CHECKERS_WABA_ID
+WHATSAPP_USERS_WABA_ID=WHATSAPP_TEST_USER_WABA_ID
+WHATSAPP_CHECKERS_WABA_ID=WHATSAPP_TEST_CHECKER_WABA_ID