WIP for images

Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:21
 
-COPY target/ArtisanConnectBackend-0.0.1-SNAPSHOT.jar app.jar
+WORKDIR /app
 
-ENTRYPOINT ["java","-jar","/app.jar"]
+COPY target/ArtisanConnectBackend-0.0.1-SNAPSHOT.jar app/artisan.jar
+
+ENTRYPOINT ["java","-jar","app/artisan.jar"]

compose.yaml

@@ -2,10 +2,13 @@ services:
   app:
     container_name: artisan
     build: .
-    networks:
-      - artisan_network
     depends_on:
       - db
+    networks:
+      - artisan_network
+    ports:
+        - '8085:8080'
+
 
   db:
     container_name: db

src/main/java/_11/asktpk/artisanconnectbackend/ArtisanConnectBackendApplication.java

@@ -1,13 +1,27 @@
 package _11.asktpk.artisanconnectbackend;
 
+import jakarta.annotation.PostConstruct;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.core.env.Environment;
 
 @SpringBootApplication
 public class ArtisanConnectBackendApplication {
 
+    private final Environment environment;
+
+    public ArtisanConnectBackendApplication(Environment environment) {
+        this.environment = environment;
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(ArtisanConnectBackendApplication.class, args);
     }
 
+    @PostConstruct
+    public void logDataSourceUrl() {
+        System.out.println("Datasource URL: " + environment.getProperty("spring.datasource.url"));
+    }
 }
+
+

src/main/java/_11/asktpk/artisanconnectbackend/controller/NoticeController.java

@@ -1,14 +1,17 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
 import _11.asktpk.artisanconnectbackend.service.ClientService;
+import _11.asktpk.artisanconnectbackend.service.ImageService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
 import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
 import jakarta.persistence.EntityNotFoundException;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -20,10 +23,12 @@ import java.util.List;
 public class NoticeController {
     private final NoticeService noticeService;
     private final ClientService clientService;
+    private final ImageService imageService;
 
-    public NoticeController(NoticeService noticeService, ClientService clientService) {
+    public NoticeController(NoticeService noticeService, ClientService clientService, ImageService imageService) {
         this.noticeService = noticeService;
         this.clientService = clientService;
+        this.imageService = imageService;
     }
 
     @GetMapping("/get/all")
@@ -110,12 +115,16 @@ public class NoticeController {
 
     @PostMapping("/upload/{id}")
     public ResponseEntity<String> uploadImage(@PathVariable("id") Long id, @RequestParam("file") MultipartFile file) {
+        if (file.isEmpty()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Nie przesłano pliku.");
+        }
+
         if (!noticeService.noticeExists(id)) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Nie znaleziono ogłoszenia o ID: " + id);
         }
 
         try {
-            String filePath = noticeService.saveImage(id, file);
+            String filePath = noticeService.saveImage("./app/images/notices/", id, file);
             return ResponseEntity.ok("Zdjęcie zapisane pod ścieżką: " + filePath);
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Błąd podczas zapisywania zdjęcia: " + e.getMessage());
@@ -123,37 +132,56 @@ public class NoticeController {
     }
 
 
-    @GetMapping("/images/{id}")
+    @GetMapping("/images/{noticeId}/{imageIndex}")
-    public ResponseEntity<List<String>> getAllImages(@PathVariable("id") Long id) {
+    public ResponseEntity<byte[]> getImage(@PathVariable Long noticeId, @PathVariable Integer imageIndex) {
         try {
-            Path directoryPath = Paths.get("src/main/resources/static/images/notices/" + id);
+            if (!noticeService.noticeExists(noticeId)) {
-            if (!Files.exists(directoryPath) || !Files.isDirectory(directoryPath)) {
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
-                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
             }
 
-            List<String> imagePaths = new ArrayList<>();
+            NoticeDTO notice = noticeService.getNoticeById(noticeId);
-            Files.list(directoryPath).forEach(file -> {
+            List<String> imagePaths = notice.getImages();
-                if (Files.isRegularFile(file) && Files.isReadable(file)) {
-                    imagePaths.add(file.toString());
-                }
-            });
 
-            if (imagePaths.isEmpty()) {
+            if (imagePaths == null || imagePaths.isEmpty() || imageIndex >= imagePaths.size() || imageIndex < 0) {
-                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
             }
 
-            return ResponseEntity.ok(imagePaths);
+            String imagePath = imagePaths.get(imageIndex);
-        } catch (Exception e) {
+            byte[] imageBytes = imageService.getImageBytes(imagePath);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+            MediaType mediaType = imageService.getMediaTypeForImage(imagePath);
+
+            return ResponseEntity
+                    .ok()
+                    .contentType(mediaType)
+                    .body(imageBytes);
+        } catch (IOException e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
     }
 
-//    @GetMapping("/check/{id}")
+    @GetMapping("/images/{id}")
-//    public ResponseEntity<String> checkNotice(@PathVariable("id") long id) {
+    public ResponseEntity<List<String>> getNoticeImageUrls(@PathVariable("id") Long id) {
-//        if (noticeService.noticeExists(id)) {
+        try {
-//            return ResponseEntity.ok("Ogłoszenie o ID " + id + " istnieje.");
+            if (!noticeService.noticeExists(id)) {
-//        } else {
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
-//            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Nie znaleziono ogłoszenia o ID: " + id);
+            }
-//        }
+
-//    }
+            NoticeDTO notice = noticeService.getNoticeById(id);
+            List<String> imagePaths = notice.getImages();
+
+            if (imagePaths == null || imagePaths.isEmpty()) {
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+            }
+
+            // Zamiast przesyłać bajty, zwracamy listę URL-i do obrazów
+            List<String> imageUrls = new ArrayList<>();
+            for (int i = 0; i < imagePaths.size(); i++) {
+                imageUrls.add("/api/v1/notices/images/" + id + "/" + i);
+            }
+
+            return ResponseEntity.ok(imageUrls);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
 }

src/main/java/_11/asktpk/artisanconnectbackend/service/ImageService.java

@@ -0,0 +1,38 @@
+package _11.asktpk.artisanconnectbackend.service;
+
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.MediaType;
+import org.springframework.http.MediaTypeFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+@Service
+public class ImageService {
+
+    public byte[] getImageBytes(String imagePath) throws IOException {
+        Path path = Paths.get(imagePath);
+        return Files.readAllBytes(path);
+    }
+
+    public Resource getImageAsResource(String imagePath) throws IOException {
+        Path path = Paths.get(imagePath);
+        Resource resource = new UrlResource(path.toUri());
+
+        if(resource.exists() && resource.isReadable()) {
+            return resource;
+        } else {
+            throw new IOException("Nie można odczytać obrazu: " + imagePath);
+        }
+    }
+
+    public MediaType getMediaTypeForImage(String imagePath) {
+        return MediaTypeFactory
+                .getMediaType(imagePath)
+                .orElse(MediaType.APPLICATION_OCTET_STREAM);
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java

@@ -113,8 +113,8 @@ public class NoticeService {
         }
     }
 
-    public String saveImage(Long noticeId, MultipartFile file) throws IOException {
+    public String saveImage(String uploadFolder, Long noticeId, MultipartFile file) throws IOException {
-        String uploadDir = "src/main/resources/static/images/notices/" + noticeId;
+        String uploadDir = uploadFolder + noticeId;
         Path uploadPath = Paths.get(uploadDir);
 
         if (!Files.exists(uploadPath)) {
@@ -141,12 +141,11 @@ public class NoticeService {
                     .orElse(0);
 
             fileName = baseName + (maxNumber + 1) + extension;
+        } else {
+            throw new IOException("Nie można znaleźć nazwy pliku");
         }
         //koniec szukania nazwy pliku
 
-        if(fileName == null) {
-            throw new IOException("Nie można znaleźć nazwy pliku");
-        }
         Path filePath = uploadPath.resolve(fileName);
         Files.copy(file.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);