fix(GoalHistory): fix ids string join and split

taskany-inc · Aug 1, 2023 · d42a075 · d42a075
1 parent 4052e3a
commit d42a075
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/utils/db.ts b/src/utils/db.ts
@@ -120,15 +120,17 @@ export const changeGoalProject = async (id: string, newProjectId: string) => {
 
 type RequestParamsBySubject = { [K in keyof HistoryRecordSubject]?: { ids: string[]; sourceIdx: number[] } };
 
+export const goalHistorySeparator = ', ';
+
 export const getGoalHistory = async <T extends GoalHistory & { activity: Activity & { user: User | null } }>(
     history: T[],
     goalId: string,
 ) => {
     const requestParamsBySubjects = history.reduce<RequestParamsBySubject>(
         (acc, { subject, previousValue, nextValue }, index) => {
             const allValues = (previousValue ?? '')
-                .split(',')
-                .concat((nextValue ?? '').split(','))
+                .split(goalHistorySeparator)
+                .concat((nextValue ?? '').split(goalHistorySeparator))
                 .filter(Boolean);
 
             if (subjectToEnumValue(subject)) {
@@ -157,7 +159,7 @@ export const getGoalHistory = async <T extends GoalHistory & { activity: Activit
                 const query = {
                     where: {
                         id: {
-                            in: (data || {}).ids,
+                            in: (data || {}).ids?.map((id) => id.trim()),
                         },
                     },
                 };

diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
@@ -32,6 +32,7 @@ import {
     mixHistoryWithComments,
     makeGoalRelationMap,
     updateGoalWithCalculatedWeight,
+    goalHistorySeparator,
 } from '../../src/utils/db';
 import { createEmailJob } from '../../src/utils/worker/create';
 import { calculateDiffBetweenArrays } from '../../src/utils/calculateDiffBetweenArrays';
@@ -511,8 +512,8 @@ export const goal = router({
         }
 
         if (tagsToConnect.length || tagsToDisconnect.length) {
-            const prevIds = actualGoal.tags.map(({ id }) => id).join(', ');
-            const nextIds = input.tags.map(({ id }) => id).join(', ');
+            const prevIds = actualGoal.tags.map(({ id }) => id).join(goalHistorySeparator);
+            const nextIds = input.tags.map(({ id }) => id).join(goalHistorySeparator);
 
             history.push({
                 subject: 'tags',