fix: backend graphql API changes

City-of-Helsinki · Oct 24, 2024 · 19c272f · 19c272f
1 parent fe16587
commit 19c272f
Show file tree

Hide file tree

Showing 60 changed files with 996 additions and 824 deletions.
diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
diff --git a/apps/admin-ui/src/common/fragments.tsx b/apps/admin-ui/src/common/fragments.tsx
@@ -44,7 +44,7 @@ export const SPACE_FRAGMENT = gql`
   fragment SpaceFields on SpaceNode {
     ...SpaceCommonFields
     code
-    resourceSet {
+    resources {
       ...ResourceFields
     }
     children {
@@ -177,7 +177,7 @@ export const RESERVATIONUNIT_RESERVATIONS_FRAGMENT = gql`
     name
     numPersons
     calendarUrl
-    reservationUnit {
+    reservationUnits {
       id
       pk
       nameFi

diff --git a/apps/admin-ui/src/common/queries.tsx b/apps/admin-ui/src/common/queries.tsx
@@ -22,7 +22,7 @@ export const UNIT_QUERY = gql`
       nameFi
       tprekId
       shortDescriptionFi
-      reservationunitSet {
+      reservationUnits {
         ...ReservationUnitCommonFields
         resources {
           id
@@ -60,7 +60,7 @@ export const UNIT_WITH_SPACES_AND_RESOURCES = gql`
       nameFi
       spaces {
         ...SpaceCommonFields
-        resourceSet {
+        resources {
           id
           pk
           nameFi

diff --git a/apps/admin-ui/src/component/EditTimeModal.tsx b/apps/admin-ui/src/component/EditTimeModal.tsx
@@ -126,7 +126,7 @@ export const CHANGE_RESERVATION_TIME_QUERY_FRAGMENT = gql`
       beginDate
       endDate
     }
-    reservationUnit {
+    reservationUnits {
       id
       pk
       bufferTimeBefore
@@ -316,7 +316,7 @@ export function NewReservationModal({
 
   const { recurringReservation, type } = reservationToCopy ?? {};
   const { pk: recurringReservationPk } = recurringReservation ?? {};
-  const reservationUnit = reservationToCopy?.reservationUnit?.[0];
+  const reservationUnit = reservationToCopy?.reservationUnits?.[0];
 
   // NOTE 0 => buffer disabled for this reservation, undefined => no buffers selected
   const bufferTimeBefore = reservationUnit?.bufferTimeBefore ?? 0;
@@ -455,7 +455,7 @@ export function EditTimeModal({
   const startDateTime = new Date(reservation.begin);
   const endDateTime = new Date(reservation.end);
 
-  const reservationUnit = reservation.reservationUnit?.find(() => true);
+  const reservationUnit = reservation.reservationUnits?.find(() => true);
 
   // NOTE 0 => buffer disabled for this reservation, undefined => no buffers selected
   const bufferTimeBefore =
@@ -525,7 +525,7 @@ export function EditTimeModal({
       <ErrorBoundary fallback={<div>{t("errors.descriptive.unknown")}</div>}>
         <DialogContent
           form={form}
-          reservationUnitPk={reservation.reservationUnit?.[0]?.pk ?? 0}
+          reservationUnitPk={reservation.reservationUnits?.[0]?.pk ?? 0}
           bufferTimeAfter={bufferTimeAfter}
           bufferTimeBefore={bufferTimeBefore}
           mutate={changeTime}

diff --git a/apps/admin-ui/src/component/RecurringReservationsView.tsx b/apps/admin-ui/src/component/RecurringReservationsView.tsx
@@ -59,7 +59,7 @@ export function RecurringReservationsView({
   });
 
   const { hasPermission } = useCheckPermission({
-    units: [reservationToCopy?.reservationUnit?.[0].unit?.pk ?? 0],
+    units: [reservationToCopy?.reservationUnits?.[0].unit?.pk ?? 0],
     permission: UserPermissionChoice.CanManageReservations,
   });
 

diff --git a/apps/admin-ui/src/component/ReservationTypeForm.tsx b/apps/admin-ui/src/component/ReservationTypeForm.tsx
@@ -23,7 +23,7 @@ import { Element } from "@/styles/util";
 // TODO use a fragment
 type ReservationType = NonNullable<ReservationQuery["reservation"]>;
 type ReservationUnitType = Omit<
-  NonNullable<ReservationType["reservationUnit"]>[0],
+  NonNullable<ReservationType["reservationUnits"]>[0],
   "pricings"
 >;
 

diff --git a/apps/admin-ui/src/component/ReservationsList.tsx b/apps/admin-ui/src/component/ReservationsList.tsx
@@ -156,7 +156,7 @@ function AddNewReservationButton({
   refetch,
 }: AddNewReservationButtonProps) {
   const { hasPermission } = useCheckPermission({
-    units: [reservationToCopy?.reservationUnit?.[0].unit?.pk ?? 0],
+    units: [reservationToCopy?.reservationUnits?.[0].unit?.pk ?? 0],
     permission: UserPermissionChoice.CanManageReservations,
   });
   const { t } = useTranslation();

diff --git a/apps/admin-ui/src/component/VisibleIfPermission.tsx b/apps/admin-ui/src/component/VisibleIfPermission.tsx
@@ -8,7 +8,7 @@ import { useSession } from "@/hooks/auth";
 
 type ReservationPermissionType = Pick<
   ReservationUnitReservationsFragment,
-  "reservationUnit" | "user"
+  "reservationUnits" | "user"
 >;
 
 function VisibleIfPermission({
@@ -25,7 +25,7 @@ function VisibleIfPermission({
   const { user } = useSession();
   const isOwner = reservation.user?.pk === user?.pk;
   const { hasPermission } = useCheckPermission({
-    units: [reservation?.reservationUnit?.[0]?.unit?.pk ?? 0],
+    units: [reservation?.reservationUnits?.[0]?.unit?.pk ?? 0],
     permission,
   });
 

diff --git a/apps/admin-ui/src/hooks/useCheckCollisions.ts b/apps/admin-ui/src/hooks/useCheckCollisions.ts
@@ -54,9 +54,7 @@ export function useCheckCollisions({
   ) {
     return reservation.affectedReservationUnits?.some((pk) => pk === resUnitPk);
   }
-  const reservationSet = filterNonNullable(
-    data?.reservationUnit?.reservationSet
-  );
+  const reservationSet = filterNonNullable(data?.reservationUnit?.reservations);
   // NOTE we could use a recular concat here (we only have single reservationUnit here)
   const affectingReservations = filterNonNullable(data?.affectingReservations);
   const reservations = filterNonNullable(

diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
@@ -592,14 +592,13 @@ function BasicSection({
   const { errors } = formState;
   const { spaces } = unit ?? {};
 
-  const spaceOptions =
-    spaces?.map((s) => ({
-      label: String(s?.nameFi),
-      value: Number(s?.pk),
-    })) ?? [];
+  const spaceOptions = filterNonNullable(spaces).map((s) => ({
+    label: s?.nameFi ?? "-",
+    value: s?.pk ?? 0,
+  }));
   const resourceOptions = filterNonNullable(
-    spaces?.flatMap((s) => s?.resourceSet)
-  ).map((r) => ({ label: String(r?.nameFi), value: Number(r?.pk) }));
+    spaces?.flatMap((s) => s?.resources)
+  ).map((r) => ({ label: r?.nameFi ?? "-", value: r?.pk ?? 0 }));
 
   const spacePks = watch("spaces");
   const selectedSpaces = filterNonNullable(

diff --git a/apps/admin-ui/src/spa/my-units/[id]/ReservationPopupContent.tsx b/apps/admin-ui/src/spa/my-units/[id]/ReservationPopupContent.tsx
@@ -50,7 +50,7 @@ export function ReservationPopupContent({
       <DenseVerticalFlex>
         <Heading>
           {formatTime(reservation.begin)} - {formatTime(reservation.end)} /{" "}
-          {reservation.reservationUnit?.[0]?.nameFi}
+          {reservation.reservationUnits?.[0]?.nameFi ?? "-"}
         </Heading>
         <VisibleIfPermission
           reservation={reservation}

diff --git a/apps/admin-ui/src/spa/my-units/[id]/ReservationUnitCalendar.tsx b/apps/admin-ui/src/spa/my-units/[id]/ReservationUnitCalendar.tsx
@@ -44,7 +44,7 @@ type ReservationUnitType = NonNullable<
   ReservationUnitCalendarQuery["reservationUnit"]
 >;
 type ReservationType = NonNullable<
-  NonNullable<ReservationUnitType["reservationSet"]>[0]
+  NonNullable<ReservationUnitType["reservations"]>[0]
 >;
 
 function getEventTitle({
@@ -56,7 +56,7 @@ function getEventTitle({
   reservation: ReservationType;
   t: TFunction;
 }) {
-  const reservationUnit = reservation.reservationUnit?.[0];
+  const reservationUnit = reservation.reservationUnits?.[0];
   const isOtherReservationUnit = reservationUnitPk !== reservationUnit?.pk;
 
   const reserveeName = getReserveeName(reservation, t);
@@ -128,9 +128,7 @@ export function ReservationUnitCalendar({
     return reservation.affectedReservationUnits?.some((pk) => pk === resUnitPk);
   }
 
-  const reservationSet = filterNonNullable(
-    data?.reservationUnit?.reservationSet
-  );
+  const reservationSet = filterNonNullable(data?.reservationUnit?.reservations);
   const affectingReservations = filterNonNullable(data?.affectingReservations);
   const reservations = filterNonNullable(
     reservationSet?.concat(

diff --git a/apps/admin-ui/src/spa/my-units/[id]/UnitCalendar.tsx b/apps/admin-ui/src/spa/my-units/[id]/UnitCalendar.tsx
@@ -330,7 +330,7 @@ function getEventTitle({
     return t("MyUnits.Calendar.legend.closed");
   }
 
-  return event && event?.pk !== event?.reservationUnit?.[0]?.pk
+  return event && event?.pk !== event?.reservationUnits?.[0]?.pk
     ? getReserveeName(event, t)
     : title;
 }

diff --git a/apps/admin-ui/src/spa/my-units/[id]/eventStyleGetter.ts b/apps/admin-ui/src/spa/my-units/[id]/eventStyleGetter.ts
@@ -73,7 +73,7 @@ const eventStyleGetter =
     style: React.CSSProperties;
     className?: string;
   } => {
-    const isCurrentReservationUnit = !!event?.reservationUnit?.find(
+    const isCurrentReservationUnit = !!event?.reservationUnits?.find(
       (ru) => ru?.pk === currentReservationUnitPk
     );
 

diff --git a/apps/admin-ui/src/spa/my-units/[id]/hooks/index.ts b/apps/admin-ui/src/spa/my-units/[id]/hooks/index.ts
@@ -30,7 +30,7 @@ export function useUnitResources(
   });
 
   const { affectingReservations } = data ?? {};
-  const reservationunitSet = filterNonNullable(data?.unit?.reservationunitSet);
+  const reservationunitSet = filterNonNullable(data?.unit?.reservationUnits);
 
   type ReservationType = NonNullable<typeof affectingReservations>[0];
   type ReservationUnitType = NonNullable<typeof reservationunitSet>[0];
@@ -66,7 +66,7 @@ export function useUnitResources(
       const affecting = affectingReservations?.filter((y) =>
         doesReservationAffectReservationUnit(y, x.pk ?? 0)
       );
-      const _events = x.reservationSet?.concat(affecting ?? []);
+      const _events = x.reservations?.concat(affecting ?? []);
       const events = filterNonNullable(_events);
 
       return {

diff --git a/apps/admin-ui/src/spa/my-units/[id]/hooks/queries.tsx b/apps/admin-ui/src/spa/my-units/[id]/hooks/queries.tsx
@@ -48,7 +48,7 @@ export const UNIT_VIEW_QUERY = gql`
       location {
         ...LocationFields
       }
-      reservationunitSet {
+      reservationUnits {
         id
         pk
         nameFi
@@ -72,7 +72,7 @@ export const RESERVATION_UNITS_BY_UNIT = gql`
   ) {
     unit(id: $id) {
       id
-      reservationunitSet {
+      reservationUnits {
         id
         pk
         nameFi
@@ -88,11 +88,7 @@ export const RESERVATION_UNITS_BY_UNIT = gql`
         bufferTimeAfter
         isDraft
         authentication
-        reservationSet(
-          beginDate: $beginDate
-          endDate: $endDate
-          state: $state
-        ) {
+        reservations(beginDate: $beginDate, endDate: $endDate, state: $state) {
           ...ReservationUnitReservations
         }
       }

diff --git a/apps/admin-ui/src/spa/my-units/[id]/index.tsx b/apps/admin-ui/src/spa/my-units/[id]/index.tsx
@@ -93,9 +93,9 @@ export function MyUnitView() {
   const recurringReservationUrl = getRecurringReservationUrl(pk);
 
   const reservationUnitOptions = filterNonNullable(
-    data?.unit?.reservationunitSet
+    data?.unit?.reservationUnits
   ).map((reservationUnit) => ({
-    label: reservationUnit?.nameFi ?? "",
+    label: reservationUnit?.nameFi ?? "-",
     value: reservationUnit?.pk ?? 0,
   }));
 

diff --git a/apps/admin-ui/src/spa/my-units/queries.tsx b/apps/admin-ui/src/spa/my-units/queries.tsx
@@ -7,7 +7,7 @@ export const RECURRING_RESERVATION_UNIT_QUERY = gql`
       id
       nameFi
       pk
-      reservationunitSet {
+      reservationUnits {
         id
         pk
         nameFi
@@ -33,7 +33,7 @@ export const RESERVATION_UNIT_CALENDAR_QUERY = gql`
     reservationUnit(id: $id) {
       id
       pk
-      reservationSet(state: $state, beginDate: $beginDate, endDate: $endDate) {
+      reservations(state: $state, beginDate: $beginDate, endDate: $endDate) {
         ...ReservationUnitReservations
       }
     }

diff --git a/apps/admin-ui/src/spa/my-units/recurring/RecurringReservationForm.test.tsx b/apps/admin-ui/src/spa/my-units/recurring/RecurringReservationForm.test.tsx
@@ -16,14 +16,14 @@ import {
   YEAR,
   mocks,
   mondayMorningReservations,
-  units,
+  createUnits,
 } from "./__test__/mocks";
 
 function customRender() {
   return render(
     <MemoryRouter>
       <MockedProvider mocks={mocks} addTypename={false}>
-        <RecurringReservationForm reservationUnits={units} />
+        <RecurringReservationForm reservationUnits={createUnits()} />
       </MockedProvider>
     </MemoryRouter>
   );
@@ -60,6 +60,7 @@ test("Render recurring reservation form with all but unit field disabled", async
     selector: "ul",
   });
 
+  const units = createUnits();
   expect(units[0].nameFi).toBeDefined();
   expect(units[1].nameFi).toBeDefined();
   expect(listbox).toBeInTheDocument();
@@ -106,6 +107,7 @@ async function selectUnit() {
   const listbox = screen.getByLabelText(/reservationUnit/, {
     selector: "ul",
   });
+  const units = createUnits();
   expect(units[0].nameFi).toBeDefined();
   const unitName = units[0].nameFi!;
 
@@ -216,7 +218,6 @@ async function fillForm({
   const listbox = screen.getByLabelText(/reservationUnit/, {
     selector: "ul",
   });
-  expect(units[0].nameFi).toBeDefined();
 
   // Select works for HDS listbox but
   // to check the selected value we have to read the button text not check options