diff --git a/src/utils/dateTime.ts b/src/utils/dateTime.ts index d040e3b81..2ee6a482d 100644 --- a/src/utils/dateTime.ts +++ b/src/utils/dateTime.ts @@ -138,6 +138,3 @@ export const formatEstimate = (estimate: { date: string; q?: string; y: string } return date === createLocaleDate(endOfQuarter(q), { locale }) ? `${q}/${y}` : date; }; - -export const convertDateByLocale = (date: string | Date, locale: TLocale) => - createLocaleDate(parseLocaleDate(date, { locale }), { locale }); diff --git a/trpc/router/goal.ts b/trpc/router/goal.ts index 33f23d4be..762e68a48 100644 --- a/trpc/router/goal.ts +++ b/trpc/router/goal.ts @@ -42,7 +42,7 @@ import { updateCriteriaState, } from '../../src/schema/criteria'; import type { FieldDiff } from '../../src/types/common'; -import { convertDateByLocale, createLocaleDate } from '../../src/utils/dateTime'; +import { parseLocaleDate } from '../../src/utils/dateTime'; import { addCalculatedProjectFields } from './project'; @@ -454,7 +454,7 @@ export const goal = router({ }), update: protectedProcedure.input(goalUpdateSchema).mutation(async ({ ctx, input }) => { if (input.estimate && input.estimate.date) { - input.estimate.date = convertDateByLocale(input.estimate.date, 'en'); + input.estimate.date = parseLocaleDate(input.estimate.date, { locale: 'en' }).toISOString(); } const actualGoal = await prisma.goal.findUnique({ @@ -562,10 +562,10 @@ export const goal = router({ // FIXME: https://github.com/taskany-inc/issues/issues/1359 updatedFields.estimate = [ previousEstimate?.estimate.date - ? convertDateByLocale(previousEstimate?.estimate.date, 'en') + ? parseLocaleDate(previousEstimate?.estimate.date, { locale: 'en' }).toISOString() : [previousEstimate?.estimate.q, previousEstimate?.estimate.y].join('/'), correctEstimate.date - ? convertDateByLocale(correctEstimate.date, 'en') + ? parseLocaleDate(correctEstimate.date, { locale: 'en' }).toISOString() : [correctEstimate.q, correctEstimate.y].join('/'), ]; }