hamx/ArtisanConnectBackend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Images are working but still there is need to add isImageMain flag to images.

Browse Source
This commit is contained in:
Andrii Solianyk
2025-04-28 14:17:38 +02:00
parent 6b5dded7f8
commit 7f8f13b115
12 changed files with 251 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/main/java/_11/asktpk/artisanconnectbackend/controller/NoticeController.java
View File

@@ -1,20 +1,13 @@
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;
import java.util.ArrayList;
import java.util.List;
@@ -23,12 +16,10 @@ 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, ImageService imageService) {
public NoticeController(NoticeService noticeService, ClientService clientService) {
this.noticeService = noticeService;
this.clientService = clientService;
this.imageService = imageService;
}
@GetMapping("/get/all")
@@ -53,6 +44,10 @@ public class NoticeController {
.body("Nie znaleziono klienta o ID: " + dto.getClientId());
}
if (dto.getCategory() == null) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Nie ma takiej kategorii");
}
dto.setPublishDate(java.time.LocalDateTime.now());
noticeService.addNotice(dto);
@@ -112,76 +107,4 @@ public class NoticeController {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
}
@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("./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());
}
}
@GetMapping("/images/{noticeId}/{imageIndex}")
public ResponseEntity<byte[]> getImage(@PathVariable Long noticeId, @PathVariable Integer imageIndex) {
try {
if (!noticeService.noticeExists(noticeId)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
}
NoticeDTO notice = noticeService.getNoticeById(noticeId);
List<String> imagePaths = notice.getImages();
if (imagePaths == null || imagePaths.isEmpty() || imageIndex >= imagePaths.size() || imageIndex < 0) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
}
String imagePath = imagePaths.get(imageIndex);
byte[] imageBytes = imageService.getImageBytes(imagePath);
MediaType mediaType = imageService.getMediaTypeForImage(imagePath);
return ResponseEntity
.ok()
.contentType(mediaType)
.body(imageBytes);
} catch (IOException e) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
}
@GetMapping("/images/{id}")
public ResponseEntity<List<String>> getNoticeImageUrls(@PathVariable("id") Long id) {
try {
if (!noticeService.noticeExists(id)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
}
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();
}
}
}