From de85d6ba90d535b3ab326f4c10761c71bf825393 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 6 Jan 2025 17:20:42 +0530
Subject: [PATCH] Done ticket GEPAFINBE-138

---
 .../tendermanagement/dao/VatCheckDao.java     | 51 +++++++++++++------
 .../gepafin/tendermanagement/util/Utils.java  | 19 +++++++
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/VatCheckDao.java b/src/main/java/net/gepafin/tendermanagement/dao/VatCheckDao.java
index 85af1388..4d74fb71 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/VatCheckDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/VatCheckDao.java
@@ -68,25 +68,46 @@ public class VatCheckDao {
             if (response.getStatusCode() == HttpStatus.OK && response.hasBody()) {
                 log.info("Successfully checked vat number");
                 Map<String, Object> responseMap = response.getBody();
-                if (responseMap != null && responseMap.containsKey("data")) {
-                    responseBody = (Map<String, Object>) responseMap.get("data");
-                    responseBody.remove("timestamp_creation");
-                    responseBody.remove("timestamp_last_update");
-                    responseBody.remove("data_iscrizione");
-                    responseBody.remove("id");
-                    Map<String, Object> data = new LinkedHashMap<>();
-                    data.put("data", responseBody);
-                    vatCheckResponseBean.setValid(true);
-                    vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.VALID_VATNUMBER_MSG));
-                    vatCheckResponseBean.setVatCheckResponse(data);
-                }
+                processValidResponse(responseMap, vatCheckResponseBean);
             }
         } catch (FeignException ex) {
-            log.error("Exception occurred while checking vat number: {0}", ex);
-            Utils.callException(ex.status(), ex);
-        }
+                if (ex.status() == 406) {
+                    try {
+                        Map<String, Object> errorResponse = Utils.parseErrorResponse(ex.contentUTF8());
+                        processValidResponse(errorResponse, vatCheckResponseBean);
+                    } catch (Exception parseEx) {
+                        log.error("Failed to parse 406 error response: {0}", parseEx);
+                    }
+                } else {
+                    log.error("Exception occurred while checking vat number: {0}", ex);
+                    Utils.callException(ex.status(), ex);
+                }
+            }
         return vatCheckResponseBean;
     }
+    public static void processValidResponse(Map<String, Object> responseMap, VatCheckResponseBean vatCheckResponseBean) {
+        if (responseMap != null && responseMap.containsKey("data")) {
+            Map<String, Object> responseBody = (Map<String, Object>) responseMap.get("data");
+
+            if (responseBody != null) {
+                responseBody.remove("timestamp_creation");
+                responseBody.remove("timestamp_last_update");
+                responseBody.remove("data_iscrizione");
+                responseBody.remove("id");
+
+                Map<String, Object> data = new LinkedHashMap<>();
+                data.put("data", responseBody);
+
+                vatCheckResponseBean.setValid(true);
+                vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.VALID_VATNUMBER_MSG));
+                vatCheckResponseBean.setVatCheckResponse(data);
+            } else {
+                vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+            }
+        } else {
+            vatCheckResponseBean.setMessage(Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+        }
+    }
 
 	public VatCheckResponseBean checkVatNumber(String vatNumber) {
 		try {
diff --git a/src/main/java/net/gepafin/tendermanagement/util/Utils.java b/src/main/java/net/gepafin/tendermanagement/util/Utils.java
index fb15759f..40f95e3b 100644
--- a/src/main/java/net/gepafin/tendermanagement/util/Utils.java
+++ b/src/main/java/net/gepafin/tendermanagement/util/Utils.java
@@ -24,6 +24,7 @@ import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
@@ -697,4 +698,22 @@ public class Utils {
 	public static String createChannelForUserAndCompany(Long userId, Long companyId) {
 		return GepafinConstant.COMMON_SINGLE_CHANNEL_PREFIX + userId + GepafinConstant.COMPANY_PREFIX + companyId;
 	}
+
+	public static Map<String, Object> parseErrorResponse(String responseBody) {
+		if (StringUtils.isBlank(responseBody)) {
+			return defaultErrorResponse();
+		}
+		try {
+			return mapper.readValue(responseBody, Map.class);
+		} catch (Exception e) {
+			log.error("Failed to parse error response: {}", e.getMessage(), e);
+			return defaultErrorResponse();
+		}
+	}
+
+	private static Map<String, Object> defaultErrorResponse() {
+		return Collections.singletonMap("message", Translator.toLocale(GepafinConstant.INVALID_VATNUMBER));
+	}
+
+
 }
\ No newline at end of file