refactor: remove extra application rounds query

apps/ui/components/reservation-unit/utils.test.ts

@@ -199,6 +199,7 @@ describe("getNextAvailableTime", () => {
       uuid: "123",
       images: [],
       applicationRoundTimeSlots: [],
+      applicationRounds: [],
       equipments: [],
       pricings: [],
     };

apps/ui/components/reservation/EditStep0.tsx

@@ -1,7 +1,6 @@
 import { breakpoints } from "common/src/common/style";
 import type { PendingReservation } from "@/modules/types";
 import type {
-  ApplicationRoundFieldsFragment,
   ReservationQuery,
   ReservationUnitPageQuery,
 } from "@gql/gql-types";
@@ -38,6 +37,7 @@ import { getNextAvailableTime } from "../reservation-unit/utils";
 import { ReservationInfoCard } from "./ReservationInfoCard";
 import { Subheading } from "common/src/reservation-form/styles";
 import Sanitize from "@/components/common/Sanitize";
+import { type RoundPeriod } from "@/modules/reservable";
 
 type ReservationUnitNodeT = NonNullable<
   ReservationUnitPageQuery["reservationUnit"]
@@ -47,7 +47,7 @@ type Props = {
   reservation: ReservationNodeT;
   reservationUnit: ReservationUnitNodeT;
   reservationForm: UseFormReturn<PendingReservationFormType>;
-  activeApplicationRounds: ApplicationRoundFieldsFragment[];
+  activeApplicationRounds: readonly RoundPeriod[];
   nextStep: () => void;
   apiBaseUrl: string;
   isLoading: boolean;

apps/ui/gql/gql-types.ts

@@ -6285,6 +6285,11 @@ export type ReservationUnitPageFieldsFragment = {
     weekday: number;
     reservableTimes?: Array<{ begin: string; end: string } | null> | null;
   }>;
+  applicationRounds: Array<{
+    id: string;
+    reservationPeriodBegin: string;
+    reservationPeriodEnd: string;
+  }>;
   reservationUnitType?: {
     id: string;
     pk?: number | null;
@@ -6443,6 +6448,11 @@ export type ReservationUnitQuery = {
       weekday: number;
       reservableTimes?: Array<{ begin: string; end: string } | null> | null;
     }>;
+    applicationRounds: Array<{
+      id: string;
+      reservationPeriodBegin: string;
+      reservationPeriodEnd: string;
+    }>;
     reservationUnitType?: {
       id: string;
       pk?: number | null;
@@ -6624,6 +6634,11 @@ export type ReservationUnitPageQuery = {
       weekday: number;
       reservableTimes?: Array<{ begin: string; end: string } | null> | null;
     }>;
+    applicationRounds: Array<{
+      id: string;
+      reservationPeriodBegin: string;
+      reservationPeriodEnd: string;
+    }>;
     reservationUnitType?: {
       id: string;
       pk?: number | null;
@@ -7982,6 +7997,11 @@ export const ReservationUnitPageFieldsFragmentDoc = gql`
         end
       }
     }
+    applicationRounds {
+      id
+      reservationPeriodBegin
+      reservationPeriodEnd
+    }
     descriptionFi
     descriptionEn
     descriptionSv

apps/ui/modules/queries/reservationUnit.tsx

@@ -64,6 +64,11 @@ const RESERVATION_UNIT_PAGE_FRAGMENT = gql`
         end
       }
     }
+    applicationRounds {
+      id
+      reservationPeriodBegin
+      reservationPeriodEnd
+    }
     descriptionFi
     descriptionEn
     descriptionSv

apps/ui/modules/reservation.ts

@@ -249,7 +249,7 @@ export type CanReservationBeChangedProps = {
   reservableTimes: ReservableMap;
   newReservation: PendingReservation;
   reservationUnit: IsReservableFieldsFragment;
-  activeApplicationRounds?: RoundPeriod[];
+  activeApplicationRounds: readonly RoundPeriod[];
 };
 
 export function getWhyReservationCantBeChanged(
@@ -326,7 +326,7 @@ export function canReservationTimeBeChanged({
   newReservation,
   reservableTimes,
   reservationUnit,
-  activeApplicationRounds = [],
+  activeApplicationRounds,
 }: CanReservationBeChangedProps): boolean {
   if (reservation == null) {
     return false;

apps/ui/pages/reservation-unit/[id].tsx

@@ -16,13 +16,10 @@ import { useLocalStorage } from "react-use";
 import { breakpoints } from "common/src/common/style";
 import { type PendingReservation } from "@/modules/types";
 import {
-  ApplicationRoundStatusChoice,
   type ApplicationRoundTimeSlotNode,
   PricingType,
   type ReservationCreateMutationInput,
   useCreateReservationMutation,
-  type ApplicationRoundPeriodsQuery,
-  ApplicationRoundPeriodsDocument,
   type ReservationUnitPageQuery,
   type ReservationUnitPageQueryVariables,
   ReservationUnitPageDocument,
@@ -118,16 +115,6 @@ export async function getServerSideProps(ctx: GetServerSidePropsContext) {
   const commonProps = getCommonServerSideProps();
   const apolloClient = createApolloClient(commonProps.apiBaseUrl, ctx);
 
-  // TODO does this return only possible rounds or do we need to do frontend filtering on them?
-  const { data } = await apolloClient.query<ApplicationRoundPeriodsQuery>({
-    query: ApplicationRoundPeriodsDocument,
-  });
-  const activeApplicationRounds = filterNonNullable(
-    data?.applicationRounds?.edges?.map((e) => e?.node)
-  )
-    .filter((n) => n.status === ApplicationRoundStatusChoice.Open)
-    .filter((n) => n?.reservationUnits?.find((x) => x?.pk === pk));
-
   if (pk) {
     const today = new Date();
     const startDate = today;
@@ -149,6 +136,10 @@ export async function getServerSideProps(ctx: GetServerSidePropsContext) {
         pk,
       },
     });
+    // TODO does this include only the active rounds or do we need to filter them?
+    const activeApplicationRounds = filterNonNullable(
+      reservationUnitData?.reservationUnit?.applicationRounds
+    );
 
     const previewPass = uuid === reservationUnitData.reservationUnit?.uuid;
 

apps/ui/pages/reservations/[id]/edit.tsx

@@ -16,7 +16,6 @@ import {
   type Mutation,
   type MutationAdjustReservationTimeArgs,
   useAdjustReservationTimeMutation,
-  useApplicationRoundsUiQuery,
 } from "@gql/gql-types";
 import { base64encode, filterNonNullable } from "common/src/helpers";
 import { toApiDate } from "common/src/common/util";
@@ -73,17 +72,6 @@ function ReservationEditPage(props: PropsNarrowed): JSX.Element {
 
   const [step, setStep] = useState<0 | 1>(0);
 
-  // TODO this should be redundant, use the reservationUnit.applicationRounds instead
-  // TODO this is bad, we can get the application rounds from the reservationUnit
-  const { data: applicationRoundsData } = useApplicationRoundsUiQuery({
-    fetchPolicy: "no-cache",
-  });
-  const activeApplicationRounds = filterNonNullable(
-    applicationRoundsData?.applicationRounds?.edges?.map((e) => e?.node)
-  ).filter((ar) =>
-    ar.reservationUnits?.map((n) => n?.pk).includes(reservationUnit.pk)
-  );
-
   const [mutation, { loading: isLoading }] = useAdjustReservationTimeMutation();
 
   // TODO should rework this so we don't pass a string here (use Dates till we do the mutation)
@@ -198,6 +186,9 @@ function ReservationEditPage(props: PropsNarrowed): JSX.Element {
     },
   ];
 
+  // TODO does this include non active application rounds?
+  const activeApplicationRounds = reservationUnit.applicationRounds;
+
   return (
     <ReservationPageWrapper>
       <HeadingSection>