Move timeFormatter to shared and set email time locale (#1239)

Archinowsk · web-flow · commit 91c36ac4715c · 2025-09-03T21:27:21.000+03:00
* Move timeFormatter to shared, fset email time locale

* Fix test
diff --git a/client/src/markdown/components/CurrentTime.tsx b/client/src/markdown/components/CurrentTime.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 import { getTimeNow } from "client/utils/getTimeNow";
-import { dateAndTimeFormat } from "client/utils/timeFormatter";
+import { dateAndTimeFormat } from "shared/utils/timeFormatter";
 
 export const CurrentTime = (): ReactNode => {
   // eslint-disable-next-line no-restricted-syntax -- We want to use local time here
diff --git a/client/src/markdown/components/CurrentTimezone.tsx b/client/src/markdown/components/CurrentTimezone.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 import { getTimeNow } from "client/utils/getTimeNow";
-import { timezoneFormat } from "client/utils/timeFormatter";
+import { timezoneFormat } from "shared/utils/timeFormatter";
 
 export const CurrentTimezone = (): ReactNode => {
   // eslint-disable-next-line no-restricted-syntax -- We want to use local time here
diff --git a/client/src/markdown/components/FinnishTime.tsx b/client/src/markdown/components/FinnishTime.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 import { getTimeNow } from "client/utils/getTimeNow";
-import { getDateAndTime } from "client/utils/timeFormatter";
+import { getDateAndTime } from "shared/utils/timeFormatter";
 
 export const FinnishTime = (): ReactNode => {
   return getDateAndTime(getTimeNow().toISOString());
diff --git a/client/src/markdown/components/FinnishTimezone.tsx b/client/src/markdown/components/FinnishTimezone.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 import { getTimeNow } from "client/utils/getTimeNow";
-import { getTimezone } from "client/utils/timeFormatter";
+import { getTimezone } from "shared/utils/timeFormatter";
 
 export const FinnishTimezone = (): ReactNode => {
   return getTimezone(getTimeNow().toISOString());
diff --git a/client/src/test/test-components/TestTime.tsx b/client/src/test/test-components/TestTime.tsx
@@ -11,7 +11,7 @@ import {
   getShortDate,
   getShortWeekdayAndTime,
   getTime,
-} from "client/utils/timeFormatter";
+} from "shared/utils/timeFormatter";
 import { Dropdown } from "client/components/Dropdown";
 
 export const TestTime = (): ReactElement => {
diff --git a/client/src/views/admin/AdminView.tsx b/client/src/views/admin/AdminView.tsx
@@ -10,7 +10,7 @@ import {
   submitEmailTest,
 } from "client/views/admin/adminThunks";
 import { submitUpdateProgramItems } from "client/views/all-program-items/allProgramItemsThunks";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { ProgramItem, SignupType } from "shared/types/models/programItem";
 import { useAppDispatch, useAppSelector } from "client/utils/hooks";
 import { Button, ButtonStyle } from "client/components/Button";
diff --git a/client/src/views/admin/components/HiddenProgramItemsList.tsx b/client/src/views/admin/components/HiddenProgramItemsList.tsx
@@ -2,7 +2,7 @@ import { ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 import { sortBy } from "remeda";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { ProgramItem } from "shared/types/models/programItem";
 import { AppRoute } from "client/app/AppRoutes";
 
diff --git a/client/src/views/admin/components/SignupQuestionList.tsx b/client/src/views/admin/components/SignupQuestionList.tsx
@@ -5,7 +5,7 @@ import styled from "styled-components";
 import { sortBy } from "remeda";
 import { ProgramItem } from "shared/types/models/programItem";
 import { SignupQuestion } from "shared/types/models/settings";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { AppRoute } from "client/app/AppRoutes";
 
 interface Props {
diff --git a/client/src/views/admission-ticket/Admission.tsx b/client/src/views/admission-ticket/Admission.tsx
@@ -7,7 +7,7 @@ import {
   formattedCurrentTime,
   getTime,
   getWeekdayAndTime,
-} from "client/utils/timeFormatter";
+} from "shared/utils/timeFormatter";
 import { config } from "shared/config";
 import { ProgramItem } from "shared/types/models/programItem";
 import { RaisedCard } from "client/components/RaisedCard";
diff --git a/client/src/views/all-program-items/components/ProgramItemListTitle.tsx b/client/src/views/all-program-items/components/ProgramItemListTitle.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, useRef } from "react";
 import styled from "styled-components";
 import { capitalize } from "remeda";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { MOBILE_MARGIN } from "client/globalStyle";
 
 interface Props {
diff --git a/client/src/views/event-log/EventLog.tsx b/client/src/views/event-log/EventLog.tsx
@@ -5,7 +5,7 @@ import styled from "styled-components";
 import { sortBy } from "remeda";
 import { useAppDispatch, useAppSelector } from "client/utils/hooks";
 import { submitUpdateEventLogIsSeen } from "client/views/login/loginThunks";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { RaisedCard } from "client/components/RaisedCard";
 import { EventLogEventMessage } from "client/views/event-log/EventLogEventMessage";
 
diff --git a/client/src/views/event-log/EventLogNewAssignment.tsx b/client/src/views/event-log/EventLogNewAssignment.tsx
@@ -2,7 +2,7 @@ import { ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { Link } from "react-router";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { AppRoute } from "client/app/AppRoutes";
 import { ProgramItem } from "shared/types/models/programItem";
 import { EventLogItem } from "shared/types/models/eventLog";
diff --git a/client/src/views/event-log/EventLogNoAssignment.tsx b/client/src/views/event-log/EventLogNoAssignment.tsx
@@ -1,7 +1,7 @@
 import { ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import { EventLogItem } from "shared/types/models/eventLog";
-import { getTime } from "client/utils/timeFormatter";
+import { getTime } from "shared/utils/timeFormatter";
 
 interface Props {
   eventLogItem: EventLogItem;
diff --git a/client/src/views/event-log/EventLogProgramItemMoved.tsx b/client/src/views/event-log/EventLogProgramItemMoved.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 import { EventLogItem } from "shared/types/models/eventLog";
 import { useAppSelector } from "client/utils/hooks";
-import { getShortWeekdayAndTime } from "client/utils/timeFormatter";
+import { getShortWeekdayAndTime } from "shared/utils/timeFormatter";
 import { AppRoute } from "client/app/AppRoutes";
 
 interface Props {
diff --git a/client/src/views/helper/components/PasswordManagement.tsx b/client/src/views/helper/components/PasswordManagement.tsx
@@ -6,7 +6,7 @@ import { getUserBySerialOrUsername } from "client/services/userServices";
 import { Button, ButtonStyle } from "client/components/Button";
 import { ChangeUserSettingsForm } from "client/views/helper/components/ChangeUserSettingsForm";
 import { ControlledInput } from "client/components/ControlledInput";
-import { getDateAndTime } from "client/utils/timeFormatter";
+import { getDateAndTime } from "shared/utils/timeFormatter";
 import { exhaustiveSwitchGuard } from "shared/utils/exhaustiveSwitchGuard";
 import { useAppSelector } from "client/utils/hooks";
 
diff --git a/client/src/views/helper/components/PrivateSignupMessages.tsx b/client/src/views/helper/components/PrivateSignupMessages.tsx
@@ -5,7 +5,7 @@ import { groupBy, sortBy, capitalize } from "remeda";
 import styled from "styled-components";
 import { useAppSelector } from "client/utils/hooks";
 import { ProgramItem } from "shared/types/models/programItem";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { ControlledInput } from "client/components/ControlledInput";
 import { MULTIPLE_WHITESPACES_REGEX } from "client/views/all-program-items/AllProgramItemsView";
 import { AppRoute } from "client/app/AppRoutes";
diff --git a/client/src/views/my-program-items/components/DirectSignupItem.tsx b/client/src/views/my-program-items/components/DirectSignupItem.tsx
@@ -10,7 +10,7 @@ import {
 } from "client/views/my-program-items/myProgramItemsThunks";
 import { CancelSignupForm } from "client/views/program-item/signup/components/CancelSignupForm";
 import { config } from "shared/config";
-import { getShortWeekdayAndTime } from "client/utils/timeFormatter";
+import { getShortWeekdayAndTime } from "shared/utils/timeFormatter";
 import { TertiaryButton } from "client/components/TertiaryButton";
 import {
   MyProgramButtonContainer,
diff --git a/client/src/views/my-program-items/components/DirectSignupsByStartTimes.tsx b/client/src/views/my-program-items/components/DirectSignupsByStartTimes.tsx
@@ -1,6 +1,6 @@
 import { ReactElement } from "react";
 import { capitalize } from "remeda";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { DirectSignupItem } from "client/views/my-program-items/components/DirectSignupItem";
 import {
   MyProgramList,
diff --git a/client/src/views/my-program-items/components/FavoritesByStartTimes.tsx b/client/src/views/my-program-items/components/FavoritesByStartTimes.tsx
@@ -2,7 +2,7 @@ import { Fragment, ReactElement } from "react";
 import { useNavigate } from "react-router";
 import { useTranslation } from "react-i18next";
 import { capitalize, groupBy } from "remeda";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { ProgramItem } from "shared/types/models/programItem";
 import { useAppDispatch, useAppSelector } from "client/utils/hooks";
 import { updateFavorite } from "client/utils/favorite";
diff --git a/client/src/views/my-program-items/components/LotterySignupsByStartTimes.tsx b/client/src/views/my-program-items/components/LotterySignupsByStartTimes.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router";
 import styled from "styled-components";
 import { capitalize, groupBy } from "remeda";
 import { useTranslation } from "react-i18next";
-import { getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { PopularityInfo } from "client/components/PopularityInfo";
 import {
   MyProgramButtonContainer,
diff --git a/client/src/views/program-item/body/components/ProgramItemDetails.tsx b/client/src/views/program-item/body/components/ProgramItemDetails.tsx
@@ -2,7 +2,7 @@ import { ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { capitalize } from "remeda";
-import { getTime, getWeekdayAndTime } from "client/utils/timeFormatter";
+import { getTime, getWeekdayAndTime } from "shared/utils/timeFormatter";
 import { ProgramItem } from "shared/types/models/programItem";
 import { InfoText, InfoTextVariant } from "client/components/InfoText";
 import { TextWithLinks } from "client/markdown/components/TextWithLinks";
diff --git a/client/src/views/program-item/head/ProgramItemHead.tsx b/client/src/views/program-item/head/ProgramItemHead.tsx
@@ -6,7 +6,7 @@ import { ProgramItem, UserSignup } from "shared/types/models/programItem";
 import { UserGroup } from "shared/types/models/user";
 import { FavoriteButton } from "client/components/FavoriteButton";
 import { Tags } from "client/components/Tags";
-import { formatProgramItemDuration } from "client/utils/timeFormatter";
+import { formatProgramItemDuration } from "shared/utils/timeFormatter";
 import { getAttendeeType } from "client/utils/getAttendeeType";
 import { PopularityInfo } from "client/components/PopularityInfo";
 import { updateFavorite, UpdateFavoriteOpts } from "client/utils/favorite";
diff --git a/client/src/views/program-item/programItemUtils.ts b/client/src/views/program-item/programItemUtils.ts
@@ -6,7 +6,7 @@ import {
   getDateAndTime,
   getTime,
   getWeekdayAndTime,
-} from "client/utils/timeFormatter";
+} from "shared/utils/timeFormatter";
 import { config } from "shared/config";
 
 export const isAlreadyLotterySigned = (
diff --git a/server/src/features/assignment/utils/saveUserSignupResults.test.ts b/server/src/features/assignment/utils/saveUserSignupResults.test.ts
@@ -211,7 +211,7 @@ test("should add NEW_ASSIGNMENT and NO_ASSIGNMENT event log items for 'startTime
     .getSentEmails();
   const expectedAcceptedBody = `Hei ${mockUser.username}!
 Olet ollut onnekas ja pääsit ohjelmaan Test program item.
-Ohjelma alkaa Fri 26.7.2019 17:00.
+Ohjelma alkaa pe 26.7.2019 17:00.
 
 Hi Test User!
 You got spot on program Test program item.
diff --git a/server/src/features/notifications/senderCommon.ts b/server/src/features/notifications/senderCommon.ts
@@ -1,6 +1,5 @@
-import dayjs from "dayjs";
 import { NotificationTask } from "server/utils/notificationQueue";
-import { TIMEZONE } from "shared/utils/initializeDayjs";
+import { getDateAndTimeWithLocale } from "shared/utils/timeFormatter";
 
 export interface EmailMessage {
   from: string;
@@ -10,8 +9,6 @@ export interface EmailMessage {
   html?: string;
 }
 
-const dateAndTimeFormat = "ddd D.M.YYYY HH:mm";
-
 export function getEmailSubjectRejected(): string {
   return "Konstiarvonnan tulos / Results for Konsti lottery signup";
 }
@@ -32,16 +29,20 @@ export function getEmailBodyAccepted(
   programItemTitle: string,
   notification: NotificationTask,
 ): string {
-  // TODO: Should timeFormatter.ts be shared?
-  // eslint-disable-next-line no-restricted-syntax
-  const programStarttime = dayjs(notification.programItemStartTime)
-    .tz(TIMEZONE)
-    .format(dateAndTimeFormat);
+  const programStartTimeFi = getDateAndTimeWithLocale(
+    notification.programItemStartTime,
+    "fi",
+  );
+  const programStartTimeEn = getDateAndTimeWithLocale(
+    notification.programItemStartTime,
+    "en",
+  );
+
   const bodyFi = `Hei ${notification.username}!
 Olet ollut onnekas ja pääsit ohjelmaan ${programItemTitle}.
-Ohjelma alkaa ${programStarttime}.`;
+Ohjelma alkaa ${programStartTimeFi}.`;
   const bodyEn = `Hi ${notification.username}!
 You got spot on program ${programItemTitle}.
-Program will start at ${programStarttime}.`;
+Program will start at ${programStartTimeEn}.`;
   return `${bodyFi}\n\n${bodyEn}\n\nTerveisin / Sincerely Konsti`;
 }
diff --git a/shared/utils/initializeDayjs.ts b/shared/utils/initializeDayjs.ts
@@ -7,6 +7,7 @@ import updateLocale from "dayjs/plugin/updateLocale";
 import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
 import advancedFormat from "dayjs/plugin/advancedFormat";
+import "dayjs/locale/fi";
 
 export const TIMEZONE = "Europe/Helsinki";
 
diff --git a/shared/utils/timeFormatter.ts b/shared/utils/timeFormatter.ts
@@ -44,6 +44,14 @@ export const getDateAndTime = (time: string): string => {
   return dayjs(time).tz(TIMEZONE).format(timeFormat);
 };
 
+export const getDateAndTimeWithLocale = (
+  time: string,
+  locale: "fi" | "en",
+): string => {
+  const timeFormat = dateAndTimeFormat;
+  return dayjs(time).tz(TIMEZONE).locale(locale).format(timeFormat);
+};
+
 export const formatProgramItemDuration = (mins: number): string => {
   const hours = Math.floor(mins / 60);
   const minutes = mins % 60;
