fix: rejected query missing organisation name

Author: joonatank

apps/admin-ui/gql/gql-types.ts

@@ -8608,6 +8608,7 @@ export type RejectedOccurrencesQuery = {
                     firstName: string;
                     lastName: string;
                   } | null;
+                  organisation?: { id: string; name: string } | null;
                 };
               };
               reservationUnit: {
@@ -15492,6 +15493,10 @@ export const RejectedOccurrencesDocument = gql`
                       firstName
                       lastName
                     }
+                    organisation {
+                      id
+                      name
+                    }
                   }
                 }
                 reservationUnit {

apps/admin-ui/src/helpers/index.ts

@@ -71,15 +71,22 @@ export const reservationToInterval = (
   };
 };
 
+// NOTE optionals (?) are super bad because if you forget to query anything from the object there will be no type errors
+// can't remove them because they are not mandatory in the gql schema
+// maybe using an utility function that forces subobjects to NonNullable could work for this.
 type Application = {
   applicantType?:
     | Pick<ApplicationNode, "applicantType">["applicantType"]
-    | null;
-  contactPerson?: Pick<PersonNode, "firstName" | "lastName"> | null;
-  organisation?: Pick<
-    NonNullable<Pick<ApplicationNode, "organisation">["organisation"]>,
-    "name"
-  > | null;
+    | null
+    | undefined;
+  contactPerson?: Pick<PersonNode, "firstName" | "lastName"> | null | undefined;
+  organisation?:
+    | Pick<
+        NonNullable<Pick<ApplicationNode, "organisation">["organisation"]>,
+        "name"
+      >
+    | null
+    | undefined;
 };
 export function getApplicantName(app?: Application | undefined | null): string {
   if (!app) {

apps/admin-ui/src/spa/applications/[id]/index.tsx

@@ -857,7 +857,7 @@ function ApplicationDetails({
     application?.billingAddress != null &&
     !isEqual(application?.billingAddress, application?.organisation?.address);
 
-  const customerName = application != null ? getApplicantName(application) : "";
+  const customerName = getApplicantName(application);
   // TODO where is this defined in the application form?
   const homeCity = application?.homeCity?.nameFi ?? "-";
 

apps/admin-ui/src/spa/recurring-reservations/application-rounds/[id]/allocation/AllocationCard.tsx

@@ -176,9 +176,7 @@ export function AllocatedCard({
   // TODO should compare the allocated to the suitable time ranges, not to selection
   const isTimeMismatch = false;
 
-  const applicantName = applicationSection.application
-    ? getApplicantName(applicationSection.application)
-    : "-";
+  const applicantName = getApplicantName(applicationSection.application);
   const isLoading = isResetLoading || isRefreshLoading;
 
   return (
@@ -284,9 +282,7 @@ export function SuitableTimeCard({
       reservationUnitOptionPk,
       refresh,
     });
-  const applicantName = applicationSection.application
-    ? getApplicantName(applicationSection.application)
-    : "-";
+  const applicantName = getApplicantName(applicationSection.application);
 
   const isDisabled = !reservationUnitOptionPk || !isAllocationEnabled;
 

apps/admin-ui/src/spa/recurring-reservations/application-rounds/[id]/review/RejectedOccurrencesDataLoader.tsx

@@ -177,6 +177,10 @@ export const REJECTED_OCCURRENCES_QUERY = gql`
                       firstName
                       lastName
                     }
+                    organisation {
+                      id
+                      name
+                    }
                   }
                 }
                 reservationUnit {