only update completion time if null, double booking confirmed to work…

… after testing
GTBitsOfGood · Apr 23, 2021 · d00c0e2 · d00c0e2
1 parent d2c1474
commit d00c0e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/MassMessage/Scripts/sendMessage.ts b/MassMessage/Scripts/sendMessage.ts
@@ -46,7 +46,8 @@ export const sendCompletedMessage = async function (
     } else {
         await client.messages.create({ body: quiz.body, from: config.numbers.sms, to: id })
     }
-    user.currMessage = quiz
+    user.currMessage = quiz._id
+    user.save()
 }
 
 export const sendInactiveMessage = async function (id: string): Promise<void> {

diff --git a/MassMessage/index.ts b/MassMessage/index.ts
@@ -27,6 +27,8 @@ const timerTrigger: AzureFunction = async function (context: Context, myTimer: a
 
     const completed = await messageCompletedUsers(curDate)
     const inactive = await messageInactiveUsers(curDate)
+    context.log(completed)
+    context.log(inactive)
     inactive.forEach(async (user) => {
         if (completed.has(user.userId)) return
         sendInactiveMessage(user.userId)
@@ -62,7 +64,7 @@ const messageInactiveUsers = async function (date: Date) {
 const messageCompletedUsers = async function (date: Date) {
     //set to two months ago
     const twoMonths = new Date(date)
-    twoMonths.setMonth(twoMonths.getMonth() - 2)
+    twoMonths.setDate(twoMonths.getDate() - 56)
 
     const nextDay = new Date(twoMonths)
     nextDay.setDate(nextDay.getDate() + 1)
@@ -81,13 +83,11 @@ const messageCompletedUsers = async function (date: Date) {
     allUsers.forEach((user) => {
         let module = -1
         let found = false
-        let daysIncrement = 1
         for (let i = 0; i < user.moduleCompletionTime.length; i++) {
             const time = user.moduleCompletionTime[i]
             if (time >= twoMonths && time < nextDay) {
                 if (found) {
-                    time.setDate(time.getDate() + daysIncrement)
-                    daysIncrement += 1
+                    time.setDate(time.getDate() + 1)
                     user.moduleCompletionTime.set(i, time)
                 } else {
                     module = i

diff --git a/ReceiveMessage/index.ts b/ReceiveMessage/index.ts
@@ -55,7 +55,9 @@ const httpTrigger: AzureFunction = async function (context: Context, req: HttpRe
     if (response.messageType == 'final-message') {
         const moduleNumber = parseInt(response.module)
         if (!isNaN(moduleNumber) && moduleNumber > 0) {
-            curUserState.moduleCompletionTime.set(moduleNumber - 1, currTime)
+            if (curUserState.moduleCompletionTime[moduleNumber - 1] == null) {
+                curUserState.moduleCompletionTime.set(moduleNumber - 1, currTime)
+            }
         }
     }
     if (curUserState) {