From bdeeb358f3fb8f1ff6e1384976503f16f734a0e0 Mon Sep 17 00:00:00 2001
From: DenisVorop <saskeazaske@icloud.com>
Date: Thu, 12 Oct 2023 14:46:48 +0300
Subject: [PATCH] fix: added priority model instead of string

---
 src/components/FiltersPanel/FiltersPanel.tsx  |  2 +
 src/components/GoalActivity.tsx               |  5 +--
 .../GoalCreateForm/GoalCreateForm.tsx         |  7 +++-
 src/components/GoalEditForm/GoalEditForm.tsx  |  2 +-
 src/components/GoalForm/GoalForm.tsx          | 15 ++++---
 .../HistoryRecord/HistoryRecord.tsx           | 26 +++++++-----
 src/components/PriorityDropdown.tsx           | 19 +++++----
 src/components/PriorityFilter.tsx             | 40 +++++++++----------
 src/schema/goal.ts                            | 12 +++++-
 src/types/history.ts                          | 16 +++++++-
 src/utils/db.ts                               | 16 ++++++--
 trpc/inferredTypes.ts                         |  1 +
 trpc/queries/goals.ts                         | 17 ++++++--
 trpc/router/goal.ts                           | 11 ++---
 trpc/router/index.ts                          |  2 +
 trpc/router/priority.ts                       |  6 +++
 16 files changed, 128 insertions(+), 69 deletions(-)
 create mode 100644 trpc/router/priority.ts

diff --git a/src/components/FiltersPanel/FiltersPanel.tsx b/src/components/FiltersPanel/FiltersPanel.tsx
index bfd7eb9d3..873807d33 100644
--- a/src/components/FiltersPanel/FiltersPanel.tsx
+++ b/src/components/FiltersPanel/FiltersPanel.tsx
@@ -153,6 +153,7 @@ export const FiltersPanel: FC<{
             useQueryOptions,
         );
         const { data: states = [] } = trpc.state.all.useQuery();
+        const { data: priorities = [] } = trpc.priority.getAll.useQuery();
 
         const setPartialQueryByKey = useCallback(<K extends keyof QueryState>(key: K) => {
             return (value: QueryState[K]) => {
@@ -260,6 +261,7 @@ export const FiltersPanel: FC<{
                     <PriorityFilter
                         text={tr('Priority')}
                         value={filterQuery?.priority}
+                        priorities={priorities}
                         onChange={setPartialQueryByKey('priority')}
                     />
 
diff --git a/src/components/GoalActivity.tsx b/src/components/GoalActivity.tsx
index 5b45cd662..f2a33db31 100644
--- a/src/components/GoalActivity.tsx
+++ b/src/components/GoalActivity.tsx
@@ -1,7 +1,6 @@
 import React, { forwardRef } from 'react';
 import { nullable } from '@taskany/bricks';
 
-import { Priority } from '../types/priority';
 import { GoalByIdReturnType } from '../../trpc/inferredTypes';
 import { HistoryAction } from '../types/history';
 
@@ -85,8 +84,8 @@ export const GoalActivity = forwardRef<HTMLDivElement, GoalActivityProps>(
                                     )}
                                     {value.subject === 'priority' && (
                                         <HistoryRecordPriority
-                                            from={value.previousValue as Priority}
-                                            to={value.nextValue as Priority}
+                                            from={excludeString(value.previousValue)}
+                                            to={excludeString(value.nextValue)}
                                         />
                                     )}
                                     {value.subject === 'state' && (
diff --git a/src/components/GoalCreateForm/GoalCreateForm.tsx b/src/components/GoalCreateForm/GoalCreateForm.tsx
index fd75b7265..3a1cc7016 100644
--- a/src/components/GoalCreateForm/GoalCreateForm.tsx
+++ b/src/components/GoalCreateForm/GoalCreateForm.tsx
@@ -56,6 +56,9 @@ const GoalCreateForm: React.FC<GoalCreateFormProps> = ({ title, onGoalCreate })
     const [createGoalType, setСreateGoalType] = useState<number>(goalCreateFormActionCache || 3);
     const utils = trpc.useContext();
     const { goalCreate } = useGoalResource({});
+    // FIXME https://github.com/taskany-inc/issues/issues/1834
+    const { data: priorities } = trpc.priority.getAll.useQuery();
+    const defaultPriority = priorities?.at(-2);
 
     const createOptions = [
         {
@@ -130,8 +133,8 @@ const GoalCreateForm: React.FC<GoalCreateFormProps> = ({ title, onGoalCreate })
             validitySchema={goalCommonSchema}
             owner={{ id: user?.activityId, user } as ActivityByIdReturnType}
             parent={currentProjectCache || lastProjectCache || undefined}
-            priority="Medium"
-            onSumbit={createGoal}
+            priority={defaultPriority ?? undefined}
+            onSubmit={createGoal}
             title={title}
             actionButton={
                 <>
diff --git a/src/components/GoalEditForm/GoalEditForm.tsx b/src/components/GoalEditForm/GoalEditForm.tsx
index 6f0d3b42a..4d8f34514 100644
--- a/src/components/GoalEditForm/GoalEditForm.tsx
+++ b/src/components/GoalEditForm/GoalEditForm.tsx
@@ -69,7 +69,7 @@ const GoalEditForm: React.FC<GoalEditFormProps> = ({ goal, onSubmit }) => {
             priority={goal.priority ?? undefined}
             tags={goal.tags}
             estimate={estimateValue}
-            onSumbit={updateGoal}
+            onSubmit={updateGoal}
             actionButton={
                 <>
                     <Button outline text={tr('Cancel')} onClick={dispatchModalEvent(ModalEvent.GoalEditModal)} />
diff --git a/src/components/GoalForm/GoalForm.tsx b/src/components/GoalForm/GoalForm.tsx
index c40de751a..eaa0261fa 100644
--- a/src/components/GoalForm/GoalForm.tsx
+++ b/src/components/GoalForm/GoalForm.tsx
@@ -21,7 +21,6 @@ import { errorsProvider } from '../../utils/forms';
 import { formateEstimate } from '../../utils/dateTime';
 import { DateType } from '../../types/date';
 import { useLocale } from '../../hooks/useLocale';
-import { Priority } from '../../types/priority';
 import { UserComboBox } from '../UserComboBox';
 import { GoalParentComboBox } from '../GoalParentComboBox';
 import { TagComboBox } from '../TagComboBox';
@@ -50,7 +49,11 @@ interface GoalFormProps extends React.HTMLAttributes<HTMLDivElement> {
     parent?: { id: string; title: string; flowId: string; description?: string | null };
     tags?: TagModel[];
     state?: State;
-    priority?: Priority | string;
+    priority?: {
+        id: string;
+        title: string;
+        value: number;
+    };
     estimate?: {
         date: string;
         type: DateType;
@@ -60,7 +63,7 @@ interface GoalFormProps extends React.HTMLAttributes<HTMLDivElement> {
     id?: string;
     tip?: React.ReactNode;
 
-    onSumbit: (fields: z.infer<GoalFormProps['validitySchema']>) => void;
+    onSubmit: (fields: z.infer<GoalFormProps['validitySchema']>) => void;
 }
 
 export const GoalForm: React.FC<GoalFormProps> = ({
@@ -77,7 +80,7 @@ export const GoalForm: React.FC<GoalFormProps> = ({
     validitySchema,
     actionButton,
     tip,
-    onSumbit,
+    onSubmit,
     ...attrs
 }) => {
     const locale = useLocale();
@@ -94,7 +97,7 @@ export const GoalForm: React.FC<GoalFormProps> = ({
         mode: 'onChange',
         reValidateMode: 'onChange',
         shouldFocusError: false,
-        defaultValues: {
+        values: {
             title,
             description,
             owner,
@@ -125,7 +128,7 @@ export const GoalForm: React.FC<GoalFormProps> = ({
 
     return (
         <ModalContent {...attrs}>
-            <Form onSubmit={handleSubmit(onSumbit)}>
+            <Form onSubmit={handleSubmit(onSubmit)}>
                 <FormInput
                     {...register('title')}
                     error={errorsResolver('title')}
diff --git a/src/components/HistoryRecord/HistoryRecord.tsx b/src/components/HistoryRecord/HistoryRecord.tsx
index 99154106a..31e5f90b2 100644
--- a/src/components/HistoryRecord/HistoryRecord.tsx
+++ b/src/components/HistoryRecord/HistoryRecord.tsx
@@ -8,6 +8,7 @@ import {
     GoalAchieveCriteria,
     Goal,
     Ghost,
+    Priority,
 } from '@prisma/client';
 import styled, { css } from 'styled-components';
 import { UserPic, Text, Tag, nullable, Button } from '@taskany/bricks';
@@ -17,7 +18,6 @@ import { backgroundColor, gray7 } from '@taskany/colors';
 import { ActivityFeedItem } from '../ActivityFeed';
 import { IssueListItem } from '../IssueListItem';
 import { RelativeTime } from '../RelativeTime/RelativeTime';
-import { Priority } from '../../types/priority';
 import { decodeHistoryEstimate, formateEstimate } from '../../utils/dateTime';
 import { getPriorityText } from '../PriorityText/PriorityText';
 import { StateDot } from '../StateDot';
@@ -395,16 +395,20 @@ export const HistoryRecordTextChange: React.FC<HistoryChangeProps<string>> = ({
 
 export const HistoryRecordPriority: React.FC<HistoryChangeProps<Priority>> = ({ from, to }) => (
     <HistorySimplifyRecord
-        from={nullable(from, (f) => (
-            <Text size="xs" weight="bold">
-                {getPriorityText(f)}
-            </Text>
-        ))}
-        to={nullable(to, (t) => (
-            <Text size="xs" weight="bold">
-                {getPriorityText(t)}
-            </Text>
-        ))}
+        from={
+            from ? (
+                <Text size="xs" weight="bold">
+                    {getPriorityText(from.title)}
+                </Text>
+            ) : null
+        }
+        to={
+            to ? (
+                <Text size="xs" weight="bold">
+                    {getPriorityText(to.title)}
+                </Text>
+            ) : null
+        }
     />
 );
 
diff --git a/src/components/PriorityDropdown.tsx b/src/components/PriorityDropdown.tsx
index 21cdf815b..51d0d85e1 100644
--- a/src/components/PriorityDropdown.tsx
+++ b/src/components/PriorityDropdown.tsx
@@ -1,31 +1,34 @@
 import React from 'react';
 import { Button, Dropdown, MenuItem } from '@taskany/bricks';
 
-import { Priority, priorityVariants } from '../types/priority';
 import { comboboxItem, priorityCombobox } from '../utils/domObjects';
+import { trpc } from '../utils/trpcClient';
+import { PriorityReturnType } from '../../trpc/inferredTypes';
 
 import { getPriorityText } from './PriorityText/PriorityText';
 import { CommonDropdown } from './CommonDropdown';
 
 interface PriorityDropdownProps {
     text: React.ComponentProps<typeof Button>['text'];
-    value?: string | null;
+    value?: PriorityReturnType;
     disabled?: React.ComponentProps<typeof Dropdown>['disabled'];
     error?: React.ComponentProps<typeof Dropdown>['error'];
 
-    onChange?: (priority: Priority) => void;
+    onChange?: (priority: PriorityReturnType) => void;
 }
 
 export const PriorityDropdown = React.forwardRef<HTMLDivElement, PriorityDropdownProps>(
     ({ text, value, disabled, error, onChange }, ref) => {
+        const { data = [] } = trpc.priority.getAll.useQuery();
+
         return (
             <CommonDropdown
                 ref={ref}
                 error={error}
-                text={value || text}
-                value={value}
+                text={value?.title || text}
+                value={value?.title}
                 onChange={onChange}
-                items={Object.keys(priorityVariants)}
+                items={data}
                 disabled={disabled}
                 renderTrigger={(props) => (
                     <Button
@@ -39,12 +42,12 @@ export const PriorityDropdown = React.forwardRef<HTMLDivElement, PriorityDropdow
                 renderItem={(props) => (
                     <MenuItem
                         ghost
-                        key={props.item}
+                        key={props.item.id}
                         focused={props.cursor === props.index}
                         onClick={props.onClick}
                         {...comboboxItem.attr}
                     >
-                        {getPriorityText(props.item)}
+                        {getPriorityText(props.item.title)}
                     </MenuItem>
                 )}
             />
diff --git a/src/components/PriorityFilter.tsx b/src/components/PriorityFilter.tsx
index 4912fff41..5507ceb21 100644
--- a/src/components/PriorityFilter.tsx
+++ b/src/components/PriorityFilter.tsx
@@ -1,40 +1,36 @@
 import { FC, useMemo } from 'react';
 import { Tab } from '@taskany/bricks';
 
-import { Priority as PriorityName, priorityVariants } from '../types/priority';
-
 import { getPriorityText } from './PriorityText/PriorityText';
 import { FilterCheckbox } from './FilterCheckbox';
 import { FilterBase } from './FilterBase/FilterBase';
 import { FilterTabLabel } from './FilterTabLabel';
 
-type Variant = keyof typeof priorityVariants;
-
-type Priority = {
-    id: Variant;
-    data: string;
-};
-
-const priorities: Priority[] = (Object.keys(priorityVariants) as Variant[]).map((p) => ({
-    id: p,
-    data: getPriorityText(p as PriorityName),
-}));
-
-function getKey(item: Priority) {
-    return item.id;
+interface Priority {
+    id: string;
+    title: string;
+    value: number;
 }
 
-export const PriorityFilter: FC<{
+interface PriorityFilterProps {
     text: string;
     value?: string[];
+    priorities: Priority[];
     onChange: (value: string[]) => void;
-}> = ({ value = [], onChange, text }) => {
+}
+
+const getKey = (priority: Priority) => priority.id;
+
+export const PriorityFilter: FC<PriorityFilterProps> = ({ text, value = [], priorities, onChange }) => {
     const values = useMemo(() => {
         return priorities.filter((p) => value.includes(getKey(p)));
-    }, [value]);
+    }, [value, priorities]);
 
     return (
-        <Tab name="priority" label={<FilterTabLabel text={text} selected={values.map(({ data }) => data)} />}>
+        <Tab
+            name="priority"
+            label={<FilterTabLabel text={text} selected={values.map(({ title }) => getPriorityText(title))} />}
+        >
             <FilterBase
                 key="priority"
                 mode="multiple"
@@ -46,10 +42,10 @@ export const PriorityFilter: FC<{
                 renderItem={({ item, checked, onItemClick }) => (
                     <FilterCheckbox
                         name="priority"
-                        value={item.id}
+                        value={getKey(item)}
                         checked={checked}
                         onClick={onItemClick}
-                        label={item.data}
+                        label={getPriorityText(item.title)}
                     />
                 )}
             />
diff --git a/src/schema/goal.ts b/src/schema/goal.ts
index 3086c3a09..6bd58351c 100644
--- a/src/schema/goal.ts
+++ b/src/schema/goal.ts
@@ -70,7 +70,11 @@ export const goalCommonSchema = z.object({
         hue: z.number().optional(),
         title: z.string().optional(),
     }),
-    priority: z.string().nullable().optional(),
+    priority: z.object({
+        id: z.string(),
+        title: z.string(),
+        value: z.number(),
+    }),
     estimate: z
         .object({
             date: z.string(),
@@ -142,7 +146,11 @@ export const goalUpdateSchema = z.object({
             StateType.NotStarted,
         ]),
     }),
-    priority: z.string().nullable(),
+    priority: z.object({
+        id: z.string(),
+        title: z.string(),
+        value: z.number(),
+    }),
     estimate: z
         .object({
             date: z.string(),
diff --git a/src/types/history.ts b/src/types/history.ts
index d4b9a62c5..c4d5c01a2 100644
--- a/src/types/history.ts
+++ b/src/types/history.ts
@@ -1,4 +1,15 @@
-import { Goal, State, Project, Tag, Activity, GoalHistory, User, GoalAchieveCriteria, Ghost } from '@prisma/client';
+import {
+    Goal,
+    State,
+    Project,
+    Tag,
+    Activity,
+    GoalHistory,
+    User,
+    GoalAchieveCriteria,
+    Ghost,
+    Priority,
+} from '@prisma/client';
 
 export const subjectToTableNameMap = {
     dependencies: true,
@@ -9,6 +20,7 @@ export const subjectToTableNameMap = {
     state: true,
     criteria: true,
     partnerProject: true,
+    priority: true,
 };
 
 export type HistoryRecordSubject = { [K in keyof typeof subjectToTableNameMap]: string };
@@ -22,6 +34,7 @@ export interface HistoryRecordMeta {
     state: State;
     criteria: GoalAchieveCriteria & { goalAsCriteria: Goal & { state: State | null } };
     partnerProject: Project;
+    priority: Priority;
 }
 
 export type HistoryAction = 'add' | 'change' | 'remove' | 'delete' | 'edit' | 'complete' | 'uncomplete';
@@ -46,6 +59,7 @@ type HistoryRecord =
           | HistoryValuesBySubject<'state'>
           | HistoryValuesBySubject<'owner'>
           | HistoryValuesBySubject<'criteria'>
+          | HistoryValuesBySubject<'priority'>
           | {
                 subject: 'title' | 'description' | 'estimate';
                 previousValue?: string;
diff --git a/src/utils/db.ts b/src/utils/db.ts
index b72f935ca..5da1f631a 100644
--- a/src/utils/db.ts
+++ b/src/utils/db.ts
@@ -22,9 +22,10 @@ import { subjectToEnumValue } from './goalHistory';
  */
 export const createGoal = async (input: GoalCommon, activityId: string, role: Role) => {
     const id = nanoid();
+    const priorityId = input.priority.id;
 
     await prisma.$executeRaw`
-        INSERT INTO "Goal" ("id", "title", "description", "projectId", "ownerId", "activityId", "stateId", "priority", "scopeId")
+        INSERT INTO "Goal" ("id", "title", "description", "projectId", "ownerId", "activityId", "stateId", "priorityId", "scopeId")
         SELECT
             ${id},
             ${input.title},
@@ -33,7 +34,7 @@ export const createGoal = async (input: GoalCommon, activityId: string, role: Ro
             ${input.owner.id},
             ${activityId},
             ${input.state.id},
-            ${input.priority},
+            ${priorityId},
             coalesce(max("scopeId"), 0) + 1
         FROM "Goal" WHERE "projectId" = ${input.parent.id};
     `;
@@ -43,6 +44,11 @@ export const createGoal = async (input: GoalCommon, activityId: string, role: Ro
             id,
         },
         data: {
+            priority: {
+                connect: {
+                    id: priorityId,
+                },
+            },
             tags: input.tags?.length
                 ? {
                       connect: input.tags.map(({ id }) => ({ id })),
@@ -112,12 +118,12 @@ export const getGoalHistory = async <T extends GoalHistory & { activity: Activit
     if (needRequestForSubject.length) {
         const results = await Promise.all(
             needRequestForSubject.map((subject) => {
-                const data = requestParamsBySubjects[subject];
+                const { ids } = requestParamsBySubjects[subject] || {};
 
                 const query = {
                     where: {
                         id: {
-                            in: (data || {}).ids?.map((id) => id.trim()),
+                            in: ids,
                         },
                     },
                 };
@@ -158,6 +164,8 @@ export const getGoalHistory = async <T extends GoalHistory & { activity: Activit
                                 },
                             },
                         });
+                    case 'priority':
+                        return prisma.priority.findMany({ where: query.where });
                     default:
                         throw new Error('query for history record is undefined');
                 }
diff --git a/trpc/inferredTypes.ts b/trpc/inferredTypes.ts
index 4b9337cd3..4df33ac23 100644
--- a/trpc/inferredTypes.ts
+++ b/trpc/inferredTypes.ts
@@ -14,3 +14,4 @@ export type GoalAchiveCriteria = NonNullable<GoalByIdReturnType>['goalAchiveCrit
 export type GoalDependencyItem = NonNullable<NonNullable<GoalByIdReturnType>['_relations']>[number]['goals'][number];
 export type GoalUpdateReturnType = RouterOutputs['goal']['update'];
 export type GoalCreateReturnType = RouterOutputs['goal']['create'];
+export type PriorityReturnType = RouterOutputs['priority']['getAll'][number];
diff --git a/trpc/queries/goals.ts b/trpc/queries/goals.ts
index 6f7314a09..b58d9bfcd 100644
--- a/trpc/queries/goals.ts
+++ b/trpc/queries/goals.ts
@@ -89,7 +89,13 @@ export const goalsFilter = (
     where: Prisma.GoalFindManyArgs['where'];
     orderBy: Prisma.GoalFindManyArgs['orderBy'];
 } => {
-    const priorityFilter = data.priority?.length ? { priority: { in: data.priority } } : {};
+    const priorityFilter = data.priority?.length
+        ? {
+              priority: {
+                  id: { in: data.priority },
+              },
+          }
+        : {};
 
     const statesFilter: Prisma.GoalFindManyArgs['where'] = getStateFilter(data);
 
@@ -184,7 +190,9 @@ export const goalsFilter = (
 
     if (data.sort?.priority) {
         orderBy.push({
-            priorityId: data.sort.priority,
+            priority: {
+                value: data.sort.priority,
+            },
         });
     }
 
@@ -308,6 +316,7 @@ export const goalDeepQuery = {
     },
     tags: true,
     state: true,
+    priority: true,
     project: {
         include: {
             parent: true,
@@ -609,13 +618,13 @@ export const calcGoalsMeta = (goals: any[]) => {
     const uniqOwners = new Map();
     const uniqParticipants = new Map();
     const uniqIssuers = new Map();
-    const uniqPriority = new Set<string>();
+    const uniqPriority = new Map();
     const uniqStates = new Map();
     const uniqProjects = new Map();
 
     goals.forEach((goal: any) => {
         goal.state && uniqStates.set(goal.state?.id, goal.state);
-        goal.priority && uniqPriority.add(goal.priority);
+        goal.priority && uniqPriority.set(goal.priority.id, goal.priority);
 
         goal.tags?.forEach((t: any) => {
             t && uniqTags.set(t.id, t);
diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts
index 630beb822..a138e8054 100644
--- a/trpc/router/goal.ts
+++ b/trpc/router/goal.ts
@@ -342,6 +342,7 @@ export const goal = router({
                     project: true,
                     tags: true,
                     goalAsCriteria: true,
+                    priority: true,
                 },
             });
 
@@ -394,15 +395,15 @@ export const goal = router({
                 });
             }
 
-            if (actualGoal.priority !== input.priority) {
+            if (actualGoal.priority?.id !== input.priority.id) {
                 history.push({
                     subject: 'priority',
                     action: 'change',
-                    previousValue: actualGoal.priority,
-                    nextValue: input.priority,
+                    previousValue: actualGoal.priority?.id || null,
+                    nextValue: input.priority.id,
                 });
 
-                updatedFields.priority = [actualGoal.priority, input.priority];
+                updatedFields.priority = [actualGoal.priority?.title, input.priority.title];
             }
 
             if (actualGoal.ownerId !== input.owner.id) {
@@ -449,7 +450,7 @@ export const goal = router({
                         title: input.title,
                         description: input.description,
                         stateId: input.state?.id,
-                        priority: input.priority,
+                        priorityId: input.priority.id,
                         estimate,
                         estimateType,
                         tags: {
diff --git a/trpc/router/index.ts b/trpc/router/index.ts
index c0edfa6d7..c4f637254 100644
--- a/trpc/router/index.ts
+++ b/trpc/router/index.ts
@@ -1,5 +1,6 @@
 import { router } from '../trpcBackend';
 
+import { priority } from './priority';
 import { filter } from './filter';
 import { flow } from './flow';
 import { user } from './user';
@@ -24,6 +25,7 @@ export const trpcRouter = router({
     state,
     feedback,
     whatsnew,
+    priority,
 });
 
 export type TrpcRouter = typeof trpcRouter;
diff --git a/trpc/router/priority.ts b/trpc/router/priority.ts
new file mode 100644
index 000000000..b2eac64d3
--- /dev/null
+++ b/trpc/router/priority.ts
@@ -0,0 +1,6 @@
+import { prisma } from '../../src/utils/prisma';
+import { protectedProcedure, router } from '../trpcBackend';
+
+export const priority = router({
+    getAll: protectedProcedure.query(() => prisma.priority.findMany({ orderBy: { value: 'desc' } })),
+});