add: require adult reservee configuration

- chore: backend type gql changes - remove: requiresIntroduction toggle - add: requiresAdult toggle
City-of-Helsinki · Feb 5, 2025 · bb6b96d · bb6b96d
1 parent 7ded77e
commit bb6b96d
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
@@ -3587,7 +3587,7 @@ export type ReservationUnitCreateMutationInput = {
   publishEnds?: InputMaybe<Scalars["DateTime"]["input"]>;
   purposes?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
   qualifiers?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
-  requireIntroduction?: InputMaybe<Scalars["Boolean"]["input"]>;
+  requireAdultReservee?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireReservationHandling?: InputMaybe<Scalars["Boolean"]["input"]>;
   reservationBegins?: InputMaybe<Scalars["DateTime"]["input"]>;
   reservationBlockWholeDay?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -3662,7 +3662,7 @@ export type ReservationUnitCreateMutationPayload = {
   publishingState?: Maybe<Scalars["String"]["output"]>;
   purposes?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
   qualifiers?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
-  requireIntroduction?: Maybe<Scalars["Boolean"]["output"]>;
+  requireAdultReservee?: Maybe<Scalars["Boolean"]["output"]>;
   requireReservationHandling?: Maybe<Scalars["Boolean"]["output"]>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
   reservationBlockWholeDay?: Maybe<Scalars["Boolean"]["output"]>;
@@ -3801,7 +3801,7 @@ export type ReservationUnitNode = Node & {
   purposes: Array<PurposeNode>;
   qualifiers: Array<QualifierNode>;
   rank: Scalars["Int"]["output"];
-  requireIntroduction: Scalars["Boolean"]["output"];
+  requireAdultReservee: Scalars["Boolean"]["output"];
   requireReservationHandling: Scalars["Boolean"]["output"];
   reservableTimeSpans?: Maybe<Array<Maybe<ReservableTimeSpanType>>>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
@@ -4183,7 +4183,7 @@ export type ReservationUnitUpdateMutationInput = {
   publishEnds?: InputMaybe<Scalars["DateTime"]["input"]>;
   purposes?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
   qualifiers?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
-  requireIntroduction?: InputMaybe<Scalars["Boolean"]["input"]>;
+  requireAdultReservee?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireReservationHandling?: InputMaybe<Scalars["Boolean"]["input"]>;
   reservationBegins?: InputMaybe<Scalars["DateTime"]["input"]>;
   reservationBlockWholeDay?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -4258,7 +4258,7 @@ export type ReservationUnitUpdateMutationPayload = {
   publishingState?: Maybe<Scalars["String"]["output"]>;
   purposes?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
   qualifiers?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
-  requireIntroduction?: Maybe<Scalars["Boolean"]["output"]>;
+  requireAdultReservee?: Maybe<Scalars["Boolean"]["output"]>;
   requireReservationHandling?: Maybe<Scalars["Boolean"]["output"]>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
   reservationBlockWholeDay?: Maybe<Scalars["Boolean"]["output"]>;
@@ -6338,7 +6338,7 @@ export type ReservationUnitEditQuery = {
     isDraft: boolean;
     authentication: Authentication;
     uuid: string;
-    requireIntroduction: boolean;
+    requireAdultReservee: boolean;
     termsOfUseFi?: string | null;
     termsOfUseSv?: string | null;
     termsOfUseEn?: string | null;
@@ -11107,7 +11107,7 @@ export const ReservationUnitEditDocument = gql`
         nameFi
       }
       uuid
-      requireIntroduction
+      requireAdultReservee
       termsOfUseFi
       termsOfUseSv
       termsOfUseEn

diff --git a/apps/admin-ui/src/i18n/messages.ts b/apps/admin-ui/src/i18n/messages.ts
@@ -1486,10 +1486,8 @@ const translations: ITranslations = {
         `Voit määrittää, kuinka monta  voimassaolevaa varausta käyttäjällä voi samanaikaisesti olla tähän varausyksikköön.
       Älä rajoita määrää tarpeettomasti. Väärinkäytösten ehkäisemiseksi suositus max 30/varausyksikkö. `,
       ],
-      introductionSettings: [
-        `Toiminnallisuus ei ole vielä käytössä.
-      Suositus:
-      jätä tyhjäksi`,
+      requireAdultReservee: [
+        "Valinta estää alle 18-vuotiasta tekemästä varausta tai hakemusta. Täysi-ikäisyys vaaditaan varauksen ja hakemuksen tekohetkellä.",
       ],
       handlingSettings: [
         `Voit valita kaikki varaukset käsiteltäviksi ennen hyväksymistä.
@@ -1597,6 +1595,7 @@ const translations: ITranslations = {
     requireReservationHandling: [
       "Haluan käsitellä kaikki varaukset. Varaukset tulee aina käsitellä - hyväksyä tai hylätä -luvatussa ajassa, usein kolmen arkipäivän kuluessa.",
     ],
+    requireAdultReserveeLabel: ["Varaajan on oltava täysi-ikäinen"],
     requireIntroductionLabel: ["Varausyksikkö vaatii pakollisen perehdytyksen"],
     surfaceAreaHelperText: ["Tilojen yhteenlaskettua alaa ei voi pienentää"],
     maxPersonsHelperText: [
@@ -1671,7 +1670,7 @@ const translations: ITranslations = {
     ],
     reservationSettings: ["Varauskalenterin ajastus"],
     handlingSettings: ["Käsittely"],
-    introductionSettings: ["Perehdytys"],
+    requireAdultReserveeSettings: ["Iän tarkistus"],
     bufferSettings: ["Varauksen tauko"],
     cancellationSettings: ["Varauksen peruutus"],
     reservationBegins: ["Avaa varauskalenteri alkaen"],

diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts b/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts
@@ -377,7 +377,7 @@ export const ReservationUnitEditSchema = z
     reservationBeginsTime: z.string(),
     reservationEndsDate: z.string(),
     reservationEndsTime: z.string(),
-    requireIntroduction: z.boolean(),
+    requireAdultReservee: z.boolean(),
     requireReservationHandling: z.boolean(),
     reservationStartInterval: z.nativeEnum(ReservationStartInterval),
     canApplyFreeOfCharge: z.boolean(),
@@ -826,7 +826,7 @@ export function convertReservationUnit(
     reservationEndsTime: data?.reservationEnds
       ? format(new Date(data.reservationEnds), "H:mm")
       : "",
-    requireIntroduction: data?.requireIntroduction ?? false,
+    requireAdultReservee: data?.requireAdultReservee ?? false,
     requireReservationHandling: data?.requireReservationHandling ?? false,
     reservationStartInterval:
       data?.reservationStartInterval ??

diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
@@ -1015,17 +1015,18 @@ function ReservationUnitSettings({
         />
         <CustomNumberInput name="maxReservationsPerUser" min={1} form={form} />
         <FieldGroup
-          heading={t("ReservationUnitEditor.introductionSettings")}
-          tooltip={t("ReservationUnitEditor.tooltip.introductionSettings")}
+          // FIXME replace the text fields
+          heading={t("ReservationUnitEditor.requireAdultReserveeSettings")}
+          tooltip={t("ReservationUnitEditor.tooltip.requireAdultReservee")}
           style={{ gridColumn: "1 / -1" }}
         >
           <Controller
             control={control}
-            name="requireIntroduction"
+            name="requireAdultReservee"
             render={({ field: { value, onChange } }) => (
               <Checkbox
-                id="requireIntroduction"
-                label={t("ReservationUnitEditor.requireIntroductionLabel")}
+                id="requireAdultReservee"
+                label={t("ReservationUnitEditor.requireAdultReserveeLabel")}
                 checked={value}
                 onChange={(e) => onChange(e.target.checked)}
               />

diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx
@@ -54,7 +54,7 @@ export const RESERVATION_UNIT_EDIT_QUERY = gql`
         nameFi
       }
       uuid
-      requireIntroduction
+      requireAdultReservee
       termsOfUseFi
       termsOfUseSv
       termsOfUseEn

diff --git a/apps/ui/gql/gql-types.ts b/apps/ui/gql/gql-types.ts
@@ -3587,7 +3587,7 @@ export type ReservationUnitCreateMutationInput = {
   publishEnds?: InputMaybe<Scalars["DateTime"]["input"]>;
   purposes?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
   qualifiers?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
-  requireIntroduction?: InputMaybe<Scalars["Boolean"]["input"]>;
+  requireAdultReservee?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireReservationHandling?: InputMaybe<Scalars["Boolean"]["input"]>;
   reservationBegins?: InputMaybe<Scalars["DateTime"]["input"]>;
   reservationBlockWholeDay?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -3662,7 +3662,7 @@ export type ReservationUnitCreateMutationPayload = {
   publishingState?: Maybe<Scalars["String"]["output"]>;
   purposes?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
   qualifiers?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
-  requireIntroduction?: Maybe<Scalars["Boolean"]["output"]>;
+  requireAdultReservee?: Maybe<Scalars["Boolean"]["output"]>;
   requireReservationHandling?: Maybe<Scalars["Boolean"]["output"]>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
   reservationBlockWholeDay?: Maybe<Scalars["Boolean"]["output"]>;
@@ -3801,7 +3801,7 @@ export type ReservationUnitNode = Node & {
   purposes: Array<PurposeNode>;
   qualifiers: Array<QualifierNode>;
   rank: Scalars["Int"]["output"];
-  requireIntroduction: Scalars["Boolean"]["output"];
+  requireAdultReservee: Scalars["Boolean"]["output"];
   requireReservationHandling: Scalars["Boolean"]["output"];
   reservableTimeSpans?: Maybe<Array<Maybe<ReservableTimeSpanType>>>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
@@ -4183,7 +4183,7 @@ export type ReservationUnitUpdateMutationInput = {
   publishEnds?: InputMaybe<Scalars["DateTime"]["input"]>;
   purposes?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
   qualifiers?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
-  requireIntroduction?: InputMaybe<Scalars["Boolean"]["input"]>;
+  requireAdultReservee?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireReservationHandling?: InputMaybe<Scalars["Boolean"]["input"]>;
   reservationBegins?: InputMaybe<Scalars["DateTime"]["input"]>;
   reservationBlockWholeDay?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -4258,7 +4258,7 @@ export type ReservationUnitUpdateMutationPayload = {
   publishingState?: Maybe<Scalars["String"]["output"]>;
   purposes?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
   qualifiers?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
-  requireIntroduction?: Maybe<Scalars["Boolean"]["output"]>;
+  requireAdultReservee?: Maybe<Scalars["Boolean"]["output"]>;
   requireReservationHandling?: Maybe<Scalars["Boolean"]["output"]>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
   reservationBlockWholeDay?: Maybe<Scalars["Boolean"]["output"]>;

diff --git a/apps/ui/modules/__tests__/reservation.test.ts b/apps/ui/modules/__tests__/reservation.test.ts
@@ -60,7 +60,7 @@ function createMockReservationUnit({
     images: [],
     isArchived: false,
     isDraft: false,
-    requireIntroduction: false,
+    requireAdultReservee: false,
     reservationKind: ReservationKind.Direct,
     reservationStartInterval: ReservationStartInterval.Interval_15Mins,
     reservationBegins: addDays(new Date(), -1).toISOString(),

diff --git a/apps/ui/modules/__tests__/reservationUnit.test.ts b/apps/ui/modules/__tests__/reservationUnit.test.ts
@@ -998,7 +998,7 @@ describe("isReservationUnitReservable", () => {
       pricings: [],
       purposes: [],
       qualifiers: [],
-      requireIntroduction: false,
+      requireAdultReservee: false,
       requireReservationHandling: false,
       reservationBlockWholeDay: false,
       reservationCancelledInstructions: "",

diff --git a/packages/common/gql/gql-types.ts b/packages/common/gql/gql-types.ts
@@ -3587,7 +3587,7 @@ export type ReservationUnitCreateMutationInput = {
   publishEnds?: InputMaybe<Scalars["DateTime"]["input"]>;
   purposes?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
   qualifiers?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
-  requireIntroduction?: InputMaybe<Scalars["Boolean"]["input"]>;
+  requireAdultReservee?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireReservationHandling?: InputMaybe<Scalars["Boolean"]["input"]>;
   reservationBegins?: InputMaybe<Scalars["DateTime"]["input"]>;
   reservationBlockWholeDay?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -3662,7 +3662,7 @@ export type ReservationUnitCreateMutationPayload = {
   publishingState?: Maybe<Scalars["String"]["output"]>;
   purposes?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
   qualifiers?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
-  requireIntroduction?: Maybe<Scalars["Boolean"]["output"]>;
+  requireAdultReservee?: Maybe<Scalars["Boolean"]["output"]>;
   requireReservationHandling?: Maybe<Scalars["Boolean"]["output"]>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
   reservationBlockWholeDay?: Maybe<Scalars["Boolean"]["output"]>;
@@ -3801,7 +3801,7 @@ export type ReservationUnitNode = Node & {
   purposes: Array<PurposeNode>;
   qualifiers: Array<QualifierNode>;
   rank: Scalars["Int"]["output"];
-  requireIntroduction: Scalars["Boolean"]["output"];
+  requireAdultReservee: Scalars["Boolean"]["output"];
   requireReservationHandling: Scalars["Boolean"]["output"];
   reservableTimeSpans?: Maybe<Array<Maybe<ReservableTimeSpanType>>>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
@@ -4183,7 +4183,7 @@ export type ReservationUnitUpdateMutationInput = {
   publishEnds?: InputMaybe<Scalars["DateTime"]["input"]>;
   purposes?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
   qualifiers?: InputMaybe<Array<InputMaybe<Scalars["Int"]["input"]>>>;
-  requireIntroduction?: InputMaybe<Scalars["Boolean"]["input"]>;
+  requireAdultReservee?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireReservationHandling?: InputMaybe<Scalars["Boolean"]["input"]>;
   reservationBegins?: InputMaybe<Scalars["DateTime"]["input"]>;
   reservationBlockWholeDay?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -4258,7 +4258,7 @@ export type ReservationUnitUpdateMutationPayload = {
   publishingState?: Maybe<Scalars["String"]["output"]>;
   purposes?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
   qualifiers?: Maybe<Array<Maybe<Scalars["Int"]["output"]>>>;
-  requireIntroduction?: Maybe<Scalars["Boolean"]["output"]>;
+  requireAdultReservee?: Maybe<Scalars["Boolean"]["output"]>;
   requireReservationHandling?: Maybe<Scalars["Boolean"]["output"]>;
   reservationBegins?: Maybe<Scalars["DateTime"]["output"]>;
   reservationBlockWholeDay?: Maybe<Scalars["Boolean"]["output"]>;

diff --git a/tilavaraus.graphql b/tilavaraus.graphql
@@ -3923,7 +3923,7 @@ input ReservationUnitCreateMutationInput {
   publishEnds: DateTime
   purposes: [Int]
   qualifiers: [Int]
-  requireIntroduction: Boolean
+  requireAdultReservee: Boolean
   requireReservationHandling: Boolean
   reservationBegins: DateTime
   reservationBlockWholeDay: Boolean
@@ -3998,7 +3998,7 @@ type ReservationUnitCreateMutationPayload {
   publishingState: String
   purposes: [Int]
   qualifiers: [Int]
-  requireIntroduction: Boolean
+  requireAdultReservee: Boolean
   requireReservationHandling: Boolean
   reservationBegins: DateTime
   reservationBlockWholeDay: Boolean
@@ -4189,7 +4189,7 @@ type ReservationUnitNode implements Node {
     pk: [Int]
   ): [QualifierNode!]!
   rank: Int!
-  requireIntroduction: Boolean!
+  requireAdultReservee: Boolean!
   requireReservationHandling: Boolean!
   reservableTimeSpans(
     endDate: Date!
@@ -4555,7 +4555,7 @@ input ReservationUnitUpdateMutationInput {
   publishEnds: DateTime
   purposes: [Int]
   qualifiers: [Int]
-  requireIntroduction: Boolean
+  requireAdultReservee: Boolean
   requireReservationHandling: Boolean
   reservationBegins: DateTime
   reservationBlockWholeDay: Boolean
@@ -4630,7 +4630,7 @@ type ReservationUnitUpdateMutationPayload {
   publishingState: String
   purposes: [Int]
   qualifiers: [Int]
-  requireIntroduction: Boolean
+  requireAdultReservee: Boolean
   requireReservationHandling: Boolean
   reservationBegins: DateTime
   reservationBlockWholeDay: Boolean