From 64c6aaafdfbd86fa9f0dd717a023c5efd2922f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stankiewicz?= <stankiewicz1998@gmail.com>
Date: Fri, 10 May 2024 15:26:37 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B0=20Display=20start=20hour=20in=20wa?=
 =?UTF-8?q?ve=20(#469)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wavesTimelinePreview/timelinePreview.tsx  | 13 +++++++---
 src/config/actionPermissions.ts               |  2 +-
 src/config/waveStages.ts                      | 12 ++++-----
 src/lib/dates.ts                              |  2 +-
 .../preview/createApplicationAction.test.ts   |  3 ---
 tests/unit/config/waveStages.test.ts          | 25 +++++++++++--------
 tests/unit/lib/dates/formatDate.test.ts       |  2 +-
 7 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/components/ui/wavesTimelinePreview/timelinePreview.tsx b/src/components/ui/wavesTimelinePreview/timelinePreview.tsx
index 96228811..70f599c9 100644
--- a/src/components/ui/wavesTimelinePreview/timelinePreview.tsx
+++ b/src/components/ui/wavesTimelinePreview/timelinePreview.tsx
@@ -1,6 +1,7 @@
 import { Wave } from "@/types/Wave";
 import { getWaveStage } from "@/config/waveStages";
 import { cn } from "@/lib/cn";
+import { formatTime } from "@/lib/dates";
 import { Badge } from "@/components/ui/badge";
 
 import { TimelineStage } from "./timelineStage";
@@ -14,12 +15,18 @@ export const TimelinePreview = ({ wave, className }: TimelinePreviewProps) => {
   const { openStartDate, denoisingStartDate, assesmentStartDate, closeDate } =
     wave;
 
-  const waveStage = getWaveStage(wave);
+  const { waveStage, nextStageDate } = getWaveStage(wave);
 
   return (
     <div className={cn("flex flex-col items-center gap-2", className)}>
-      {waveStage === "notOpen" && (
-        <Badge className="px-4 font-mono">Wave will start soon</Badge>
+      {nextStageDate && (
+        <Badge className="px-4 font-mono">
+          {`${
+            waveStage === "notOpen"
+              ? "Wave will start at"
+              : "Next stage will start at"
+          } ${formatTime(nextStageDate)}`}
+        </Badge>
       )}
       <ul className="flex w-full rounded-3xl  ">
         <TimelineStage
diff --git a/src/config/actionPermissions.ts b/src/config/actionPermissions.ts
index 71cce619..d07b84c8 100644
--- a/src/config/actionPermissions.ts
+++ b/src/config/actionPermissions.ts
@@ -55,7 +55,7 @@ async function checkWaveStage({
   if (cookies()?.get("skipWaveStageCheck")?.value === "true") return;
 
   const wave = await getWaveDates(waveId);
-  const waveStage = getWaveStage(wave);
+  const { waveStage } = getWaveStage(wave);
   const isCorrectStage = canPerformActionByStage(waveStage, action);
   if (!isCorrectStage) {
     throw new ValidationError(errorMsg);
diff --git a/src/config/waveStages.ts b/src/config/waveStages.ts
index 9b8c77e7..f6c2179d 100644
--- a/src/config/waveStages.ts
+++ b/src/config/waveStages.ts
@@ -17,26 +17,26 @@ export function getWaveStage({
   denoisingStartDate,
   assesmentStartDate,
   closeDate,
-}: WaveStageArgs): WaveStage {
+}: WaveStageArgs): { waveStage: WaveStage; nextStageDate: Date | undefined } {
   const currentDate = new Date();
 
   if (currentDate > closeDate) {
-    return "close";
+    return { waveStage: "close", nextStageDate: undefined };
   }
 
   if (currentDate > assesmentStartDate) {
-    return "assesment";
+    return { waveStage: "assesment", nextStageDate: closeDate };
   }
 
   if (currentDate > denoisingStartDate) {
-    return "denoising";
+    return { waveStage: "denoising", nextStageDate: assesmentStartDate };
   }
 
   if (currentDate > openStartDate) {
-    return "open";
+    return { waveStage: "open", nextStageDate: denoisingStartDate };
   }
 
-  return "notOpen";
+  return { waveStage: "notOpen", nextStageDate: openStartDate };
 }
 
 export type UserAction =
diff --git a/src/lib/dates.ts b/src/lib/dates.ts
index a0d276e5..ec5c2e1f 100644
--- a/src/lib/dates.ts
+++ b/src/lib/dates.ts
@@ -9,7 +9,7 @@ export function formatDate(date: Date) {
 }
 
 const timeFormatter = new Intl.DateTimeFormat("en-US", {
-  year: "2-digit",
+  year: "numeric",
   month: "short",
   day: "2-digit",
   hour: "2-digit",
diff --git a/tests/unit/app/waves/[waveId]/applications/create/preview/createApplicationAction.test.ts b/tests/unit/app/waves/[waveId]/applications/create/preview/createApplicationAction.test.ts
index 8924bf45..9b3331fd 100644
--- a/tests/unit/app/waves/[waveId]/applications/create/preview/createApplicationAction.test.ts
+++ b/tests/unit/app/waves/[waveId]/applications/create/preview/createApplicationAction.test.ts
@@ -1,6 +1,5 @@
 import { db } from "@/drizzle/db";
 import { Moderator, Reviewer, User, Wave } from "@/drizzle/schema";
-import { eq } from "drizzle-orm";
 import { mockUserSession } from "tests/helpers/mockUserSession";
 import {
   createBlocked,
@@ -13,8 +12,6 @@ import {
 } from "tests/helpers/queries";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-import { getWaveStage } from "@/config/waveStages";
-import { addDays } from "@/lib/dates";
 import { createApplicationAction } from "@/app/waves/[waveId]/applications/create/preview/createApplicationAction";
 
 const waveId = 0;
diff --git a/tests/unit/config/waveStages.test.ts b/tests/unit/config/waveStages.test.ts
index 0b29620f..0ce3e6ca 100644
--- a/tests/unit/config/waveStages.test.ts
+++ b/tests/unit/config/waveStages.test.ts
@@ -17,65 +17,70 @@ describe("config/waveStages", () => {
   test("should return notOpen when current date is before start date", () => {
     vi.useFakeTimers({ now: initialDate });
 
-    const stage = getWaveStage({
+    const { waveStage, nextStageDate } = getWaveStage({
       openStartDate: createDate(1),
       denoisingStartDate: createDate(2),
       assesmentStartDate: createDate(3),
       closeDate: createDate(4),
     });
 
-    expect(stage).toBe("notOpen");
+    expect(waveStage).toBe("notOpen");
+    expect(nextStageDate).toStrictEqual(createDate(1));
   });
 
   test("should return open when current date is after start date", () => {
     vi.useFakeTimers({ now: createDate(2) });
 
-    const stage = getWaveStage({
+    const { waveStage, nextStageDate } = getWaveStage({
       openStartDate: createDate(1),
       denoisingStartDate: createDate(2),
       assesmentStartDate: createDate(3),
       closeDate: createDate(4),
     });
 
-    expect(stage).toBe("open");
+    expect(waveStage).toBe("open");
+    expect(nextStageDate).toStrictEqual(createDate(2));
   });
 
   test("should return denoising when current date is after denoising start date", () => {
     vi.useFakeTimers({ now: createDate(3) });
 
-    const stage = getWaveStage({
+    const { waveStage, nextStageDate } = getWaveStage({
       openStartDate: createDate(1),
       denoisingStartDate: createDate(2),
       assesmentStartDate: createDate(3),
       closeDate: createDate(4),
     });
 
-    expect(stage).toBe("denoising");
+    expect(waveStage).toBe("denoising");
+    expect(nextStageDate).toStrictEqual(createDate(3));
   });
 
   test("should return assesment when current date is after assesment start date", () => {
     vi.useFakeTimers({ now: createDate(4) });
 
-    const stage = getWaveStage({
+    const { waveStage, nextStageDate } = getWaveStage({
       openStartDate: createDate(1),
       denoisingStartDate: createDate(2),
       assesmentStartDate: createDate(3),
       closeDate: createDate(4),
     });
 
-    expect(stage).toBe("assesment");
+    expect(waveStage).toBe("assesment");
+    expect(nextStageDate).toStrictEqual(createDate(4));
   });
 
   test("should return closed when current date is after close date", () => {
     vi.useFakeTimers({ now: createDate(5) });
 
-    const stage = getWaveStage({
+    const { waveStage, nextStageDate } = getWaveStage({
       openStartDate: createDate(1),
       denoisingStartDate: createDate(2),
       assesmentStartDate: createDate(3),
       closeDate: createDate(4),
     });
 
-    expect(stage).toBe("close");
+    expect(waveStage).toBe("close");
+    expect(nextStageDate).toBeUndefined();
   });
 });
diff --git a/tests/unit/lib/dates/formatDate.test.ts b/tests/unit/lib/dates/formatDate.test.ts
index 1a0111ed..1272a20d 100644
--- a/tests/unit/lib/dates/formatDate.test.ts
+++ b/tests/unit/lib/dates/formatDate.test.ts
@@ -12,7 +12,7 @@ describe("lib/dates", () => {
   describe("formatTime", () => {
     test("should correctly format a Date object into a time string", () => {
       expect(formatTime(new Date("2022-01-01 00:00:00"))).toBe(
-        "Jan 01, 22, 00:00",
+        "Jan 01, 2022, 00:00",
       );
     });
   });