Update api/src/main/java/fr/gameovergne/api/service/prestashop/PrestashopClient.java

api/src/main/java/fr/gameovergne/api/service/prestashop/PrestashopClient.java

@@ -1,61 +1,72 @@
 // FILE: api/src/main/java/fr/gameovergne/api/service/prestashop/PrestashopClient.java
 package fr.gameovergne.api.service.prestashop;
 
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import java.net.URI;
-
 @Component
 public class PrestashopClient {
 
-    private final RestTemplate restTemplate = new RestTemplate();
-    private final String baseUrl;
-    private final String basicAuth;
+    private static final Logger log = LoggerFactory.getLogger(PrestashopClient.class);
 
-    public PrestashopClient(
-            @Value("${prestashop.base-url}") String baseUrl,
-            @Value("${prestashop.basic-auth}") String basicAuth
-    ) {
-        this.baseUrl = baseUrl;
-        this.basicAuth = basicAuth;
-    }
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    @Value("${prestashop.base-url}")
+    private String baseUrl;
+
+    @Value("${prestashop.basic-auth}")
+    private String basicAuth;
 
     public ResponseEntity<String> get(String path, String query) {
-        UriComponentsBuilder builder = UriComponentsBuilder
-                .fromHttpUrl(baseUrl)
-                .path("/api")
-                .path(path); // ex: /suppliers
+        try {
+            String url = baseUrl + "/api" + path;
 
-        if (query != null && !query.isBlank()) {
-            // On parse la query reçue de l'appel Angular
-            MultiValueMap<String, String> params =
-                    UriComponentsBuilder.newInstance().query(query).build().getQueryParams();
+            UriComponentsBuilder builder = UriComponentsBuilder
+                    .fromHttpUrl(url);
 
-            // On supprime output_format côté Presta : on laisse l'en-tête Accept gérer le JSON
-            params.remove("output_format");
-
-            // On réapplique tous les autres paramètres (display, filter[...], etc.)
-            for (var entry : params.entrySet()) {
-                for (String v : entry.getValue()) {
-                    builder.queryParam(entry.getKey(), v);
-                }
+            if (query != null && !query.isBlank()) {
+                // on réinjecte TELS QUELS les query params venant du front
+                builder.query(query);
             }
+
+            String finalUrl = builder.build(true).toUriString();
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.set("Authorization", basicAuth);
+            headers.setAccept(MediaType.parseMediaTypes("application/json"));
+
+            HttpEntity<Void> entity = new HttpEntity<>(headers);
+
+            log.debug("[Presta] GET {}", finalUrl);
+
+            ResponseEntity<String> response = restTemplate.exchange(
+                    finalUrl,
+                    HttpMethod.GET,
+                    entity,
+                    String.class
+            );
+
+            log.debug("[Presta] status={} body={}", response.getStatusCode(), response.getBody());
+            return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+
+        } catch (HttpStatusCodeException e) {
+            // <-- ICI on garde le vrai status + body de Prestashop
+            log.error("[Presta] HTTP error {} body={}", e.getStatusCode(), e.getResponseBodyAsString());
+            return ResponseEntity
+                    .status(e.getStatusCode())
+                    .body(e.getResponseBodyAsString());
+        } catch (Exception e) {
+            log.error("[Presta] Unexpected error while calling Presta", e);
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body("{\"error\":\"Unexpected error while calling Prestashop\"}");
         }
-
-        URI uri = builder.build(true).toUri(); // true = les valeurs sont déjà encodées si besoin
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Authorization", basicAuth);
-        headers.setAccept(java.util.List.of(MediaType.APPLICATION_JSON));
-
-        HttpEntity<Void> entity = new HttpEntity<>(headers);
-
-        return restTemplate.exchange(uri, HttpMethod.GET, entity, String.class);
     }
 }