Changes in / [dd7a2b6:0391097]

Location:

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo

Files:

• config/WebSecurityConfig.java (modified) (1 diff)
• model/exceptions/LogoDeletionException.java (deleted)
• service/impl/FileStorageServiceImpl.java (modified) (1 diff)
• service/impl/LocalManagerServiceImpl.java (modified) (4 diffs)
• service/intf/FileStorageService.java (modified) (1 diff)
• service/intf/LocalManagerService.java (modified) (1 diff)
• web/advice/GlobalExceptionHandler.java (modified) (1 diff)
• web/controller/LocalManagerController.java (modified) (2 diffs)

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/config/WebSecurityConfig.java

@@ -71 +71 @@
                         .allowedHeaders("*")
                         .allowCredentials(true);
-
-                registry.addMapping("/uploads/**")
-                        .allowedOrigins("http://localhost:5173")
-                        .allowedMethods("*")// maybe should be only GET
-                        .allowedHeaders("*");
             }
         };

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/FileStorageServiceImpl.java

@@ -15 +15 @@
 public class FileStorageServiceImpl implements FileStorageService {
 
-    private final Path rootUploadsDir = Paths.get("uploads");
-    private final Path logosDir = rootUploadsDir.resolve("logos");
-    private final Path localsDir = rootUploadsDir.resolve("locals");
+    private final Path uploadDirectory = Paths.get("uploads");
 
     public FileStorageServiceImpl() throws IOException {
-        Files.createDirectories(rootUploadsDir);
-        Files.createDirectories(logosDir);
-        Files.createDirectories(localsDir);
+        Files.createDirectories(uploadDirectory);
     }
 
     @Override
-    public String saveLogoFile(MultipartFile file) {
+    public String saveFile(MultipartFile file) {
         try {
             String fileName = UUID.randomUUID() + "_" + file.getOriginalFilename();
-            Path target = logosDir.resolve(fileName);
+            Path target = uploadDirectory.resolve(fileName);
             Files.copy(file.getInputStream(), target, StandardCopyOption.REPLACE_EXISTING);
-            return "/uploads/logos/" + fileName;
+            return "/uploads/" + fileName;
         } catch (IOException e) {
-            throw new RuntimeException("Failed to save logo", e);
-        }
-    }
-
-    @Override
-    public String saveLocalPhoto(Long localId, MultipartFile file) {
-        try {
-            Path localFolder = localsDir.resolve(String.valueOf(localId));
-            Files.createDirectories(localFolder);
-            String fileName = UUID.randomUUID() + "_" + file.getOriginalFilename();
-            Path target = localFolder.resolve(fileName);
-            Files.copy(file.getInputStream(), target, StandardCopyOption.REPLACE_EXISTING);
-            return "/uploads/locals/" + localId + "/" + fileName;
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to save local photo", e);
+            throw new RuntimeException("Failed to save file", e);
         }
     }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalManagerServiceImpl.java

@@ -4 +4 @@
 import mk.ukim.finki.it.reservengo.model.domain.LocalManager;
 import mk.ukim.finki.it.reservengo.model.exceptions.LocalIdNotFoundException;
-import mk.ukim.finki.it.reservengo.model.exceptions.LogoDeletionException;
 import mk.ukim.finki.it.reservengo.model.exceptions.UserEmailAlreadyExistsException;
 import mk.ukim.finki.it.reservengo.repository.LocalManagerRepository;
@@ -13 +12 @@
 import org.springframework.stereotype.Service;
 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;
 
 @Service
@@ -40 +32 @@
         Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId));
 
-        String logoPath = fileStorageService.saveLogoFile(logoFile);
+        String logoPath = fileStorageService.saveFile(logoFile);
         local.setLogoUrl(logoPath);
 
@@ -53 +45 @@
         localManagerRepository.save(localManager);
     }
-
-    @Override
-    public void deleteLocalLogo(Long localId) {
-        Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId));
-        String logoUrl = local.getLogoUrl();
-
-        if (logoUrl != null && !logoUrl.isEmpty()) {
-            Path filePath = Paths.get("uploads").resolve(Paths.get(logoUrl).getFileName().toString());
-
-            try {
-                Files.deleteIfExists(filePath);
-            } catch (IOException e) {
-                throw new LogoDeletionException("Failed to delete logo from path: " + filePath, e);
-            }
-        }
-        local.setLogoUrl(null);
-        localRepository.save(local);
-    }
-
-    @Override
-    public void uploadPhotos(Long localId, List<MultipartFile> photos) {
-        Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId));
-
-        List<String> photoPaths = local.getLocalPhotos();
-
-        if (photoPaths == null) {
-            photoPaths = new ArrayList<>();
-        }
-
-        for (MultipartFile photo : photos) {
-            if (!photo.isEmpty()) {
-                String filePath = fileStorageService.saveLocalPhoto(localId, photo);
-                photoPaths.add(filePath);
-            }
-        }
-        local.setLocalPhotos(photoPaths);
-        localRepository.save(local);
-    }
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/FileStorageService.java

@@ -4 +4 @@
 
 public interface FileStorageService {
-    String saveLogoFile(MultipartFile file);
-    String saveLocalPhoto(Long localId, MultipartFile file);
+    String saveFile(MultipartFile file);
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalManagerService.java

@@ -4 +4 @@
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 public interface LocalManagerService {
     void uploadLogo(Long localId, MultipartFile logoFile);
 
     void save(LocalManager localManager);
-
-    void deleteLocalLogo(Long localId);
-
-    void uploadPhotos(Long localId, List<MultipartFile> photos);
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/advice/GlobalExceptionHandler.java

@@ -56 +56 @@
         return ResponseEntity.status(HttpStatus.CONFLICT).body(ex.getMessage());
     }
-
-    @ExceptionHandler(LogoDeletionException.class)
-    public ResponseEntity<String> handleLogoDeletion(LogoDeletionException ex) {
-        return ResponseEntity.status(HttpStatus.CONFLICT).body(ex.getMessage());
-    }
 }
 

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/LocalManagerController.java

@@ -5 +5 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 @RestController
@@ -24 +22 @@
         return ResponseEntity.ok().build();
     }
-
-    @DeleteMapping("/{localId}/delete-logo")
-    public ResponseEntity<?> deleteLocalLogo(@PathVariable Long localId) {
-        localManagerService.deleteLocalLogo(localId);
-        return ResponseEntity.ok().build();
-    }
-
+    //TODO implement delete logo
     @PostMapping("/{localId}/upload-photos")
-    public ResponseEntity<?> uploadPhotos(@PathVariable Long localId,
-                                          @RequestParam("photos") List<MultipartFile> photos) {
-        localManagerService.uploadPhotos(localId, photos);
+    //TODO implement this next
+    public ResponseEntity<?> uploadPhotos(@PathVariable Long localId) {
         return ResponseEntity.ok().build();
     }