VKT(Backend&Frontend): Better align data shown on ExaminerContactRequ…

…estListing with designs [deploy]
Opetushallitus · Dec 30, 2024 · 61c2548 · 61c2548
1 parent 4b255c2
commit 61c2548
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 8 deletions.
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/api/dto/examiner/ExaminerContactRequestDTO.java b/backend/vkt/src/main/java/fi/oph/vkt/api/dto/examiner/ExaminerContactRequestDTO.java
@@ -1,9 +1,14 @@
 package fi.oph.vkt.api.dto.examiner;
 
-import jakarta.validation.constraints.NotEmpty;
-import java.util.List;
+import java.time.LocalDate;
 import lombok.Builder;
 import lombok.NonNull;
 
 @Builder
-public record ExaminerContactRequestDTO(@NonNull Long id, @NonNull String lastName, @NonNull String firstName) {}
+public record ExaminerContactRequestDTO(
+  @NonNull Long id,
+  @NonNull String lastName,
+  @NonNull String firstName,
+  @NonNull String email,
+  @NonNull LocalDate contactDate
+) {}
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/util/ExaminerUtil.java b/backend/vkt/src/main/java/fi/oph/vkt/util/ExaminerUtil.java
@@ -26,6 +26,8 @@ public static ExaminerContactRequestDTO toContactRequestDTO(final EnrollmentAppo
       .id(enrollmentAppointment.getId())
       .firstName(enrollmentAppointment.getFirstName())
       .lastName(enrollmentAppointment.getLastName())
+      .email(enrollmentAppointment.getEmail())
+      .contactDate(enrollmentAppointment.getCreatedAt().toLocalDate())
       .build();
   }
 

diff --git a/frontend/packages/vkt/public/i18n/fi-FI/examiner.json b/frontend/packages/vkt/public/i18n/fi-FI/examiner.json
@@ -16,8 +16,10 @@
         "actions": "Toiminnot",
         "contactRequest": "Yhteydenottopyyntö",
         "contactFields": "Yhteystiedot",
+        "contactDate": "Yhteydenottopäivä",
         "lastName": "Sukunimi",
         "firstName": "Etunimi",
+        "requesterName": "Lähettäjän nimi",
         "email": "Sähköpostiosoite",
         "examination": "Tutkinto",
         "phoneNumber": "Puhelinnumero",

diff --git a/...d/packages/vkt/src/components/examinerExamEvent/listing/ExaminerContactRequestListing.tsx b/...d/packages/vkt/src/components/examinerExamEvent/listing/ExaminerContactRequestListing.tsx
@@ -3,6 +3,7 @@ import { TableCell, TableHead, TableRow } from '@mui/material';
 import { useParams } from 'react-router';
 import { CustomButtonLink, CustomTable, Text } from 'shared/components';
 import { Color, Variant } from 'shared/enums';
+import { DateUtils } from 'shared/utils';
 
 import { useExaminerTranslation } from 'configs/i18n';
 import { useAppSelector } from 'configs/redux';
@@ -18,8 +19,9 @@ const ExaminerExamEventListingHeader = () => {
   return (
     <TableHead className="heading-text">
       <TableRow>
-        <TableCell>{t('firstName')}</TableCell>
-        <TableCell>{t('lastName')}</TableCell>
+        <TableCell>{t('requesterName')}</TableCell>
+        <TableCell>{t('email')}</TableCell>
+        <TableCell>{t('contactDate')}</TableCell>
         <TableCell>{t('actions')}</TableCell>
       </TableRow>
     </TableHead>
@@ -40,10 +42,13 @@ const ExaminerContactRequestListingRow = ({
   return (
     <TableRow>
       <TableCell>
-        <Text>{contactRequest.firstName}</Text>
+        <Text>{`${contactRequest.firstName} ${contactRequest.lastName}`}</Text>
       </TableCell>
       <TableCell>
-        <Text>{contactRequest.lastName}</Text>
+        <Text>{contactRequest.email}</Text>
+      </TableCell>
+      <TableCell>
+        <Text>{DateUtils.formatOptionalDate(contactRequest.contactDate)}</Text>
       </TableCell>
       <TableCell>
         <CustomButtonLink

diff --git a/frontend/packages/vkt/src/interfaces/examinerDetails.ts b/frontend/packages/vkt/src/interfaces/examinerDetails.ts
@@ -1,3 +1,4 @@
+import { Dayjs } from 'dayjs';
 import { APIResponseStatus } from 'shared/enums';
 import { WithId } from 'shared/interfaces';
 
@@ -23,6 +24,13 @@ export interface ContactRequest extends WithId {
   id: number;
   firstName: string;
   lastName: string;
+  email: string;
+  contactDate: Dayjs;
+}
+
+export interface ContactRequestResponse
+  extends Omit<ContactRequest, 'contactDate'> {
+  contactDate: string;
 }
 
 export interface ExaminerDetails extends WithId {
@@ -40,8 +48,9 @@ export interface ExaminerDetails extends WithId {
 }
 
 export interface ExaminerDetailsResponse
-  extends Omit<ExaminerDetails, 'examEvents'> {
+  extends Omit<ExaminerDetails, 'examEvents' | 'contactRequests'> {
   examEvents: Array<ExaminerExamEventResponse>;
+  contactRequests: Array<ContactRequestResponse>;
 }
 
 export type ExaminerDetailsInit = Pick<

diff --git a/frontend/packages/vkt/src/utils/serialization.ts b/frontend/packages/vkt/src/utils/serialization.ts
@@ -24,6 +24,8 @@ import {
   ClerkListExamEventResponse,
 } from 'interfaces/clerkListExamEvent';
 import {
+  ContactRequest,
+  ContactRequestResponse,
   ExaminerDetails,
   ExaminerDetailsResponse,
 } from 'interfaces/examinerDetails';
@@ -347,6 +349,15 @@ export class SerializationUtils {
     };
   }
 
+  static deserializeContactRequest(
+    contactRequest: ContactRequestResponse,
+  ): ContactRequest {
+    return {
+      ...contactRequest,
+      contactDate: dayjs(contactRequest.contactDate),
+    };
+  }
+
   static deserializeExaminerDetails(
     examinerDetails: ExaminerDetailsResponse,
   ): ExaminerDetails {
@@ -355,6 +366,9 @@ export class SerializationUtils {
       examEvents: examinerDetails.examEvents.map(
         SerializationUtils.deserializeExaminerExamEvent,
       ),
+      contactRequests: examinerDetails.contactRequests.map(
+        SerializationUtils.deserializeContactRequest,
+      ),
     };
   }
 }