fix(GoalActivity): get last state comment

taskany-inc · Jul 23, 2024 · 6d19c0a · 6d19c0a
1 parent 73848e1
commit 6d19c0a
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 48 deletions.
diff --git a/src/components/GoalActivityFeed/GoalActivityFeed.tsx b/src/components/GoalActivityFeed/GoalActivityFeed.tsx
@@ -14,6 +14,7 @@ import { AddInlineTrigger } from '../AddInlineTrigger/AddInlineTrigger';
 import { GoalCriteriaSuggest } from '../GoalCriteriaSuggest';
 import { GoalFormPopupTrigger } from '../GoalFormPopupTrigger/GoalFormPopupTrigger';
 import { GoalActivityWithTabs } from '../GoalActivityWithTabs/GoalActivityWithTabs';
+import { safeUserData } from '../../utils/getUserName';
 
 import { tr } from './GoalActivityFeed.i18n';
 import s from './GoalActivityFeed.module.css';
@@ -45,13 +46,11 @@ export const GoalActivityFeed = forwardRef<HTMLDivElement, GoalActivityFeedProps
             onGoalCommentCreate,
             onGoalCommentReactionToggle,
             onGoalCommentDelete,
-            lastStateComment,
             highlightCommentId,
         } = useGoalResource(
             {
                 id: goal?.id,
                 stateId: goal?.stateId,
-                comments: goal?._comments,
             },
             {
                 invalidate: {
@@ -183,11 +182,11 @@ export const GoalActivityFeed = forwardRef<HTMLDivElement, GoalActivityFeedProps
                         ))}
                     </GoalCriteriaView>
                 ))}
-                {nullable(lastStateComment, (value) => (
+                {nullable(goal._lastComment, (value) => (
                     <CommentView
                         pin
                         id={value.id}
-                        author={value.author}
+                        author={safeUserData(value.activity)}
                         description={value.description}
                         state={value.state ?? undefined}
                         createdAt={value.createdAt}

diff --git a/src/hooks/useGoalResource.ts b/src/hooks/useGoalResource.ts
@@ -12,7 +12,6 @@ import {
 } from '../schema/criteria';
 import { ModalEvent, dispatchModalEvent } from '../utils/dispatchModal';
 import { TagObject } from '../types/tag';
-import { safeUserData } from '../utils/getUserName';
 import { GoalByIdReturnType } from '../../trpc/inferredTypes';
 
 import { useHighlightedComment } from './useHighlightedComment';
@@ -33,7 +32,7 @@ interface Configuration {
 interface GoalFields {
     id?: string;
     stateId?: string | null;
-    comments?: NonNullable<GoalByIdReturnType>['_comments'];
+    lastStateUpdateComment?: NonNullable<GoalByIdReturnType>['_lastComment'];
 }
 
 export const useGoalResource = (fields: GoalFields, config?: Configuration) => {
@@ -257,22 +256,6 @@ export const useGoalResource = (fields: GoalFields, config?: Configuration) => {
         [deleteGoalComment, invalidate],
     );
 
-    const lastStateComment = useMemo(() => {
-        if ((fields.comments?.length ?? 0) <= 1) {
-            return null;
-        }
-
-        const foundResult = fields.comments?.findLast((comment) => comment.stateId);
-        if (!foundResult) return;
-
-        return foundResult.stateId === fields.stateId
-            ? {
-                  ...foundResult,
-                  author: safeUserData(foundResult.activity),
-              }
-            : null;
-    }, [fields.comments, fields.stateId]);
-
     const onGoalCriteriaAdd = useCallback(
         async (val: AddCriteriaSchema, invalidateKey?: RefetchKeys | RefetchKeys[]) => {
             await notifyPromise(addGoalCriteria.mutateAsync(val), 'criteriaCreate');
@@ -498,7 +481,6 @@ export const useGoalResource = (fields: GoalFields, config?: Configuration) => {
 
     return {
         highlightCommentId,
-        lastStateComment,
 
         invalidate,
 

diff --git a/src/utils/db/calculatedGoalsFields.ts b/src/utils/db/calculatedGoalsFields.ts
@@ -1,6 +1,12 @@
-import { Role } from '@prisma/client';
+import { Activity, Reaction, Role, User, Ghost, Comment, State } from '@prisma/client';
 
 import { calcAchievedWeight } from '../recalculateCriteriaScore';
+import { ReactionsMap } from '../../types/reactions';
+import { safeGetUserName } from '../getUserName';
+
+interface UserActivity {
+    activity: Activity & { user: User; ghost: Ghost | null };
+}
 
 export const addCommonCalculatedGoalFields = (goal: any) => {
     const _shortId = `${goal.projectId}-${goal.scopeId}`;
@@ -10,10 +16,52 @@ export const addCommonCalculatedGoalFields = (goal: any) => {
             ? calcAchievedWeight(goal.goalAchieveCriteria)
             : goal.completedCriteriaWeight;
 
+    const lastCommentWithUpdateState: Comment &
+        UserActivity & { reactions: (Reaction & UserActivity)[]; state: State } = goal.comments?.[0];
+
+    let reactions: ReactionsMap = {};
+    if (lastCommentWithUpdateState) {
+        const limit = 10;
+        reactions = lastCommentWithUpdateState.reactions?.reduce<ReactionsMap>((acc, cur) => {
+            const data = {
+                activityId: cur.activityId,
+                name: safeGetUserName(cur.activity),
+            };
+
+            if (acc[cur.emoji]) {
+                acc[cur.emoji].count += 1;
+                acc[cur.emoji].authors.push(data);
+            } else {
+                acc[cur.emoji] = {
+                    count: 1,
+                    authors: [data],
+                    remains: 0,
+                };
+            }
+
+            return acc;
+        }, {});
+
+        for (const key in reactions) {
+            if (key in reactions) {
+                const { authors } = reactions[key];
+
+                if (authors.length > limit) {
+                    reactions[key].authors = authors.slice(0, limit);
+                    reactions[key].remains = authors.length - limit;
+                }
+            }
+        }
+    }
+
     return {
         _shortId,
         _hasAchievementCriteria,
         _achivedCriteriaWeight,
+        _lastComment: {
+            ...lastCommentWithUpdateState,
+            reactions,
+        },
     };
 };
 

diff --git a/trpc/queries/goals.ts b/trpc/queries/goals.ts
@@ -514,30 +514,6 @@ export const getGoalDeepQuery = (user?: { activityId: string; role: Role }) => {
             },
             where: depsWhere,
         },
-        comments: {
-            orderBy: {
-                createdAt: 'asc',
-            },
-            include: {
-                activity: {
-                    include: {
-                        user: true,
-                        ghost: true,
-                    },
-                },
-                state: true,
-                reactions: {
-                    include: {
-                        activity: {
-                            include: {
-                                user: true,
-                                ghost: true,
-                            },
-                        },
-                    },
-                },
-            },
-        },
         reactions: {
             include: {
                 activity: {

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -242,6 +242,32 @@ export const goal = router({
                             activityId,
                             role,
                         }),
+                        comments: {
+                            orderBy: { updatedAt: 'desc' },
+                            take: 1,
+                            where: {
+                                stateId: { not: null },
+                            },
+                            include: {
+                                activity: {
+                                    include: {
+                                        user: true,
+                                        ghost: true,
+                                    },
+                                },
+                                reactions: {
+                                    include: {
+                                        activity: {
+                                            include: {
+                                                user: true,
+                                                ghost: true,
+                                            },
+                                        },
+                                    },
+                                },
+                                state: true,
+                            },
+                        },
                         goalAchiveCriteria: {
                             include: {
                                 criteriaGoal: {