Revert back to new version with bugfix (#44)

reeceappling · web-flow · commit 83ffb2d38704 · 2025-06-23T18:05:26.000-04:00
* Revert "Revert "Also do created objectives (#42)" (#43)" This reverts commit aab080f. * Update index.js postfix on new dynamo entries * fix dynamo insertRecord for postfix * fix tests
diff --git a/it/integration.test.js b/it/integration.test.js
@@ -3,9 +3,9 @@ const index = require('../src/index');
 describe('integration', () => {
   const event = {
     time: '2022-06-16T00:00:00Z'
-  }
+  };
 
   test('process event', async () => {
-    const result = await index.handler(event);
-  })
-})
+    await index.handler(event);
+  });
+});
diff --git a/src/dynamodb.js b/src/dynamodb.js
@@ -21,12 +21,12 @@ async function getRecord(key) {
   return response.Items;
 }
 
-function insertRecord(activity) {
+function insertRecord(activity, postfix) {
   const timeToLive = activity.occurredAt / 1000 + sevenDaysInSeconds;
   const params = {
     TableName: tableName,
     Item: {
-      ID: { S: activity.content.objective.id },
+      ID: { S: activity.content.objective.id + postfix },
       TIMESTAMP: { N: activity.occurredAt.toString() },
       TTL: { N: timeToLive.toString() }
     }
diff --git a/src/filter.js b/src/filter.js
@@ -5,26 +5,35 @@ const threeDaysInMillis = 3 * 24 * 60 * 60 * 1000;
   Partially achieved status == 103
 */
 function filterActivities(activities, eventDate) {
-  const publicObjectiveStatusChanges = activities.items.flatMap(i => i.items || [])
-    .flatMap(i => i.activities || [])
-    .filter(a => a.type === 'OBJECTIVE_STATUS_CHANGED')
+  const allActivities = activities.items.flatMap(i => i.items || [])
+    .flatMap(i => i.activities || []);
+  const recentPublicActivitesCreatedOrChanged = allActivities.filter(a => a.type === 'OBJECTIVE_STATUS_CHANGED' || a.type === 'OBJECTIVE_CREATED')
     .filter(a => a.content.objective.visibility === 'PUBLIC')
     .filter(a => a.occurredAt >= eventDate.getTime() - threeDaysInMillis);
-
-  const groupedObjectiveStatusChanges = publicObjectiveStatusChanges.reduce((acc, activity) => {
+  const reducer = (acc, activity) => {
     acc[activity.content.objective.id] = acc[activity.content.objective.id] || [];
     acc[activity.content.objective.id].push(activity);
     return acc;
-  }, {});
+  };
+  const groupedObjectivesCreated = recentPublicActivitesCreatedOrChanged.filter(a => a.type === 'OBJECTIVE_CREATED')
+    .reduce(reducer, {});
+  const groupedObjectiveStatusChanges = recentPublicActivitesCreatedOrChanged.filter(a => a.type === 'OBJECTIVE_STATUS_CHANGED')
+    .reduce(reducer, {});
 
-  return Object.entries(groupedObjectiveStatusChanges)
-    .flatMap(([objectiveId, activities]) => {
-      const mostRecentObjectiveChange = activities.sort((a, b) => b.occurredAt - a.occurredAt)[0];
-      if (mostRecentObjectiveChange.change.newStatus.status === 100 || mostRecentObjectiveChange.change.newStatus.status === 103) {
-        return [mostRecentObjectiveChange];
-      }
-      return [];
-    });
+  return {
+    completed: Object.entries(groupedObjectiveStatusChanges)
+      .flatMap(([objectiveId, activities]) => {
+        const mostRecentObjectiveChange = activities.sort((a, b) => b.occurredAt - a.occurredAt)[0];
+        if (mostRecentObjectiveChange.change.newStatus.status === 100 || mostRecentObjectiveChange.change.newStatus.status === 103) {
+          return [mostRecentObjectiveChange];
+        }
+        return [];
+      }),
+    created: Object.entries(groupedObjectivesCreated)
+      .flatMap(([objectiveId, activities]) => {
+        return [activities.sort((a, b) => b.occurredAt - a.occurredAt)[0]];
+      })
+  };
 }
 
 exports.filterActivities = filterActivities;
diff --git a/src/index.js b/src/index.js
@@ -19,29 +19,48 @@ async function main(event, context) {
   */
   const slackChannel = process.env.SlackChannel;
   const secrets = await secretsClient.getSecret();
-  const objectiveActivities = await smallImprovementsClient.getObjectives(secrets.SIToken);
-  const recentlyCompletedObjectives = filter.filterActivities(objectiveActivities, new Date(event.time));
-  console.log(`Found ${recentlyCompletedObjectives.length} recently completed objectives.`);
-  const results = await Promise.allSettled(
-    recentlyCompletedObjectives.map(async (activity) => {
+  const objectiveActivities = await smallImprovementsClient.GetObjectives(secrets.SIToken);
+  const { completed, created } = filter.filterActivities(objectiveActivities, new Date(event.time));
+  console.log(`Found ${completed.length} recently completed and ${created.length} recently created objectives.`);
+  const completedResults = await Promise.allSettled(
+    completed.map(async (activity) => {
       const exisingEntry = await dynamodbClient.getRecord(activity.content.objective.id);
       if (!exisingEntry?.length) {
-        const SIEmail = await smallImprovementsClient.getEmail(activity.content.objective.owner.id, secrets.SIToken);
-        await slackService.postObjective(
+        const SIEmail = await smallImprovementsClient.GetEmail(activity.content.objective.owner.id, secrets.SIToken);
+        await slackService.PostCompletedObjective(
           secrets.SlackToken,
           slackChannel,
           activity.content,
           activity.change.newStatus.description,
           SIEmail
         );
-        await dynamodbClient.insertRecord(activity);
+        await dynamodbClient.insertRecord(activity, '');
         return activity.content.objective;
       }
       return undefined;
     })
   );
-  const successfulPosts = results.filter(x => x.value);
-  const failedPosts = results.filter(x => x.status === 'rejected');
+  const createdResults = await Promise.allSettled(
+    created.map(async (activity) => {
+      const exisingEntry = await dynamodbClient.getRecord(activity.content.objective.id + 'CREATED');
+      if (!exisingEntry?.length) {
+        const SIEmail = await smallImprovementsClient.GetEmail(activity.content.objective.owner.id, secrets.SIToken);
+        await slackService.PostCreatedObjective(
+          secrets.SlackToken,
+          slackChannel,
+          activity.content,
+          SIEmail
+        );
+        await dynamodbClient.insertRecord(activity, 'CREATED');
+        return activity.content.objective;
+      }
+      return undefined;
+    })
+  );
+  const allPostResults = completedResults.concat(createdResults);
+  const successfulPosts = allPostResults.filter(x => x.value);
+  const failedPosts = allPostResults.filter(x => x.status === 'rejected');
+
   failedPosts.forEach(fail => console.log(fail.reason));
   const message = `Finished ${successfulPosts.length} successfully. Failed ${failedPosts.length}`;
   console.log(message);
diff --git a/src/slack-service.js b/src/slack-service.js
@@ -1,11 +1,16 @@
 const slackClient = require('./slack');
 
 // Get Slack ID, Format Message, Post
-async function postObjective(token, channelName, content, newStatus, email) {
+async function PostCompletedObjective(token, channelName, content, newStatus, email) {
   const slackID = await slackClient.getSlackID(email, token);
-  const formattedMessage = await slackClient.formatSlackMessage(content.objective, newStatus, slackID, content.cycle.id);
-  const postResp = await slackClient.slackPost(token, channelName, formattedMessage);
-  return postResp;
+  const formattedMessage = await slackClient.formatSlackMessageForCompleted(content.objective, newStatus, slackID, content.cycle.id);
+  return await slackClient.slackPost(token, channelName, formattedMessage);
+}
+async function PostCreatedObjective(token, channelName, content, email) {
+  const slackID = await slackClient.getSlackID(email, token);
+  const formattedMessage = await slackClient.formatSlackMessageForCreated(content.objective, slackID, content.cycle.id);
+  return await slackClient.slackPost(token, channelName, formattedMessage);
 }
 
-exports.postObjective = postObjective;
+exports.PostCompletedObjective = PostCompletedObjective;
+exports.PostCreatedObjective = PostCreatedObjective;
diff --git a/src/slack.js b/src/slack.js
@@ -41,7 +41,7 @@ async function slackPost(authToken, channelName, formattedMessage) { // postData
   });
 }
 
-async function formatSlackMessage(objectiveItem, newStatus, slackUID, cycleId) {
+async function formatSlackMessageForCompleted(objectiveItem, newStatus, slackUID, cycleId) {
   const toSend = messageVariables;
   toSend.text = `<@${slackUID}> has ${newStatus.toLowerCase()} their goal!\n*${objectiveItem.title}*\n`;
   if (objectiveItem.description) {
@@ -51,6 +51,16 @@ async function formatSlackMessage(objectiveItem, newStatus, slackUID, cycleId) {
   return toSend;// return JSON format
 }
 
+async function formatSlackMessageForCreated(objectiveItem, slackUID, cycleId) {
+  const toSend = messageVariables;
+  toSend.text = `<@${slackUID}> has created a new goal!\n*${objectiveItem.title}*\n`;
+  if (objectiveItem.description) {
+    toSend.text += `${formatDescription(objectiveItem.description)}\n`;
+  }
+  toSend.text += `<https://allies.small-improvements.com/app/objectives/${cycleId}/${objectiveItem.id}|Open in Small Improvements>`;
+  return toSend;// return JSON format
+}
+
 function formatDescription(description) {
   if (description.includes('<!--MARKUP_VERSION:v3-->')) {
     const bold = /<\/?strong>/gi;
@@ -119,7 +129,8 @@ function getSlackID(email, token) {
   });
 }
 
-exports.formatSlackMessage = formatSlackMessage;
+exports.formatSlackMessageForCompleted = formatSlackMessageForCompleted;
+exports.formatSlackMessageForCreated = formatSlackMessageForCreated;
 exports.formatDescription = formatDescription;
 exports.slackPost = slackPost;
 exports.getSlackID = getSlackID;
diff --git a/src/small-improvements.js b/src/small-improvements.js
@@ -70,5 +70,5 @@ function getEmail(SIUID, token) { // SIUID (Small Improvements User ID) is in th
   });
 }
 
-exports.getObjectives = getObjectives;
-exports.getEmail = getEmail;
+exports.GetObjectives = getObjectives;
+exports.GetEmail = getEmail;
diff --git a/test/data-factory.js b/test/data-factory.js
@@ -4,7 +4,7 @@ const defaultNewStatus = {
   status: 100
 };
 
-exports.createActivity = (activityProps, objectiveProps, newStatus = defaultNewStatus) => {
+exports.createCompletedActivity = (activityProps, objectiveProps, newStatus = defaultNewStatus) => {
   return {
     actor: {
       firstName: 'Developer'
@@ -49,3 +49,42 @@ exports.createActivity = (activityProps, objectiveProps, newStatus = defaultNewS
     ...activityProps
   };
 };
+
+exports.createCreatedActivity = (activityProps, objectiveProps) => {
+  return {
+    actor: {
+      firstName: 'Developer'
+    },
+    occurredAt: 1651856682326,
+    change: {},
+    id: 'w02bdXSdzFNre*n3plJQgQ',
+    type: 'OBJECTIVE_CREATED',
+    targets: [
+      {
+        firstName: 'Developer'
+      }
+    ],
+    content: {
+      cycle: {
+        id: 'E0hlMiEuRi7T7Md8PWyQuQ',
+        name: 'Objective Cycle 2022'
+      },
+      objective: {
+        id: 'w02bdXSdzFNre*n3plJQll',
+        icon: 'o_3goldstars',
+        title: 'Objective Title',
+        description: '<!--MARKUP_VERSION:v3--><p>Description</p>',
+        dueDate: '2022-06-30T05:00:00.000Z',
+        owner: {
+          firstName: 'Developer',
+          id: 'V*jArA9pQbaK0U7grc9Qrw',
+          email: 'rappling@sourceallies.com'
+        },
+        visibility: 'PUBLIC',
+        visibleTo: [],
+        ...objectiveProps
+      }
+    },
+    ...activityProps
+  };
+};
diff --git a/test/dynamodb.test.js b/test/dynamodb.test.js
@@ -90,7 +90,7 @@ describe('dynamodb', () => {
       });
       putItemPromise.mockResolvedValue({});
 
-      const result = await dynamodbClient.insertRecord(activity);
+      const result = await dynamodbClient.insertRecord(activity, '');
 
       expect(result).toStrictEqual({});
       expect(mockPutItem).toBeCalledWith({
diff --git a/test/filter.test.js b/test/filter.test.js
@@ -19,13 +19,20 @@ describe('filter activities', () => {
             {
               occurredAt: 1651856682326,
               activities: [
-                dataFactory.createActivity(
+                dataFactory.createCompletedActivity(
+                  { occurredAt: new Date(eventDateString).getTime() - (60 * 1000) },
+                  { id: objectiveId }
+                ),
+                dataFactory.createCreatedActivity(
                   { occurredAt: new Date(eventDateString).getTime() - (60 * 1000) },
                   { id: objectiveId }
                 )
               ]
             }
           ]
+        },
+        {
+
         }
       ]
     };
@@ -36,7 +43,8 @@ describe('filter activities', () => {
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(1);
+    expect(result.completed).toHaveLength(1);
+    expect(result.created).toHaveLength(1);
   });
 
   test('should ignore items with no activities', () => {
@@ -46,7 +54,8 @@ describe('filter activities', () => {
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(1);
+    expect(result.completed).toHaveLength(1);
+    expect(result.created).toHaveLength(1);
   });
 
   test('should remove activity with status change to in progress', () => {
@@ -58,23 +67,28 @@ describe('filter activities', () => {
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(0);
+    expect(result.completed).toHaveLength(0);
+    expect(result.created).toHaveLength(1);
   });
 
   test('should remove private objectives', () => {
     activities.items[0].items[0].activities[0].content.objective.visibility = 'PRIVATE';
+    activities.items[0].items[0].activities[1].content.objective.visibility = 'PRIVATE';
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(0);
+    expect(result.completed).toHaveLength(0);
+    expect(result.created).toHaveLength(0);
   });
 
   test('should remove old objective changes', () => {
     activities.items[0].items[0].activities[0].occurredAt = new Date(eventDateString).getTime() - (3 * 24 * 60 * 60 * 1000) - 1;
+    activities.items[0].items[0].activities[1].occurredAt = new Date(eventDateString).getTime() - (3 * 24 * 60 * 60 * 1000) - 1;
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(0);
+    expect(result.completed).toHaveLength(0);
+    expect(result.created).toHaveLength(0);
   });
 
   test('should keep objective when most recent activity is achieved', () => {
@@ -87,7 +101,7 @@ describe('filter activities', () => {
         {
           occurredAt: 1651856682326,
           activities: [
-            dataFactory.createActivity(
+            dataFactory.createCompletedActivity(
               { occurredAt: pastTime },
               { id: objectiveId },
               {
@@ -103,7 +117,7 @@ describe('filter activities', () => {
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(1);
+    expect(result.completed).toHaveLength(1);
   });
 
   test('should remove objective when most recent activity is not achieved or partially achieved', () => {
@@ -116,7 +130,7 @@ describe('filter activities', () => {
         {
           occurredAt: 1651856682326,
           activities: [
-            dataFactory.createActivity(
+            dataFactory.createCompletedActivity(
               { occurredAt: futureTime },
               { id: objectiveId },
               {
@@ -132,6 +146,6 @@ describe('filter activities', () => {
 
     const result = filter.filterActivities(activities, new Date(eventDateString));
 
-    expect(result).toHaveLength(0);
+    expect(result.completed).toHaveLength(0);
   });
 });
diff --git a/test/index.test.js b/test/index.test.js
diff --git a/test/slack-service.test.js b/test/slack-service.test.js
diff --git a/test/slack.test.js b/test/slack.test.js
diff --git a/test/small-improvements.test.js b/test/small-improvements.test.js

Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ async function getRecord(key) {`
`21`	`21`	`return response.Items;`
`22`	`22`	`}`
`23`	`23`
`24`		`-function insertRecord(activity) {`
	`24`	`+function insertRecord(activity, postfix) {`
`25`	`25`	`const timeToLive = activity.occurredAt / 1000 + sevenDaysInSeconds;`
`26`	`26`	`const params = {`
`27`	`27`	`TableName: tableName,`
`28`	`28`	`Item: {`
`29`		`- ID: { S: activity.content.objective.id },`
	`29`	`+ ID: { S: activity.content.objective.id + postfix },`
`30`	`30`	`TIMESTAMP: { N: activity.occurredAt.toString() },`
`31`	`31`	`TTL: { N: timeToLive.toString() }`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,5 @@ function getEmail(SIUID, token) { // SIUID (Small Improvements User ID) is in th`
`70`	`70`	`});`
`71`	`71`	`}`
`72`	`72`
`73`		`-exports.getObjectives = getObjectives;`
`74`		`-exports.getEmail = getEmail;`
	`73`	`+exports.GetObjectives = getObjectives;`
	`74`	`+exports.GetEmail = getEmail;`