From de4b59df313d7b6e0eacb4c38cb248b271b0c38c Mon Sep 17 00:00:00 2001
From: Elarsen14 <eml@kvalitetsit.dk>
Date: Fri, 16 Dec 2022 14:12:21 +0100
Subject: [PATCH] CDAV 24 - added logs

---
 .../controller/CredentialInfoController.java   | 18 ++++++++++++++++--
 .../exception/BadRequestException.java         |  9 ++++++++-
 .../dgws/impl/CredentialServiceImpl.java       |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/CredentialInfoController.java b/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/CredentialInfoController.java
index 84bf5e7..3c85153 100644
--- a/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/CredentialInfoController.java
+++ b/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/CredentialInfoController.java
@@ -4,9 +4,12 @@
 import dk.kvalitetsit.ihexdsapi.dgws.CredentialInfo;
 import dk.kvalitetsit.ihexdsapi.dgws.CredentialService;
 import dk.kvalitetsit.ihexdsapi.dgws.DgwsSecurityException;
+import dk.kvalitetsit.ihexdsapi.utility.ValutGenerator;
 import org.openapitools.api.CredentialsApi;
 import org.openapitools.model.CreateCredentialRequest;
 import org.openapitools.model.CredentialInfoResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -24,10 +27,15 @@ public class CredentialInfoController implements CredentialsApi {
     @Autowired
     private CredentialService credentialService;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(CredentialInfoController.class);
+
+
     @Override
     public ResponseEntity<List<CredentialInfoResponse>> v1CredentialinfoGet(String owner, String type) {
+        LOGGER.info("Owner: " + owner + " Type: " + type);
+
         CredentialInfoResponse.CredentialTypeEnum typeEnum;
-        if (type == null) {
+        if (type == null || type.isEmpty()) {
             typeEnum = null;
         } else if (type.equalsIgnoreCase("HEALTHCAREPROFESSIONAL")) {
             typeEnum = CredentialInfoResponse.CredentialTypeEnum.HEALTHCAREPROFESSIONAL;
@@ -36,10 +44,16 @@ public ResponseEntity<List<CredentialInfoResponse>> v1CredentialinfoGet(String o
         } else {
             throw BadRequestException.createException(BadRequestException.ERROR_CODE.GENERIC, "Bad type query");
         }
+        try {
         List<CredentialInfoResponse> responses = credentialService.populateResponses(owner, typeEnum);
 
         ResponseEntity<List<CredentialInfoResponse>> responseEntity = new ResponseEntity(responses, HttpStatus.OK);
-        return responseEntity;
+        return responseEntity; }
+        catch (Exception e) {
+            LOGGER.error(e.getMessage());
+            throw BadRequestException.createException(BadRequestException.ERROR_CODE.fromInt(1000), e.getMessage());
+
+        }
     }
 
     @Override
diff --git a/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/exception/BadRequestException.java b/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/exception/BadRequestException.java
index 31de26c..4919a67 100644
--- a/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/exception/BadRequestException.java
+++ b/service/src/main/java/dk/kvalitetsit/ihexdsapi/controller/exception/BadRequestException.java
@@ -1,6 +1,9 @@
 package dk.kvalitetsit.ihexdsapi.controller.exception;
 
+import dk.kvalitetsit.ihexdsapi.utility.ValutGenerator;
 import org.openapitools.model.BasicError;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
@@ -19,8 +22,11 @@ public enum ERROR_CODE {
 
     private final int errorCode;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(BadRequestException.class);
 
-    ERROR_CODE(int errorCode) {
+
+
+        ERROR_CODE(int errorCode) {
         this.errorCode = errorCode;
     }
         private final static Map<Integer, ERROR_CODE> intToMap = new HashMap<>();
@@ -56,6 +62,7 @@ public static BadRequestException createException(ERROR_CODE errorCode, String e
         error.setTimestamp(OffsetDateTime.now());
         error.setErrorCode(errorCode.errorCode);
 
+
         return new BadRequestException(error);
     } public static BadRequestException createException(ERROR_CODE errorCode, String errorMessage, List<String> errors) {
         var error = new BasicError();
diff --git a/service/src/main/java/dk/kvalitetsit/ihexdsapi/dgws/impl/CredentialServiceImpl.java b/service/src/main/java/dk/kvalitetsit/ihexdsapi/dgws/impl/CredentialServiceImpl.java
index 4eaf55d..2848d68 100644
--- a/service/src/main/java/dk/kvalitetsit/ihexdsapi/dgws/impl/CredentialServiceImpl.java
+++ b/service/src/main/java/dk/kvalitetsit/ihexdsapi/dgws/impl/CredentialServiceImpl.java
@@ -178,7 +178,7 @@ public List<CredentialInfoResponse> populateResponses(String owner, CredentialIn
 
             }
         }
-
+        LOGGER.info(responses.toString());
         return responses;
     }