VKT(Backend&Frontend): Fixup: bring back optional text description fo…

…r previous enrollment [deploy]
Opetushallitus · Dec 2, 2024 · 966c4d1 · 966c4d1
1 parent 5d74222
commit 966c4d1
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 4 deletions.
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/api/dto/examiner/ExaminerEnrollmentAppointmentDTO.java b/backend/vkt/src/main/java/fi/oph/vkt/api/dto/examiner/ExaminerEnrollmentAppointmentDTO.java
@@ -23,6 +23,7 @@ public record ExaminerEnrollmentAppointmentDTO(
   @NonNull @NotNull Boolean writingPartialExam,
   @NonNull @NotNull Boolean readingComprehensionPartialExam,
   @NonNull @NotNull EnrollmentAppointmentStatus status,
+  @NonNull @NotNull Boolean hasPreviousEnrollment,
   String previousEnrollment,
   @NonNull @NotBlank String email,
   String phoneNumber,

diff --git a/...vkt/src/main/java/fi/oph/vkt/api/dto/examiner/ExaminerEnrollmentAppointmentUpdateDTO.java b/...vkt/src/main/java/fi/oph/vkt/api/dto/examiner/ExaminerEnrollmentAppointmentUpdateDTO.java
@@ -21,6 +21,7 @@ public record ExaminerEnrollmentAppointmentUpdateDTO(
   @NonNull @NotNull Boolean speechComprehensionPartialExam,
   @NonNull @NotNull Boolean writingPartialExam,
   @NonNull @NotNull Boolean readingComprehensionPartialExam,
+  @NonNull @NotNull Boolean hasPreviousEnrollment,
   String previousEnrollment,
   @NonNull @NotBlank String email,
   @NonNull @NotBlank String firstName,

diff --git a/backend/vkt/src/main/java/fi/oph/vkt/model/EnrollmentAppointment.java b/backend/vkt/src/main/java/fi/oph/vkt/model/EnrollmentAppointment.java
@@ -69,6 +69,9 @@ public class EnrollmentAppointment extends EnrollmentCommon {
   @Column(name = "has_previous_enrollment", nullable = false)
   private boolean hasPreviousEnrollment;
 
+  @Column(name = "previous_enrollment")
+  private String previousEnrollment;
+
   @Column(name = "message")
   private String message;
 

diff --git a/backend/vkt/src/main/java/fi/oph/vkt/util/ClerkEnrollmentUtil.java b/backend/vkt/src/main/java/fi/oph/vkt/util/ClerkEnrollmentUtil.java
@@ -213,6 +213,8 @@ public static ExaminerEnrollmentAppointmentDTO createClerkEnrollmentAppointmentD
       .paymentLinkUrl(paymentLinkUrl)
       .examEvent(examinerExamEventDTO)
       .payments(paymentDTOs)
+      .hasPreviousEnrollment(enrollmentAppointment.isHasPreviousEnrollment())
+      .previousEnrollment(enrollmentAppointment.getPreviousEnrollment())
       .build();
   }
 

diff --git a/backend/vkt/src/main/resources/db/changelog/db.changelog-1.0.xml b/backend/vkt/src/main/resources/db/changelog/db.changelog-1.0.xml
@@ -1185,6 +1185,5 @@
             UPDATE enrollment_appointment SET has_previous_enrollment = (previous_enrollment IS NOT NULL);
         </sql>
         <addNotNullConstraint tableName="enrollment_appointment" columnName="has_previous_enrollment" />
-        <dropColumn tableName="enrollment_appointment" columnName="previous_enrollment" />
     </changeSet>
 </databaseChangeLog>
diff --git a/frontend/packages/vkt/src/interfaces/clerkEnrollment.ts b/frontend/packages/vkt/src/interfaces/clerkEnrollment.ts
@@ -118,6 +118,7 @@ export interface ClerkEnrollmentAppointment
   authLink?: ClerkAuthLink;
   paymentLinkUrl?: string;
   examEvent?: ExaminerExamEvent;
+  previousEnrollment?: string;
 }
 
 export interface ClerkEnrollmentAppointmentResponse

diff --git a/frontend/packages/vkt/src/redux/reducers/publicEnrollmentAppointment.ts b/frontend/packages/vkt/src/redux/reducers/publicEnrollmentAppointment.ts
@@ -37,7 +37,6 @@ const initialState: PublicEnrollmentAppointmentState = {
     country: '',
     id: undefined,
     hasPreviousEnrollment: undefined,
-    previousEnrollment: '',
     privacyStatementConfirmation: false,
     status: undefined,
     person: undefined,

diff --git a/frontend/packages/vkt/src/redux/reducers/publicEnrollmentContact.ts b/frontend/packages/vkt/src/redux/reducers/publicEnrollmentContact.ts
@@ -30,7 +30,6 @@ export const initialState: PublicEnrollmentContactState = {
     isFullExam: undefined,
     id: 1,
     hasPreviousEnrollment: undefined,
-    previousEnrollment: '',
     privacyStatementConfirmation: false,
     status: undefined,
     message: '',

diff --git a/frontend/packages/vkt/src/utils/serialization.ts b/frontend/packages/vkt/src/utils/serialization.ts
@@ -85,7 +85,6 @@ export class SerializationUtils {
     return {
       ...enrollment,
       emailConfirmation: '',
-      hasPreviousEnrollment: !!enrollment.previousEnrollment,
       privacyStatementConfirmation: false,
       examEvent: SerializationUtils.deserializePublicExaminerExamEvent(
         enrollment.examEvent,