Merge pull request #105 from SakanaIsReal/feature/docker/cicd-round-2

Feature/docker/cicd round 2

Author: SakanaIsReal

backend/src/main/java/com/smartsplit/smartsplitback/service/FileStorageService.java

@@ -3,7 +3,6 @@
 import com.smartsplit.smartsplitback.model.StoredFile;
 import com.smartsplit.smartsplitback.repository.StoredFileRepository;
 import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -53,7 +52,7 @@ public String save(MultipartFile file, String folder, String preferredFileName,
             sf.setDataUrl(dataUrl);
 
             repo.save(sf);
-            return buildPublicUrl(req, sf.getId());
+            return buildPublicUrl(sf.getId());
         } catch (Exception e) {
             throw new RuntimeException("Cannot store file as base64: " + e.getMessage(), e);
         }
@@ -87,15 +86,8 @@ public boolean deleteByUrl(String publicUrl) {
         }
     }
 
-    private String buildPublicUrl(HttpServletRequest req, Long id) {
-        var serverReq = new ServletServerHttpRequest(req);
-        var uri = serverReq.getURI();
-        String scheme = uri.getScheme();
-        String host = uri.getHost();
-        int port = uri.getPort();
-        String portPart = (port == -1 || ("http".equals(scheme) && port == 80) || ("https".equals(scheme) && port == 443))
-                ? "" : ":" + port;
-        return scheme + "://" + host + portPart + "/api/files/" + id;
+    private String buildPublicUrl(Long id) {
+        return "/files/" + id;
     }
 
     private String getExtension(String name) {

backend/src/test/java/com/smartsplit/smartsplitback/service/FileStorageServiceTest.java

@@ -72,7 +72,7 @@ void save_withExplicitContentType_buildsDataUrl_andReturnsPublicFilesId() throws
 
             String url = service.save(f, "my group", "receipt_1", req("http","localhost",80,"/upload"));
 
-            assertThat(url).isEqualTo("http://localhost/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
 
             ArgumentCaptor<StoredFile> cap = ArgumentCaptor.forClass(StoredFile.class);
             verify(repo).save(cap.capture());
@@ -95,7 +95,7 @@ void save_withoutContentType_derivesFromExtension_caseInsensitive() throws Excep
 
             String url = service.save(f, "img", "hero", req("http","localhost",80,"/upload"));
 
-            assertThat(url).isEqualTo("http://localhost/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
 
             ArgumentCaptor<StoredFile> cap = ArgumentCaptor.forClass(StoredFile.class);
             verify(repo).save(cap.capture());
@@ -112,7 +112,7 @@ void save_noOriginalFilename_andNoContentType_usesOctetStream_andNoExt() throws
 
             String url = service.save(f, "misc-folder", "blob", req("http","localhost",80,"/upload"));
 
-            assertThat(url).isEqualTo("http://localhost/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
 
             ArgumentCaptor<StoredFile> cap = ArgumentCaptor.forClass(StoredFile.class);
             verify(repo).save(cap.capture());
@@ -130,7 +130,7 @@ void save_preferredBlank_usesOriginalFilename() throws Exception {
 
             String url = service.save(f, "docs", "   ", req("http","localhost",80,"/upload"));
 
-            assertThat(url).isEqualTo("http://localhost/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
 
             ArgumentCaptor<StoredFile> cap = ArgumentCaptor.forClass(StoredFile.class);
             verify(repo).save(cap.capture());
@@ -163,7 +163,7 @@ void save_httpsCustomPort_reflectedInPublicUrl() throws Exception {
 
             String url = service.save(f, "shots", "sc1", req("https","cdn.example.com",4443,"/upload"));
 
-            assertThat(url).isEqualTo("https://cdn.example.com:4443/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
         }
 
         @Test
@@ -172,7 +172,7 @@ void save_httpDefaultPort_omitsPortInUrl() throws Exception {
 
             String url = service.save(f, "imgs", "a", req("http","localhost",80,"/upload"));
 
-            assertThat(url).isEqualTo("http://localhost/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
         }
 
         @Test
@@ -181,7 +181,7 @@ void save_httpsDefaultPort_omitsPortInUrl() throws Exception {
 
             String url = service.save(f, "imgs", "a", req("https","example.com",443,"/upload"));
 
-            assertThat(url).isEqualTo("https://example.com/api/files/123");
+            assertThat(url).isEqualTo("/files/123");
         }
     }