Merge pull request #14 from eu-digital-green-certificates/feat/refact…

…oring Feat/refactoring
eu-digital-green-certificates · Sep 21, 2021 · 6390e09 · 6390e09
2 parents e1202aa + bf9f12c
commit 6390e09
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 103 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/booking/controller/BookingController.java b/src/main/java/eu/europa/ec/dgc/booking/controller/BookingController.java
@@ -54,7 +54,7 @@ public class BookingController {
     /**
      * Create new Booking in Session.
      * 
-     * @param booking   Data that will be created
+     * @param booking Data that will be created
      * @param dccStatus Dev mode, changing status.
      * @return current Booking object
      */

diff --git a/...main/java/eu/europa/ec/dgc/booking/converter/BookingEntityToBookingResponseConverter.java b/...main/java/eu/europa/ec/dgc/booking/converter/BookingEntityToBookingResponseConverter.java
@@ -56,6 +56,7 @@ private void convertPassangers(final BookingEntity entity, final BookingResponse
                     passengerResponse.setLastname(passengerEntity.getLastname());
                     passengerResponse.setBirthDate(passengerEntity.getBirthDate());
                     passengerResponse.setServiceIdUsed(passengerEntity.getServiceIdUsed());
+                    passengerResponse.setJti(passengerEntity.getJti());
 
                     final DccStatusEntity dccStatusEntity = passengerEntity.getDccStatus();
                     if (dccStatusEntity != null) {
@@ -76,11 +77,11 @@ private void convertDccStatus(final BookingPassengerResponse passengerResponse,
 
         final List<BookingPassengerDccStatusResultResponse> results = dccStatusEntity.getResults().stream()
                 .map(resultEntity -> {
-                    final BookingPassengerDccStatusResultResponse resultResponse = 
+                    final BookingPassengerDccStatusResultResponse resultResponse =
                             new BookingPassengerDccStatusResultResponse();
                     resultResponse.setIdentifier(resultEntity.getIdentifier());
-                    resultResponse.setResult(resultEntity.getResult().name());
-                    resultResponse.setType(resultEntity.getType().getName());
+                    resultResponse.setResult(resultEntity.getResult());
+                    resultResponse.setType(resultEntity.getType());
                     resultResponse.setDetails(resultEntity.getDetails());
                     return resultResponse;
                 }).collect(Collectors.toList());

diff --git a/src/main/java/eu/europa/ec/dgc/booking/dto/BookingRequest.java b/src/main/java/eu/europa/ec/dgc/booking/dto/BookingRequest.java
@@ -20,7 +20,6 @@
 
 package eu.europa.ec.dgc.booking.dto;
 
-import java.time.LocalDate;
 import java.util.UUID;
 import lombok.Data;
 
@@ -33,7 +32,7 @@ public class BookingRequest {
 
     private String lastname;
 
-    private LocalDate birthDate;
+    private String birthDate;
 
     private String bookingReference;
 }
diff --git a/src/main/java/eu/europa/ec/dgc/booking/dto/BookingResponse.java b/src/main/java/eu/europa/ec/dgc/booking/dto/BookingResponse.java
@@ -21,7 +21,6 @@
 package eu.europa.ec.dgc.booking.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,11 +47,14 @@ public static final class BookingPassengerResponse {
 
         private String lastname;
 
-        private LocalDate birthDate;
+        private String birthDate;
 
         private BookingPassengerDccStatusResponse dccStatus;
-        
+
         private String serviceIdUsed;
+
+        // AccessTokenPayload.jti
+        private String jti;
     }
 
     @Data
@@ -89,7 +91,7 @@ public static final class BookingFlightInfoResponse {
         private String to;
 
         private OffsetDateTime time;
-        
+
         @JsonProperty("coa")
         private String countryOfArrival;
 
@@ -107,14 +109,14 @@ public static final class BookingFlightInfoResponse {
 
         @JsonProperty("arrivalTime")
         private OffsetDateTime arrivalTime;
-        
+
         private int type;
-        
+
         private List<String> categories;
-        
+
         @JsonProperty("lang")
         private String language;
-        
+
         private List<String> conditionTypes;
     }
 }
diff --git a/src/main/java/eu/europa/ec/dgc/booking/dto/ResultStatusRequest.java b/src/main/java/eu/europa/ec/dgc/booking/dto/ResultStatusRequest.java
@@ -20,8 +20,6 @@
 
 package eu.europa.ec.dgc.booking.dto;
 
-import eu.europa.ec.dgc.booking.entity.DccStatusResult;
-import eu.europa.ec.dgc.booking.entity.DccStatusType;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
@@ -56,9 +54,9 @@ public static final class ResultStatusDccStatusResultRequest {
 
         private String identifier;
 
-        private DccStatusResult result;
+        private String result;
 
-        private DccStatusType type;
+        private String type;
 
         private String details;
     }

diff --git a/src/main/java/eu/europa/ec/dgc/booking/entity/DccStatusResult.java b/src/main/java/eu/europa/ec/dgc/booking/entity/DccStatusResult.java
diff --git a/src/main/java/eu/europa/ec/dgc/booking/entity/DccStatusResultEntity.java b/src/main/java/eu/europa/ec/dgc/booking/entity/DccStatusResultEntity.java
@@ -31,9 +31,9 @@ public class DccStatusResultEntity {
 
     private String identifier;
 
-    private DccStatusResult result;
+    private String result;
 
-    private DccStatusType type;
+    private String type;
 
     private String details;
 
@@ -45,8 +45,8 @@ public class DccStatusResultEntity {
     public static DccStatusResultEntity open() {
         return DccStatusResultEntity.builder()
                 .identifier("Demo identifier")
-                .result(DccStatusResult.OPEN)
-                .type(DccStatusType.TECHNICAL_CHECK)
+                .result("OPEN")
+                .type("Technical Check")
                 .build();
     }
 
@@ -58,8 +58,8 @@ public static DccStatusResultEntity open() {
     public static DccStatusResultEntity failed() {
         return DccStatusResultEntity.builder()
                 .identifier("Demo identifier")
-                .result(DccStatusResult.FAILED)
-                .type(DccStatusType.ISSUER_INVALIDATION)
+                .result("FAILED")
+                .type("Issuer Invalidation")
                 .build();
     }
 
@@ -71,8 +71,8 @@ public static DccStatusResultEntity failed() {
     public static DccStatusResultEntity passed() {
         return DccStatusResultEntity.builder()
                 .identifier("Demo identifier")
-                .result(DccStatusResult.PASSED)
-                .type(DccStatusType.ACCEPTANCE)
+                .result("PASSED")
+                .type("Destination Acceptance")
                 .build();
     }
 }
diff --git a/src/main/java/eu/europa/ec/dgc/booking/entity/DccStatusType.java b/src/main/java/eu/europa/ec/dgc/booking/entity/DccStatusType.java
diff --git a/src/main/java/eu/europa/ec/dgc/booking/entity/PassengerEntity.java b/src/main/java/eu/europa/ec/dgc/booking/entity/PassengerEntity.java
@@ -23,6 +23,7 @@
 import com.github.javafaker.Faker;
 import eu.europa.ec.dgc.booking.dto.BookingRequest;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.UUID;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -34,6 +35,8 @@
 @EqualsAndHashCode
 public class PassengerEntity {
 
+    private static final DateTimeFormatter BIRTH_DATE_FORMATTER = DateTimeFormatter.ofPattern("MM-dd-yyyy");
+
     private UUID id;
 
     @Setter
@@ -43,17 +46,21 @@ public class PassengerEntity {
     private String lastname;
 
     @Setter
-    private LocalDate birthDate;
+    private String birthDate;
 
     @Setter
     private DccStatusEntity dccStatus;
-    
+
     // service id that was used for the token
     @Setter
     private String serviceIdUsed;
 
+    // AccessTokenPayload.jti
+    private String jti;
+
     public PassengerEntity() {
         this.id = UUID.randomUUID();
+        this.jti = UUID.randomUUID().toString();
     }
 
     /**
@@ -99,17 +106,17 @@ public static PassengerEntity immutable(int pos) {
             entity.id = UUID.fromString("6751B6A6-A31D-44DA-9C0F-ECCCF4F19338");
             entity.setForename("Lionel");
             entity.setLastname("Kuhic");
-            entity.setBirthDate(LocalDate.of(1994, 5, 25));
+            entity.setBirthDate(LocalDate.of(1994, 5, 25).format(BIRTH_DATE_FORMATTER));
         } else if (pos == 1) {
             entity.id = UUID.fromString("B67F6578-08D9-4254-BCB8-4936053865C6");
             entity.setForename("Fidel");
             entity.setLastname("Lang");
-            entity.setBirthDate(LocalDate.of(1978, 8, 14));
+            entity.setBirthDate(LocalDate.of(1978, 8, 14).format(BIRTH_DATE_FORMATTER));
         } else if (pos == 2) {
             entity.id = UUID.fromString("CB992C09-48EC-4C5B-9303-C2DC06E7496D");
             entity.setForename("Demetria");
             entity.setLastname("Hagenes");
-            entity.setBirthDate(LocalDate.of(2002, 4, 25));
+            entity.setBirthDate(LocalDate.of(2002, 4, 25).format(BIRTH_DATE_FORMATTER));
         } else {
             throw new IllegalArgumentException(String.format("Unsupported pos '%s'", pos));
         }