Add guardian phone number to occurrence child list

tuomas777 · tuomas777 · commit bd4f308cc1b1 · 2021-11-23T10:04:45.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Added
 
 - Error page for authentication
+- Guardian phone number to occurrence show view enrolments list
 
 ### Fixed
 
diff --git a/src/api/generatedTypes/Child.ts b/src/api/generatedTypes/Child.ts
@@ -94,9 +94,6 @@ export interface Child_child {
 }
 
 export interface Child {
-  /**
-   * The ID of the object
-   */
   child: Child_child | null;
 }
 
diff --git a/src/api/generatedTypes/Event.ts b/src/api/generatedTypes/Event.ts
@@ -85,9 +85,6 @@ export interface Event_event {
 }
 
 export interface Event {
-  /**
-   * The ID of the object
-   */
   event: Event_event | null;
 }
 
diff --git a/src/api/generatedTypes/EventGroup.ts b/src/api/generatedTypes/EventGroup.ts
@@ -94,9 +94,6 @@ export interface EventGroup_eventGroup {
 }
 
 export interface EventGroup {
-  /**
-   * The ID of the object
-   */
   eventGroup: EventGroup_eventGroup | null;
 }
 
diff --git a/src/api/generatedTypes/Message.ts b/src/api/generatedTypes/Message.ts
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { RecipientSelectionEnum, LanguageTranslationLanguageCode } from "./globalTypes";
+import { RecipientSelectionEnum, MessageTranslationLanguageCode } from "./globalTypes";
 
 // ====================================================
 // GraphQL query operation: Message
@@ -18,7 +18,7 @@ export interface Message_message_event {
 }
 
 export interface Message_message_translations {
-  languageCode: LanguageTranslationLanguageCode;
+  languageCode: MessageTranslationLanguageCode;
   subject: string;
   bodyText: string;
 }
@@ -61,9 +61,6 @@ export interface Message_message {
 }
 
 export interface Message {
-  /**
-   * The ID of the object
-   */
   message: Message_message | null;
 }
 
diff --git a/src/api/generatedTypes/MessageFragment.ts b/src/api/generatedTypes/MessageFragment.ts
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { RecipientSelectionEnum, LanguageTranslationLanguageCode } from "./globalTypes";
+import { RecipientSelectionEnum, MessageTranslationLanguageCode } from "./globalTypes";
 
 // ====================================================
 // GraphQL fragment: MessageFragment
@@ -18,7 +18,7 @@ export interface MessageFragment_event {
 }
 
 export interface MessageFragment_translations {
-  languageCode: LanguageTranslationLanguageCode;
+  languageCode: MessageTranslationLanguageCode;
   subject: string;
   bodyText: string;
 }
diff --git a/src/api/generatedTypes/Messages.ts b/src/api/generatedTypes/Messages.ts
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { RecipientSelectionEnum, LanguageTranslationLanguageCode } from "./globalTypes";
+import { RecipientSelectionEnum, MessageTranslationLanguageCode } from "./globalTypes";
 
 // ====================================================
 // GraphQL query operation: Messages
@@ -18,7 +18,7 @@ export interface Messages_messages_edges_node_event {
 }
 
 export interface Messages_messages_edges_node_translations {
-  languageCode: LanguageTranslationLanguageCode;
+  languageCode: MessageTranslationLanguageCode;
   subject: string;
   bodyText: string;
 }
diff --git a/src/api/generatedTypes/Occurrence.ts b/src/api/generatedTypes/Occurrence.ts
@@ -57,6 +57,7 @@ export interface Occurrence_occurrence_enrolments_edges_node_child_guardians_edg
   firstName: string;
   lastName: string;
   language: Language;
+  phoneNumber: string;
 }
 
 export interface Occurrence_occurrence_enrolments_edges_node_child_guardians_edges {
@@ -155,9 +156,6 @@ export interface Occurrence_occurrence {
 }
 
 export interface Occurrence {
-  /**
-   * The ID of the object
-   */
   occurrence: Occurrence_occurrence | null;
 }
 
diff --git a/src/api/generatedTypes/OccurrenceFragment.ts b/src/api/generatedTypes/OccurrenceFragment.ts
@@ -57,6 +57,7 @@ export interface OccurrenceFragment_enrolments_edges_node_child_guardians_edges_
   firstName: string;
   lastName: string;
   language: Language;
+  phoneNumber: string;
 }
 
 export interface OccurrenceFragment_enrolments_edges_node_child_guardians_edges {
diff --git a/src/api/generatedTypes/Occurrences.ts b/src/api/generatedTypes/Occurrences.ts
@@ -57,6 +57,7 @@ export interface Occurrences_occurrences_edges_node_enrolments_edges_node_child_
   firstName: string;
   lastName: string;
   language: Language;
+  phoneNumber: string;
 }
 
 export interface Occurrences_occurrences_edges_node_enrolments_edges_node_child_guardians_edges {
diff --git a/src/api/generatedTypes/Project.ts b/src/api/generatedTypes/Project.ts
@@ -28,9 +28,6 @@ export interface Project_project {
 }
 
 export interface Project {
-  /**
-   * The ID of the object
-   */
   project: Project_project | null;
 }
 
diff --git a/src/api/generatedTypes/Venue.ts b/src/api/generatedTypes/Venue.ts
@@ -45,9 +45,6 @@ export interface Venue_venue {
 }
 
 export interface Venue {
-  /**
-   * The ID of the object
-   */
   venue: Venue_venue | null;
 }
 
diff --git a/src/api/generatedTypes/globalTypes.ts b/src/api/generatedTypes/globalTypes.ts
@@ -25,7 +25,7 @@ export enum Language {
 /**
  * An enumeration.
  */
-export enum LanguageTranslationLanguageCode {
+export enum MessageTranslationLanguageCode {
   EN = "EN",
   FI = "FI",
   SV = "SV",
diff --git a/src/domain/occurrences/Guardian.ts b/src/domain/occurrences/Guardian.ts
@@ -4,6 +4,7 @@ type GuardianType = {
   firstName: string | null;
   lastName: string | null;
   language: string | null;
+  phoneNumber: string;
 };
 
 class Guardian {
@@ -20,6 +21,10 @@ class Guardian {
   get language() {
     return i18nProvider.translate(`languages.${this.guardian.language}`);
   }
+
+  get phoneNumber() {
+    return this.guardian.phoneNumber;
+  }
 }
 
 export default Guardian;
diff --git a/src/domain/occurrences/OccurrenceShow.tsx b/src/domain/occurrences/OccurrenceShow.tsx
@@ -88,6 +88,9 @@ export const getGuardianFullName = (guardian: GuardianType) =>
 export const getGuardianLanguage = (guardian: GuardianType) =>
   new Guardian(guardian).language;
 
+export const getGuardianPhoneNumber = (guardian: GuardianType) =>
+  new Guardian(guardian).phoneNumber;
+
 export const getBreadCrumbs = (record?: Record) =>
   new Occurrence(record as OccurrenceType).breadcrumbs;
 
@@ -191,6 +194,15 @@ const OccurrenceShow = (props: any) => {
                 label="children.fields.guardians.fields.email.label"
                 emptyText={translate('guardian.doesNotExist')}
               />
+              <FunctionField
+                render={withEnrolment(
+                  withGuardian(getGuardianPhoneNumber, () =>
+                    translate('guardian.doesNotExist')
+                  ),
+                  () => null
+                )}
+                label="children.fields.guardians.fields.phoneNumber.label"
+              />
               <FunctionField
                 render={withEnrolment(
                   withGuardian(getGuardianLanguage, () =>
diff --git a/src/domain/occurrences/__tests__/OccurrenceShow.test.jsx b/src/domain/occurrences/__tests__/OccurrenceShow.test.jsx
@@ -6,6 +6,7 @@ import OccurrenceShow, {
   withGuardian,
   getGuardianFullName,
   getGuardianLanguage,
+  getGuardianPhoneNumber,
   getBreadCrumbs,
   getTitle,
   getChildFullName,
@@ -18,6 +19,7 @@ describe('OccurrenceShow utils', () => {
     firstName: 'Leo',
     lastName: 'Garri',
     language: 'FI',
+    phoneNumber: '555-1234567',
   };
   const enrollment = {
     node: {
@@ -120,4 +122,12 @@ describe('OccurrenceShow utils', () => {
       expect(getGuardianLanguage(guardian)).toMatchInlineSnapshot(`"suomi"`);
     });
   });
+
+  describe('getGuardianPhoneNumber', () => {
+    it('should return the phone number of the guardian', () => {
+      expect(getGuardianPhoneNumber(guardian)).toMatchInlineSnapshot(
+        `"555-1234567"`
+      );
+    });
+  });
 });
diff --git a/src/domain/occurrences/queries/OccurrenceQueries.ts b/src/domain/occurrences/queries/OccurrenceQueries.ts
@@ -44,6 +44,7 @@ const OccurrenceShowPage = {
                       firstName
                       lastName
                       language
+                      phoneNumber
                     }
                   }
                 }

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,6 @@ export interface Child_child {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`export interface Child {`
`97`		`- /**`
`98`		`- * The ID of the object`
`99`		`- */`
`100`	`97`	`child: Child_child \| null;`
`101`	`98`	`}`
`102`	`99`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,6 @@ export interface Event_event {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`export interface Event {`
`88`		`- /**`
`89`		`- * The ID of the object`
`90`		`- */`
`91`	`88`	`event: Event_event \| null;`
`92`	`89`	`}`
`93`	`90`
Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,6 @@ export interface EventGroup_eventGroup {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`export interface EventGroup {`
`97`		`- /**`
`98`		`- * The ID of the object`
`99`		`- */`
`100`	`97`	`eventGroup: EventGroup_eventGroup \| null;`
`101`	`98`	`}`
`102`	`99`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// @generated`
`4`	`4`	`// This file was automatically generated and should not be edited.`
`5`	`5`
`6`		`-import { RecipientSelectionEnum, LanguageTranslationLanguageCode } from "./globalTypes";`
	`6`	`+import { RecipientSelectionEnum, MessageTranslationLanguageCode } from "./globalTypes";`
`7`	`7`
`8`	`8`	`// ====================================================`
`9`	`9`	`// GraphQL query operation: Message`
`@@ -18,7 +18,7 @@ export interface Message_message_event {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`export interface Message_message_translations {`
`21`		`- languageCode: LanguageTranslationLanguageCode;`
	`21`	`+ languageCode: MessageTranslationLanguageCode;`
`22`	`22`	`subject: string;`
`23`	`23`	`bodyText: string;`
`24`	`24`	`}`
`@@ -61,9 +61,6 @@ export interface Message_message {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`export interface Message {`
`64`		`- /**`
`65`		`- * The ID of the object`
`66`		`- */`
`67`	`64`	`message: Message_message \| null;`
`68`	`65`	`}`
`69`	`66`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ export interface Occurrence_occurrence_enrolments_edges_node_child_guardians_edg`
`57`	`57`	`firstName: string;`
`58`	`58`	`lastName: string;`
`59`	`59`	`language: Language;`
	`60`	`+ phoneNumber: string;`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`export interface Occurrence_occurrence_enrolments_edges_node_child_guardians_edges {`
`@@ -155,9 +156,6 @@ export interface Occurrence_occurrence {`
`155`	`156`	`}`
`156`	`157`
`157`	`158`	`export interface Occurrence {`
`158`		`- /**`
`159`		`- * The ID of the object`
`160`		`- */`
`161`	`159`	`occurrence: Occurrence_occurrence \| null;`
`162`	`160`	`}`
`163`	`161`