Merge pull request #245 from City-of-Helsinki/TILA-1417

TILA-1417 respect publish dates when displaying application rounds

Author: kieferbonk

ui/cypress/integration/recurring-lander.ts

@@ -4,6 +4,7 @@ describe("recurring search lander", () => {
   beforeEach(() => {
     cy.visit("/recurring");
     cy.injectAxe();
+    Cypress.config("defaultCommandTimeout", 20000);
   });
 
   it("displays correct application rounds", () => {

ui/mocks/handlers/applicationRound.ts

@@ -67,7 +67,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: "2021-08-16",
         reservationPeriodEnd: "2022-05-29",
         publicDisplayBegin: "2021-04-16T06:00:00Z",
-        publicDisplayEnd: "2021-04-30T13:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [5, 6, 7, 8],
         serviceSectorId: 1,
         status: "approved",
@@ -118,7 +118,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: "2021-08-16",
         reservationPeriodEnd: "2022-05-29",
         publicDisplayBegin: "2021-04-16T06:00:00Z",
-        publicDisplayEnd: "2021-04-30T13:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [5, 6, 7, 8],
         serviceSectorId: 1,
         status: "approved",
@@ -169,7 +169,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: "2021-08-16",
         reservationPeriodEnd: "2022-05-29",
         publicDisplayBegin: "2021-04-16T06:00:00Z",
-        publicDisplayEnd: "2021-04-30T13:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [5, 6, 7, 8],
         serviceSectorId: 1,
         status: "approved",
@@ -220,7 +220,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: "2021-09-01",
         reservationPeriodEnd: "2022-05-29",
         publicDisplayBegin: "2021-04-16T06:00:00Z",
-        publicDisplayEnd: "2021-04-30T13:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [5, 6, 7, 8],
         serviceSectorId: 1,
         status: "approved",
@@ -271,7 +271,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: "2021-01-01",
         reservationPeriodEnd: "2021-06-01",
         publicDisplayBegin: "2021-01-01T00:00:00Z",
-        publicDisplayEnd: "2021-01-31T00:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [],
         serviceSectorId: null,
         status: "draft",
@@ -310,7 +310,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: "2021-01-01",
         reservationPeriodEnd: "2021-06-01",
         publicDisplayBegin: "2020-12-18T00:00:00Z",
-        publicDisplayEnd: "2020-12-31T00:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [2, 4],
         serviceSectorId: null,
         status: "draft",
@@ -337,7 +337,7 @@ const applicationRounds = rest.get(
         reservationPeriodBegin: toApiDate(addMonths(new Date(), 1)),
         reservationPeriodEnd: toApiDate(addMonths(new Date(), 5)),
         publicDisplayBegin: "2021-04-16T06:00:00Z",
-        publicDisplayEnd: "2021-04-30T13:00:00Z",
+        publicDisplayEnd: addDays(new Date(), 7).toISOString(),
         purposeIds: [5, 6, 7, 8],
         serviceSectorId: 1,
         status: "allocated",

ui/pages/recurring/index.tsx

@@ -17,9 +17,14 @@ type Props = {
 };
 
 export const getServerSideProps: GetServerSideProps = async ({ locale }) => {
+  const now = new Date();
   const applicationRounds = await getApplicationRounds();
 
-  const filteredApplicationRounds = sortBy(applicationRounds, ["id"]);
+  const filteredApplicationRounds = sortBy(applicationRounds, ["id"]).filter(
+    (applicationRound) =>
+      new Date(applicationRound.publicDisplayBegin) <= now &&
+      new Date(applicationRound.publicDisplayEnd) >= now
+  );
 
   return {
     props: {