fix bugs in notifications

Author: MineMe0812

config.yml

@@ -12,7 +12,7 @@ prod:
   COGNITO_POOL_ARN: arn:aws:cognito-idp:us-east-1:501132611696:userpool/us-east-1_HSo98n6V8
   COGNITO_POOL_ID: us-east-1_HSo98n6V8
   ERROR_LEVEL: CRITICAL
-  SNS_NOTI_TRIGGER_ARN: arn:aws:sns:us-east-1:501132611696:pennyboxapp-dev-noti_trigger-pipe
+  SNS_NOTI_TRIGGER_ARN: arn:aws:sns:us-east-1:501132611696:pennyboxapp-prod-noti_trigger-pipe
   SNS_PUSH_APN_ARN: arn:aws:sns:us-east-1:501132611696:app/APNS/PennyboxApp-Prod
   CUSTOM_DOMAIN_NAME: api-prod.pennybox.com
 test:

fixtures/offline-seeds/job.json

@@ -1,4 +1,4 @@
-[{
+  [{
     "id": "c796d733-9779-45c5-a130-20fd1fd0b652",
     "familyId": "287ef3f0-d79f-11e7-a2eb-bb9bea49fda2",
     "childUserId": "a2f5acbc-6e3e-4acf-b13f-9ea98e474237",
@@ -19,6 +19,22 @@
         "issuedAt": "1506423488524",
         "issuedBy": "c796d733-9779-45c5-a130-20fd1fd0b652",
         "meta": {}
+      }, {
+        "status": "SUMMARY_UPDATED",
+        "issuedAt": "1506423488524",
+        "issuedBy": "c796d733-9779-45c5-a130-20fd1fd0b652",
+        "meta": {
+          "before": {
+            "title": "Walk the dog before",
+            "price": 4,
+            "backdropResource": "old url"
+          },
+          "after": {
+            "title": "Walk the dog",
+            "price": 3,
+            "backdropResource": "image or video url here"
+          }
+        }
       }
     ]
 }, {

package.json

@@ -39,6 +39,7 @@
     "eslint-import-resolver-webpack": "^0.8.3",
     "eslint-plugin-import": "^2.7.0",
     "mocha": "^4.0.1",
+    "noop-webpack-plugin": "^1.0.1",
     "serverless-domain-manager": "^2.0.1",
     "serverless-dynamodb-autoscaling": "^0.6.2",
     "serverless-dynamodb-local": "^0.2.25",
@@ -49,7 +50,8 @@
     "serverless-webpack": "^4.1.0",
     "uglifyjs-webpack-plugin": "^1.1.4",
     "webpack": "^3.10.0",
-    "webpack-node-externals": "^1.6.0"
+    "webpack-node-externals": "^1.6.0",
+    "yargs": "^11.0.0"
   },
   "dependencies": {
     "aws-sdk": "^2.122.0",

serverless.yml

@@ -196,6 +196,16 @@ functions:
           authorizer:
             name: authorizer
             arn: ${file(./config.yml):${self:custom.stage}.COGNITO_POOL_ARN}
+  updateJobSummary:
+    handler: src/handlers/job.updateSummary
+    events:
+      - http:
+          method: PUT
+          path: job/{jobId}/summary
+          cors: true
+          authorizer:
+            name: authorizer
+            arn: ${file(./config.yml):${self:custom.stage}.COGNITO_POOL_ARN}
   listJobsByFamilyMember:
     handler: src/handlers/job.listByFamilyMember
     events:

src/controllers/Job.js

@@ -6,7 +6,8 @@ import TransactionModel from 'models/Transaction';
 import { notifyJob } from 'utils/noti/index';
 
 import {
-  checkAllowedJobStatusSafeUpdate as checkSafeStatus
+  checkAllowedJobStatusSafeUpdate as checkSafeStatus,
+  checkAllowedJobSummarySafeUpdate as checkSafeSummary
 } from 'utils/validation';
 
 export default class JobController {
@@ -86,11 +87,24 @@ export default class JobController {
 
     return updatedJob;
   }
-}
 
-function test(updatedJobStatus, currentUserType) {
-  if (updatedJobStatus !== 'REMOVED' ||
-      (updatedJobStatus === 'REMOVED' && currentUserType === 'PARENT')) {
-    console.log('Send notification');
+  async safeUpdateSummary(currentUser, jobId, reqParam) {
+    const jobData = await this.job.fetchById(jobId);
+    if (!jobData) {
+      throw Boom.notFound('Not existing job');
+    }
+
+    // TODO: child user can only update the job that created for him.
+    // TODO: parent user can only update the job that created for his family.
+    const safetyError = checkSafeSummary(currentUser.type, jobData.status);
+    if (safetyError) {
+      throw Boom.badRequest(safetyError);
+    }
+
+    const updatedJob = await this.job.updateSummary(currentUser.userId, reqParam, jobData);
+
+    await notifyJob(updatedJob);
+
+    return updatedJob;
   }
 }

src/controllers/Notification.js

@@ -107,17 +107,26 @@ export default class NotiController {
 
   async notifyJob(jobId, snsOriginMessage) {
     const job = await this.job.fetchById(jobId);
+    if (!job) {
+      throw Boom.notFound(`Not existing job with id ${jobId}`);
+    }
 
     let targetUsers;
     const { status } = job;
-    const lastHistory = R.last(job.history);
-    const prevLastHistory = R.pipe(R.takeLast(2), R.first)(job.history);
+    const jobHistory = R.filter(h => h.status, job.history);
+    const lastHistory = R.last(jobHistory);
+    const prevLastHistory = R.pipe(R.takeLast(2), R.head)(jobHistory);
     const { username, type } = await this.user.fetchById(lastHistory.issuedBy);
 
     console.log('RECEIVED ACTION: ', snsOriginMessage.content);
     console.log('CURRENT JOB STATUS: ', status);
-
-    if (['CREATED_BY_CHILD', 'FINISHED', 'STARTED'].includes(status)) {
+    if (snsOriginMessage.content === 'child.job.SUMMARY_UPDATED') {
+      if (type === 'parent' && !['CREATED_BY_CHILD', 'START_DECLINED'].includes(prevLastHistory.status)) {
+        targetUsers = [await this.user.fetchById(job.childUserId)];
+      } else {
+        throw Boom.teapot('No need to notify for the premature jobs');
+      }
+    } else if (['CREATED_BY_CHILD', 'FINISHED', 'STARTED'].includes(status)) {
       targetUsers = await this._getUsersFromFamily(job.familyId, 'parent');
     } else if (['START_DECLINED', 'START_APPROVED', 'FINISH_DECLINED', 'PAID'].includes(status)) {
       targetUsers = [await this.user.fetchById(job.childUserId)];
@@ -144,6 +153,9 @@ export default class NotiController {
 
   async notifyWithdrawal(withdrawalId, snsOriginMessage) {
     const withdrawal = await this.withdrawal.fetchById(withdrawalId);
+    if (!withdrawal) {
+      throw Boom.notFound(`Not existing withdrawal request with id ${withdrawalId}`);
+    }
 
     let targetUsers;
     const { status } = withdrawal;

src/handlers/job.js

@@ -5,6 +5,7 @@ import JobController from 'controllers/Job';
 import {
   checkCreateJobDataSchema,
   checkUpdateJobStatusSchema,
+  checkUpdateJobSummarySchema,
 } from 'utils/validation';
 
 const job = new JobController();
@@ -73,6 +74,26 @@ export async function updateStatus(event, context, callback) {
   callback(null, response);
 }
 
+export async function updateSummary(event, context, callback) {
+  let response;
+
+  try {
+    const { currentUser, body, params } = await parseAPIGatewayEvent(event);
+
+    const validationError = checkUpdateJobSummarySchema(body);
+    if (validationError) {
+      throw Boom.preconditionFailed(validationError);
+    }
+
+    const updated = await job.safeUpdateSummary(currentUser, params.jobId, body);
+    response = success(updated);
+  } catch (e) {
+    response = failure(e, event);
+  }
+
+  callback(null, response);
+}
+
 export async function listByFamily(event, context, callback) {
   let response;
 

src/models/Job.js

@@ -1,4 +1,4 @@
-import { omit, pick } from 'ramda';
+import { omit, pick, merge } from 'ramda';
 import uuidv1 from 'uuid/v1';
 import dbClient from 'utils/db-client';
 
@@ -145,7 +145,8 @@ export default class JobModel {
         ':h': [{
           ...newData,
           issuedAt: now.getTime(),
-          issuedBy: currentUserId
+          issuedBy: currentUserId,
+          description: 'STATUS UPDATED'
         }],
         ':s': newData.status,
         ':m': now.toISOString(),
@@ -157,4 +158,40 @@ export default class JobModel {
 
     return this.dbClient('update', params).then(data => data.Attributes);
   }
+
+  updateSummary(currentUserId, summaryUpdate, currentJob) {
+    const now = new Date();
+    const primaryKeys = ['familyId', 'childUserId__createdTimestamp'];
+    const newSummary = merge(currentJob.jobSummary, summaryUpdate);
+
+    const params = {
+      TableName: JOB_TABLENAME,
+      Key: pick(primaryKeys, currentJob),
+      UpdateExpression: [
+        'SET history = list_append(history, :h)',
+        'jobSummary = :summary',
+        'modified = :m',
+        'childUserId__modifiedTimestamp = :cm',
+        'modifiedTimestamp__familyId = :mf'
+      ].join(', '),
+      ExpressionAttributeValues: {
+        ':h': [{
+          issuedAt: now.getTime(),
+          issuedBy: currentUserId,
+          meta: {
+            before: currentJob.jobSummary,
+            after: newSummary
+          },
+          description: 'SUMMARY UPDATED'
+        }],
+        ':summary': newSummary,
+        ':m': now.toISOString(),
+        ':cm': `${currentJob.childUserId}__${now.getTime()}`,
+        ':mf': `${now.getTime()}__${currentJob.familyId}`
+      },
+      ReturnValues: 'ALL_NEW'
+    };
+
+    return this.dbClient('update', params).then(data => data.Attributes);
+  }
 }

src/utils/noti/available_notifications.json

@@ -35,6 +35,10 @@
     "push": "{username} has deleted this job\n{title}",
     "inapp": "Job deleted\n{title}"
   },
+  "child.job.SUMMARY_UPDATED": {
+    "push": "{username} has edited this job\n{title} for {amount}",
+    "inapp": "Job detail's changed\n{title}"
+  },
   "parent.withdrawal.CREATED_BY_CHILD": {
     "push": "{username} has requested a cash out for {amount}.\nPay it now?",
     "inapp": "Cash out requested\nPay it now?"

src/utils/noti/trigger.js

@@ -1,4 +1,5 @@
 import AWSXRay from 'aws-xray-sdk-core';
+import * as R from 'ramda';
 import { checkValidNotiTriggerMessage } from 'utils/validation';
 
 const AWS = AWSXRay.captureAWS(require('aws-sdk'));
@@ -27,6 +28,12 @@ export function trigger (message) { // eslint-disable-line
 
 export const notifyJob = (job) => {
   let performedAction;
+  if (R.last(job.history).status === 'SUMMARY_UPDATED') {
+    return trigger({
+      content: 'child.job.SUMMARY_UPDATED',
+      jobId: job.id
+    });
+  }
 
   switch (job.status) {
     default: case 'CREATED_BY_PARENT':