fix: core 0.44.0 gql api update

Author: joonatank

apps/admin-ui/src/component/reservations/requested/ApproveDialog.tsx

@@ -92,11 +92,14 @@ const DialogContent = ({
   const priceIsValid = !hasPrice || !Number.isNaN(price);
 
   const handleApprove = () => {
+    if (reservation.pk == null) {
+      throw new Error("Reservation pk is missing");
+    }
     const taxP = reservation.taxPercentageValue ?? "0";
     approveReservation({
       pk: reservation.pk,
-      price: Number(price),
-      priceNet: calcPriceNet(Number(price), parseFloat(taxP)),
+      price: price.toString(),
+      priceNet: calcPriceNet(Number(price), parseFloat(taxP)).toString(),
       handlingDetails,
     });
   };

apps/admin-ui/src/component/reservations/requested/DenyDialog.tsx

@@ -188,11 +188,15 @@ const DialogContent = ({
         throw new Error("Deny PK undefined");
       }
 
+      const pks = filterNonNullable(reservations.map((x) => x.pk));
+      if (pks.length === 0) {
+        throw new Error("No reservation PKs found");
+      }
       setInProgress(true);
-      const denyPromises = reservations.map((x) =>
+      const denyPromises = pks.map((pk) =>
         denyReservation({
-          pk: x.pk,
-          denyReasonPk,
+          pk,
+          denyReason: denyReasonPk,
           handlingDetails,
         })
       );

apps/admin-ui/src/component/reservations/requested/ReturnToRequiresHandlingDialog.tsx

@@ -54,6 +54,9 @@ const DialogContent = ({
   ) => backToRequireHandlingMutation({ variables: { input } });
 
   const handleClick = () => {
+    if (!reservation.pk) {
+      throw new Error("Reservation pk is missing");
+    }
     backToRequireHandling({ pk: reservation.pk });
   };
 

apps/ui/components/reservation/ReservationCancellation.tsx

@@ -214,7 +214,7 @@ function ReservationCancellation(props: Props): JSX.Element {
         variables: {
           input: {
             pk: reservation.pk,
-            cancelReasonPk: reason,
+            cancelReason: reason,
             cancelDetails: description,
           },
         },

packages/common/types/gql-types.ts

@@ -210,6 +210,29 @@ export enum AllocatedTimeSlotOrderingChoices {
   PkDesc = "pkDesc",
 }
 
+export type ApplicantNode = Node & {
+  __typename?: "ApplicantNode";
+  dateOfBirth?: Maybe<Scalars["Date"]["output"]>;
+  email: Scalars["String"]["output"];
+  firstName: Scalars["String"]["output"];
+  generalRoles: Array<GeneralRoleNode>;
+  /** The ID of the object */
+  id: Scalars["ID"]["output"];
+  isAdAuthenticated?: Maybe<Scalars["Boolean"]["output"]>;
+  isStronglyAuthenticated?: Maybe<Scalars["Boolean"]["output"]>;
+  /** Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella. */
+  isSuperuser: Scalars["Boolean"]["output"];
+  lastName: Scalars["String"]["output"];
+  name?: Maybe<Scalars["String"]["output"]>;
+  pk?: Maybe<Scalars["Int"]["output"]>;
+  reservationNotification?: Maybe<Scalars["String"]["output"]>;
+  serviceSectorRoles: Array<ServiceSectorRoleNode>;
+  unitRoles: Array<UnitRoleNode>;
+  /** Vaaditaan. Enintään 150 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat sallittuja. */
+  username: Scalars["String"]["output"];
+  uuid: Scalars["UUID"]["output"];
+};
+
 /** An enumeration. */
 export enum ApplicantTypeChoice {
   Association = "ASSOCIATION",
@@ -279,7 +302,7 @@ export type ApplicationNode = Node & {
   pk?: Maybe<Scalars["Int"]["output"]>;
   sentDate?: Maybe<Scalars["DateTime"]["output"]>;
   status?: Maybe<ApplicationStatusChoice>;
-  user?: Maybe<UserNode>;
+  user?: Maybe<ApplicantNode>;
   workingMemo: Scalars["String"]["output"];
 };
 
@@ -2783,21 +2806,19 @@ export type ReservationAdjustTimeMutationPayload = {
 };
 
 export type ReservationApproveMutationInput = {
-  /** Additional information for approval. */
   handlingDetails: Scalars["String"]["input"];
-  pk?: InputMaybe<Scalars["Int"]["input"]>;
-  price: Scalars["Float"]["input"];
-  priceNet: Scalars["Float"]["input"];
+  pk: Scalars["Int"]["input"];
+  price: Scalars["Decimal"]["input"];
+  priceNet: Scalars["Decimal"]["input"];
 };
 
 export type ReservationApproveMutationPayload = {
   __typename?: "ReservationApproveMutationPayload";
   handledAt?: Maybe<Scalars["DateTime"]["output"]>;
-  /** Additional information for approval. */
   handlingDetails?: Maybe<Scalars["String"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
-  price?: Maybe<Scalars["Float"]["output"]>;
-  priceNet?: Maybe<Scalars["Float"]["output"]>;
+  price?: Maybe<Scalars["Decimal"]["output"]>;
+  priceNet?: Maybe<Scalars["Decimal"]["output"]>;
   state?: Maybe<State>;
 };
 
@@ -2831,19 +2852,15 @@ export type ReservationCancelReasonNodeEdge = {
 };
 
 export type ReservationCancellationMutationInput = {
-  /** Additional information for the cancellation. */
   cancelDetails?: InputMaybe<Scalars["String"]["input"]>;
-  /** Primary key for the pre-defined cancel reason. */
-  cancelReasonPk: Scalars["Int"]["input"];
+  cancelReason: Scalars["Int"]["input"];
   pk: Scalars["Int"]["input"];
 };
 
 export type ReservationCancellationMutationPayload = {
   __typename?: "ReservationCancellationMutationPayload";
-  /** Additional information for the cancellation. */
   cancelDetails?: Maybe<Scalars["String"]["output"]>;
-  /** Primary key for the pre-defined cancel reason. */
-  cancelReasonPk?: Maybe<Scalars["Int"]["output"]>;
+  cancelReason?: Maybe<Scalars["Int"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
   state?: Maybe<State>;
 };
@@ -2996,19 +3013,15 @@ export type ReservationDeleteMutationPayload = {
 };
 
 export type ReservationDenyMutationInput = {
-  /** Primary key for the pre-defined deny reason. */
-  denyReasonPk: Scalars["Int"]["input"];
-  /** Additional information for denying. */
-  handlingDetails?: InputMaybe<Scalars["String"]["input"]>;
-  pk?: InputMaybe<Scalars["Int"]["input"]>;
+  denyReason: Scalars["Int"]["input"];
+  handlingDetails: Scalars["String"]["input"];
+  pk: Scalars["Int"]["input"];
 };
 
 export type ReservationDenyMutationPayload = {
   __typename?: "ReservationDenyMutationPayload";
-  /** Primary key for the pre-defined deny reason. */
-  denyReasonPk?: Maybe<Scalars["Int"]["output"]>;
+  denyReason?: Maybe<Scalars["Int"]["output"]>;
   handledAt?: Maybe<Scalars["DateTime"]["output"]>;
-  /** Additional information for denying. */
   handlingDetails?: Maybe<Scalars["String"]["output"]>;
   pk?: Maybe<Scalars["Int"]["output"]>;
   state?: Maybe<State>;
@@ -3317,7 +3330,7 @@ export type ReservationRefundMutationPayload = {
 };
 
 export type ReservationRequiresHandlingMutationInput = {
-  pk?: InputMaybe<Scalars["Int"]["input"]>;
+  pk: Scalars["Int"]["input"];
 };
 
 export type ReservationRequiresHandlingMutationPayload = {

tilavaraus.graphql

@@ -159,6 +159,34 @@ enum AllocatedTimeSlotOrderingChoices {
   applicationSectionStatusDesc
 }
 
+type ApplicantNode implements Node {
+  """
+  Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella.
+  """
+  isSuperuser: Boolean!
+
+  """
+  Vaaditaan. Enintään 150 merkkiä. Vain kirjaimet, numerot ja @/./+/-/_ ovat sallittuja.
+  """
+  username: String!
+  firstName: String!
+  lastName: String!
+  email: String!
+  uuid: UUID!
+  reservationNotification: String
+  dateOfBirth: Date
+  generalRoles: [GeneralRoleNode!]!
+  unitRoles: [UnitRoleNode!]!
+  serviceSectorRoles: [ServiceSectorRoleNode!]!
+
+  """The ID of the object"""
+  id: ID!
+  name: String
+  isAdAuthenticated: Boolean
+  isStronglyAuthenticated: Boolean
+  pk: Int
+}
+
 """An enumeration."""
 enum ApplicantTypeChoice {
   INDIVIDUAL
@@ -217,7 +245,7 @@ type ApplicationNode implements Node {
   applicationRound: ApplicationRoundNode!
   organisation: OrganisationNode
   contactPerson: PersonNode
-  user: UserNode
+  user: ApplicantNode
   billingAddress: AddressNode
   homeCity: CityNode
   applicationSections(
@@ -2490,42 +2518,30 @@ type ReservationAdjustTimeMutationPayload {
 }
 
 input ReservationApproveMutationInput {
-  pk: Int
-
-  """Additional information for approval."""
+  pk: Int!
+  price: Decimal!
+  priceNet: Decimal!
   handlingDetails: String!
-  price: Float!
-  priceNet: Float!
 }
 
 type ReservationApproveMutationPayload {
   pk: Int
-  state: State
-
-  """Additional information for approval."""
+  price: Decimal
+  priceNet: Decimal
   handlingDetails: String
+  state: State
   handledAt: DateTime
-  price: Float
-  priceNet: Float
 }
 
 input ReservationCancellationMutationInput {
   pk: Int!
-
-  """Primary key for the pre-defined cancel reason."""
-  cancelReasonPk: Int!
-
-  """Additional information for the cancellation."""
+  cancelReason: Int!
   cancelDetails: String
 }
 
 type ReservationCancellationMutationPayload {
   pk: Int
-
-  """Primary key for the pre-defined cancel reason."""
-  cancelReasonPk: Int
-
-  """Additional information for the cancellation."""
+  cancelReason: Int
   cancelDetails: String
   state: State
 }
@@ -2707,25 +2723,17 @@ type ReservationDeleteMutationPayload {
 }
 
 input ReservationDenyMutationInput {
-  pk: Int
-
-  """Additional information for denying."""
-  handlingDetails: String
-
-  """Primary key for the pre-defined deny reason."""
-  denyReasonPk: Int!
+  pk: Int!
+  denyReason: Int!
+  handlingDetails: String!
 }
 
 type ReservationDenyMutationPayload {
   pk: Int
-  state: State
-
-  """Additional information for denying."""
+  denyReason: Int
   handlingDetails: String
+  state: State
   handledAt: DateTime
-
-  """Primary key for the pre-defined deny reason."""
-  denyReasonPk: Int
 }
 
 type ReservationDenyReasonNode implements Node {
@@ -3036,7 +3044,7 @@ type ReservationRefundMutationPayload {
 }
 
 input ReservationRequiresHandlingMutationInput {
-  pk: Int
+  pk: Int!
 }
 
 type ReservationRequiresHandlingMutationPayload {