#795 Move some logic to team utils

Author: alaneng-neu

src/backend/src/services/notifications.services.ts

@@ -61,18 +61,15 @@ export default class NotificationsService {
     // send the notifications to each team for their respective tasks
     teamTaskMap.forEach((tasks, slackId) => {
       const messageBlock = tasks
-        // ensures that the task has assignees to send a reminder for
-        .filter((task) => task.assignees)
         .map(
           (task) =>
-            `${usersToSlackPings(task.assignees ?? [])} Reminder: ${task.title} due tomorrow in project ${
-              task.wbsElement?.name
-            }`
+            `${usersToSlackPings(task.assignees ?? [])} ${task.title} due tomorrow in project ${task.wbsElement?.name}`
         )
         .join('\n\n');
 
       // messageBlock will be empty if there are tasks with no assignees
-      if (messageBlock !== '') sendMessage(slackId, messageBlock);
+      if (messageBlock !== '')
+        sendMessage(slackId, ':sparkles: :pepe-coop: UPCOMING TASK DEADLINES :pepe-coop: :sparkles: \n\n\n' + messageBlock);
     });
   }
 }

src/backend/src/utils/notifications.utils.ts

@@ -1,6 +1,7 @@
 import { Team, Task as Prisma_Task, WBS_Element } from '@prisma/client';
 import { UserWithSettings } from './auth.utils';
 import { HttpException } from './errors.utils';
+import { getTeamsFromUsers } from './teams.utils';
 
 export type UserWithTeams = UserWithSettings & {
   teamAsHead: Team | null;
@@ -28,7 +29,7 @@ export const getTeamFromTaskAssignees = (users: UserWithTeams[]): Team => {
   const usersTeams = getTeamsFromUsers(users);
 
   firstUsersTeams: for (const team of usersTeams[0]) {
-    for (let i = 0; i < usersTeams.length; i++) {
+    for (let i = 1; i < usersTeams.length; i++) {
       // If the team is not found in the current user's teams, continue to the next team
       if (!usersTeams[i].some((t) => t.teamId === team.teamId)) continue firstUsersTeams;
     }
@@ -38,21 +39,6 @@ export const getTeamFromTaskAssignees = (users: UserWithTeams[]): Team => {
   throw new HttpException(400, 'All of the users do not share a team!');
 };
 
-/**
- * Gets the teams from a list of users
- * @param users the users to get the teams from
- * @returns an array of the teams each user is in
- */
-export const getTeamsFromUsers = (users: UserWithTeams[]): Team[][] => {
-  return users.map((user) => {
-    const teams = [];
-    if (user.teamAsHead) teams.push(user.teamAsHead);
-    if (user.teamsAsLead) teams.push(...user.teamsAsLead);
-    if (user.teamsAsMember) teams.push(...user.teamsAsMember);
-    return teams;
-  });
-};
-
 /**
  * Gets the beginning of the day tomorrow
  * @returns the beginning of the day tomorrow (at 12am)

src/backend/src/utils/teams.utils.ts

@@ -1,4 +1,5 @@
-import { Prisma, User } from '@prisma/client';
+import { Prisma, User, Team } from '@prisma/client';
+import { UserWithTeams } from './notifications.utils';
 
 const teamQueryArgsMembersOnly = Prisma.validator<Prisma.TeamArgs>()({
   include: {
@@ -50,3 +51,18 @@ export const areUsersPartOfTeams = (teams: Prisma.TeamGetPayload<typeof teamQuer
 export const isUserPartOfTeams = (teams: Prisma.TeamGetPayload<typeof teamQueryArgsMembersOnly>[], user: User) => {
   return teams.some((team) => isUserOnTeam(team, user));
 };
+
+/**
+ * Gets the teams from a list of users
+ * @param users the users to get the teams from
+ * @returns an array of the teams each user is in
+ */
+export const getTeamsFromUsers = (users: UserWithTeams[]): Team[][] => {
+  return users.map((user) => {
+    const teams = [];
+    if (user.teamAsHead) teams.push(user.teamAsHead);
+    if (user.teamsAsLead) teams.push(...user.teamsAsLead);
+    if (user.teamsAsMember) teams.push(...user.teamsAsMember);
+    return teams;
+  });
+};