fix: workly-surveys

Author: yoution

migrations/2021-07-26-add-send-weekly-survery-fields.js

@@ -1,4 +1,5 @@
 const config = require('config')
+const moment = require('moment')
 
 module.exports = {
   up: async (queryInterface, Sequelize) => {
@@ -22,6 +23,8 @@ module.exports = {
               type: Sequelize.STRING(255)
             },
           }), allowNull: true }, { transaction })
+      await queryInterface.sequelize.query(`UPDATE ${config.DB_SCHEMA_NAME}.work_periods SET sent_survey = true where payment_status = 'completed' and end_date <= '${moment().subtract(7, 'days').format('YYYY-MM-DD')}'`,
+        { transaction })
       await transaction.commit()
     } catch (err) {
       await transaction.rollback()
@@ -32,7 +35,7 @@ module.exports = {
     const transaction = await queryInterface.sequelize.transaction()
     try {
       await queryInterface.removeColumn({ tableName: 'resource_bookings', schema: config.DB_SCHEMA_NAME }, 'send_weekly_survey', { transaction })
-      await queryInterface.removeColumn({ tableName: 'work_periods', schema: config.DB_SCHEMA_NAME }, 'send_survey', { transaction })
+      await queryInterface.removeColumn({ tableName: 'work_periods', schema: config.DB_SCHEMA_NAME }, 'sent_survey', { transaction })
       await queryInterface.removeColumn({ tableName: 'work_periods', schema: config.DB_SCHEMA_NAME }, 'sent_survey_error', { transaction } )
       await transaction.commit()
     } catch (err) {

package.json

@@ -19,7 +19,6 @@
     "index:roles": "node scripts/es/reIndexRoles.js",
     "data:export": "node scripts/data/exportData.js",
     "data:import": "node scripts/data/importData.js",
-    "data:workperiod": "node scripts/data/updateWorkPeriodSentSurveyField.js",
     "migrate": "npx sequelize db:migrate",
     "migrate:undo": "npx sequelize db:migrate:undo",
     "test": "mocha test/unit/*.test.js --timeout 30000 --require test/prepare.js --exit",

scripts/data/updateWorkPeriodSentSurveyField.js

@@ -57,7 +57,7 @@ function getSingleItem (lst, errorMessage) {
  * format `Week Ending yyyy-nth(weeks)`
  */
 function getCollectorName (dt) {
-  return 'Week Ending ' + moment(dt).year() + '-' + moment(dt).format('ww')
+  return 'Week Ending ' + moment(dt).format('M/D/YYYY')
 }
 
 /*
@@ -123,7 +123,6 @@ async function cloneCollector () {
  */
 async function renameCollector (collectorId, name) {
   const body = { name: name }
-  // http.patch(BASE_URL + '/collectors/' + collectorId, body);
   const url = `${config.WEEKLY_SURVEY.BASE_URL}/collectors/${collectorId}`
   try {
     const response = await request
@@ -147,7 +146,6 @@ async function createMessage (collectorId) {
     from_collector_id: `${config.WEEKLY_SURVEY.SURVEY_MASTER_COLLECTOR_ID}`,
     from_message_id: `${config.WEEKLY_SURVEY.SURVEY_MASTER_MESSAGE_ID}`
   }
-  // response = http.post(BASE_URL + '/collectors/' + collectorId + '/messages', body);
   const url = `${config.WEEKLY_SURVEY.BASE_URL}/collectors/${collectorId}/messages`
   try {
     const response = await request

src/common/surveyMonkey.js

@@ -57,7 +57,7 @@ module.exports = (sequelize) => {
         allowNull: false
       },
       sentSurvey: {
-        field: 'send_survey',
+        field: 'sent_survey',
         type: Sequelize.BOOLEAN,
         defaultValue: false,
         allowNull: false

src/models/WorkPeriod.js

@@ -26,13 +26,12 @@ async function sendSurveys () {
     'workPeriods.sentSurvey': false,
     'workPeriods.sentSurveyError': '',
     jobIds: [],
-    page: 1,
-    perPage: 1000
+    page: 1
   }
 
   const options = {
-    returnAll: false,
-    returnFromDB: false
+    returnAll: true,
+    returnFromDB: true
   }
   try {
     let resourceBookings = await searchResourceBookings(currentUser, criteria, options)
@@ -48,8 +47,6 @@ async function sendSurveys () {
     // so several WorkPeriods for the same week would be included into on collector
     // and gather contacts (members) from each WorkPeriods
     for (const workPeriod of workPeriods) {
-      // await partiallyUpdateWorkPeriod(currentUser, workPeriod.id, {sentSurvey: true})
-      // await partiallyUpdateWorkPeriod(currentUser, workPeriod.id, {sentSurveyError: {errorCode: 23, errorMessage: "sf"}})
       try {
         const collectorName = getCollectorName(workPeriod.endDate)
 
@@ -86,7 +83,6 @@ async function sendSurveys () {
           }
         }
         emailToWorkPeriodIdMap[collectorName][resourceBookingCache[resourceBooking.userId].email] = workPeriod.id
-        // resourceBookingCache[resourceBooking.userId].workPeriodId  = workPeriod.id
         collectors[collectorName].contacts.push(resourceBookingCache[resourceBooking.userId])
       } catch (e) {
         await partiallyUpdateWorkPeriod(currentUser, workPeriod.id, { sentSurveyError: e })
@@ -105,27 +101,30 @@ async function sendSurveys () {
     // send surveys
     for (const collectorName in collectors) {
       const collector = collectors[collectorName]
-      try {
-        await addContactsToSurvey(
-          collector.collectorId,
-          collector.messageId,
-          collector.contacts
-        )
-        await sendSurveyAPI(collector.collectorId, collector.messageId)
-
-        for (const contactId in contactIdToWorkPeriodIdMap[collectorName]) {
-          await partiallyUpdateWorkPeriod(currentUser, contactIdToWorkPeriodIdMap[collectorName][contactId], { sentSurvey: true })
+      if (collector.contacts.length) {
+        try {
+          await addContactsToSurvey(
+            collector.collectorId,
+            collector.messageId,
+            collector.contacts
+          )
+          await sendSurveyAPI(collector.collectorId, collector.messageId)
+        } catch (e) {
+          for (const contactId in contactIdToWorkPeriodIdMap[collectorName]) {
+            await partiallyUpdateWorkPeriod(currentUser, contactIdToWorkPeriodIdMap[collectorName][contactId], { sentSurveyError: e })
+          }
+          continue
         }
-      } catch (e) {
         for (const contactId in contactIdToWorkPeriodIdMap[collectorName]) {
-          await partiallyUpdateWorkPeriod(currentUser, contactIdToWorkPeriodIdMap[collectorName][contactId], { sentSurveyError: e })
+          await partiallyUpdateWorkPeriod(currentUser, contactIdToWorkPeriodIdMap[collectorName][contactId], { sentSurvey: true })
         }
       }
     }
 
     logger.info({ component: 'SurveyService', context: 'sendSurvey', message: 'send survey successfullly' })
   } catch (e) {
     logger.error({ component: 'SurveyService', context: 'sendSurvey', message: 'Error : ' + e.message })
+    throw e
   }
 }