Merge pull request #15 from eu-digital-green-certificates/fix/validation

remove validation from result endpoint
eu-digital-green-certificates · Sep 29, 2021 · c0e2c69 · c0e2c69
2 parents b4cb67a + 1e667a8
commit c0e2c69
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/...ava/eu/europa/ec/dgc/booking/converter/ResultStatusRequestToDccStatusEntityConverter.java b/...ava/eu/europa/ec/dgc/booking/converter/ResultStatusRequestToDccStatusEntityConverter.java
@@ -24,6 +24,7 @@
 import eu.europa.ec.dgc.booking.dto.ResultStatusRequest.ResultStatusDccStatusRequest;
 import eu.europa.ec.dgc.booking.dto.ResultStatusRequest.ResultStatusDccStatusResultRequest;
 import eu.europa.ec.dgc.booking.entity.DccStatusEntity;
+import eu.europa.ec.dgc.booking.entity.DccStatusEntity.DccStatusEntityBuilder;
 import eu.europa.ec.dgc.booking.entity.DccStatusResultEntity;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -35,17 +36,22 @@ public class ResultStatusRequestToDccStatusEntityConverter implements Converter<
 
     @Override
     public DccStatusEntity convert(final ResultStatusRequest request) {
+        final DccStatusEntityBuilder builder = DccStatusEntity.builder();
+
         final ResultStatusDccStatusRequest dccStatusRequest = request.getDccStatus();
-        final List<DccStatusResultEntity> results = dccStatusRequest.getResults().stream()
-                .map(this::convertResult)
-                .collect(Collectors.toList());
+        if (dccStatusRequest != null) {
+            builder.issuer(dccStatusRequest.getIssuer())
+                    .iat(dccStatusRequest.getIat())
+                    .sub(dccStatusRequest.getSub());
 
-        return DccStatusEntity.builder()
-                .issuer(dccStatusRequest.getIssuer())
-                .iat(dccStatusRequest.getIat())
-                .sub(dccStatusRequest.getSub())
-                .results(results)
-                .build();
+            if (dccStatusRequest.getResults() != null) {
+                final List<DccStatusResultEntity> results = dccStatusRequest.getResults().stream()
+                        .map(this::convertResult)
+                        .collect(Collectors.toList());
+                builder.results(results);
+            }
+        }
+        return builder.build();
     }
 
     private DccStatusResultEntity convertResult(final ResultStatusDccStatusResultRequest request) {

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
@@ -21,31 +21,24 @@
 package eu.europa.ec.dgc.booking.dto;
 
 import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
 public class ResultStatusRequest {
 
     private String token;
 
-    @Valid
-    @NotNull
     private ResultStatusDccStatusRequest dccStatus;
 
     @Data
     public static final class ResultStatusDccStatusRequest {
 
         private String issuer;
 
-        private long iat;
+        private Long iat;
 
         private String sub;
 
-        @Valid
-        @NotEmpty
         private List<ResultStatusDccStatusResultRequest> results;
     }