Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/contactDTO/DisplayContactDTO.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/contactDTO/DisplayContactDTO.java (revision 3af859482e05cea71ece3262dfe30a4b9b00c861) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/contactDTO/DisplayContactDTO.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -17,3 +17,9 @@ ); } + + public Contact toContact() { + return new Contact( + phone, email, socialLinks + ); + } } Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/localDTO/CreateLocalDetailsDTO.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/localDTO/CreateLocalDetailsDTO.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/dto/localDTO/CreateLocalDetailsDTO.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -0,0 +1,20 @@ +package mk.ukim.finki.it.reservengo.dto.localDTO; + +import mk.ukim.finki.it.reservengo.dto.contactDTO.DisplayContactDTO; +import mk.ukim.finki.it.reservengo.model.enumerations.Service; + +import java.util.List; + +public record CreateLocalDetailsDTO( + String name, + String description, + String address, + String workingHours, + List services, + List localPhotos, + String menuPhoto, + String menuLink, + DisplayContactDTO contact, + String logo +) { +} Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalManagerServiceImpl.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalManagerServiceImpl.java (revision 3af859482e05cea71ece3262dfe30a4b9b00c861) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalManagerServiceImpl.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -1,24 +1,16 @@ package mk.ukim.finki.it.reservengo.service.impl; +import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDetailsDTO; import mk.ukim.finki.it.reservengo.model.domain.Local; import mk.ukim.finki.it.reservengo.model.domain.LocalManager; -import mk.ukim.finki.it.reservengo.model.exceptions.*; -import mk.ukim.finki.it.reservengo.model.exceptions.LocalIdNotFoundException; import mk.ukim.finki.it.reservengo.model.exceptions.LocalManagerIdNotFoundException; -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; -import mk.ukim.finki.it.reservengo.repository.LocalRepository; -import mk.ukim.finki.it.reservengo.service.intf.FileStorageService; import mk.ukim.finki.it.reservengo.service.intf.LocalManagerService; +import mk.ukim.finki.it.reservengo.service.intf.LocalService; import mk.ukim.finki.it.reservengo.service.intf.UserService; 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; @@ -26,13 +18,11 @@ public class LocalManagerServiceImpl implements LocalManagerService { - private final LocalRepository localRepository; + private final LocalService localService; private final LocalManagerRepository localManagerRepository; - private final FileStorageService fileStorageService; private final UserService userService; - public LocalManagerServiceImpl(LocalRepository localRepository, LocalManagerRepository localManagerRepository, FileStorageService fileStorageService, UserService userService) { - this.localRepository = localRepository; + public LocalManagerServiceImpl(LocalService localService, LocalManagerRepository localManagerRepository, UserService userService) { + this.localService = localService; this.localManagerRepository = localManagerRepository; - this.fileStorageService = fileStorageService; this.userService = userService; } @@ -40,12 +30,5 @@ @Override public void uploadLocalLogo(Long localId, MultipartFile logoFile) { - Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); - - if (!logoFile.isEmpty()) { - String logoPath = fileStorageService.saveLogoFile(logoFile); - local.setLogoUrl(logoPath); - } - - localRepository.save(local); + localService.addLogo(localId, logoFile); } @@ -60,92 +43,25 @@ @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("logos").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); + localService.deleteLogo(localId); } @Override public void uploadLocalPhotos(Long localId, List photos) { - Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); - - List 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); + localService.uploadPhotos(localId, photos); } @Override public void deleteLocalPhotos(Long localId, List photoPaths) { - Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); - - List uploadedPhotos = local.getLocalPhotos(); - - if (uploadedPhotos == null) { - uploadedPhotos = new ArrayList<>(); - } - - for (String photoPath : photoPaths) { - if (uploadedPhotos.contains(photoPath)) { - try { - fileStorageService.deletePhotoFile(photoPath); - uploadedPhotos.remove(photoPath); - } catch (RuntimeException e) { - throw new PhotoDeletionException("Failed to delete photo: " + photoPath, e); - } - } - } - - local.setLocalPhotos(uploadedPhotos); - localRepository.save(local); + localService.deletePhotos(localId, photoPaths); } @Override public void uploadLocalMenu(Long localId, MultipartFile localMenuFile) { - Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); - - if (!localMenuFile.isEmpty()) { - String menuPath = fileStorageService.saveLocalMenuPhoto(localId, localMenuFile); - local.setMenuPhoto(menuPath); - } - - localRepository.save(local); + localService.uploadMenu(localId, localMenuFile); } @Override public void deleteLocalMenuPhoto(Long localId) { - Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); - - String menuPhotoPath = local.getMenuPhoto(); - - if (menuPhotoPath != null && !menuPhotoPath.isEmpty()) { - try { - fileStorageService.deletePhotoFile(menuPhotoPath); - } catch (RuntimeException e) { - throw new MenuDeletionException("Failed to delete menu photo: " + menuPhotoPath, e); - } - local.setMenuPhoto(null); - localRepository.save(local); - } + localService.deleteMenu(localId); } @@ -173,3 +89,14 @@ localManagerRepository.save(existingManager); } + + @Override + public Local findLocalByManagerId(Long id) { + LocalManager localManager = localManagerRepository.findById(id).orElseThrow(() -> new LocalManagerIdNotFoundException(id)); + return localManager.getLocal(); + } + + @Override + public void editLocalInfo(Long localId, CreateLocalDetailsDTO createLocalDetailsDTO) { + localService.updateInfoLocal(localId, createLocalDetailsDTO); + } } Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalServiceImpl.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalServiceImpl.java (revision 3af859482e05cea71ece3262dfe30a4b9b00c861) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/LocalServiceImpl.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -1,10 +1,21 @@ package mk.ukim.finki.it.reservengo.service.impl; +import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDetailsDTO; import mk.ukim.finki.it.reservengo.model.domain.Local; 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.MenuDeletionException; +import mk.ukim.finki.it.reservengo.model.exceptions.PhotoDeletionException; import mk.ukim.finki.it.reservengo.repository.LocalRepository; +import mk.ukim.finki.it.reservengo.service.intf.FileStorageService; import mk.ukim.finki.it.reservengo.service.intf.LocalService; 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; @@ -13,7 +24,9 @@ private final LocalRepository localRepository; + private final FileStorageService fileStorageService; - public LocalServiceImpl(LocalRepository localRepository) { + public LocalServiceImpl(LocalRepository localRepository, FileStorageService fileStorageService) { this.localRepository = localRepository; + this.fileStorageService = fileStorageService; } @@ -39,3 +52,125 @@ localRepository.delete(local); } + + @Override + public void addLogo(Long localId, MultipartFile multipartFile) { + Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); + + if (!multipartFile.isEmpty()) { + String logoPath = fileStorageService.saveLogoFile(multipartFile); + local.setLogoUrl(logoPath); + } + + localRepository.save(local); + } + + @Override + public void deleteLogo(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("logos").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 photos) { + Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); + + List 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); + } + + @Override + public void deletePhotos(Long localId, List photoPaths) { + Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); + + List uploadedPhotos = local.getLocalPhotos(); + + if (uploadedPhotos == null) { + uploadedPhotos = new ArrayList<>(); + } + + for (String photoPath : photoPaths) { + if (uploadedPhotos.contains(photoPath)) { + try { + fileStorageService.deletePhotoFile(photoPath); + uploadedPhotos.remove(photoPath); + } catch (RuntimeException e) { + throw new PhotoDeletionException("Failed to delete photo: " + photoPath, e); + } + } + } + + local.setLocalPhotos(uploadedPhotos); + localRepository.save(local); + } + + @Override + public void uploadMenu(Long localId, MultipartFile localMenuFile) { + Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); + + if (!localMenuFile.isEmpty()) { + String menuPath = fileStorageService.saveLocalMenuPhoto(localId, localMenuFile); + local.setMenuPhoto(menuPath); + } + + localRepository.save(local); + } + + @Override + public void deleteMenu(Long localId) { + Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); + + String menuPhotoPath = local.getMenuPhoto(); + + if (menuPhotoPath != null && !menuPhotoPath.isEmpty()) { + try { + fileStorageService.deletePhotoFile(menuPhotoPath); + } catch (RuntimeException e) { + throw new MenuDeletionException("Failed to delete menu photo: " + menuPhotoPath, e); + } + local.setMenuPhoto(null); + localRepository.save(local); + } + } + + @Override + public void updateInfoLocal(Long localId, CreateLocalDetailsDTO createLocalDetailsDTO) { + Local local = localRepository.findById(localId).orElseThrow(() -> new LocalIdNotFoundException(localId)); + + local.setName(createLocalDetailsDTO.name()); + local.setDescription(createLocalDetailsDTO.description()); + local.setAddress(createLocalDetailsDTO.address()); + local.setWorkingHours(createLocalDetailsDTO.workingHours()); + local.setAvailableServices(createLocalDetailsDTO.services()); + local.setLocalPhotos(createLocalDetailsDTO.localPhotos()); + local.setMenuPhoto(createLocalDetailsDTO.menuPhoto()); + local.setMenuLink(createLocalDetailsDTO.menuLink()); + local.setContact(createLocalDetailsDTO.contact().toContact()); + local.setLogoUrl(createLocalDetailsDTO.logo()); + + localRepository.save(local); + } } Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalManagerService.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalManagerService.java (revision 3af859482e05cea71ece3262dfe30a4b9b00c861) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalManagerService.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -1,4 +1,7 @@ package mk.ukim.finki.it.reservengo.service.intf; +import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDetailsDTO; +import mk.ukim.finki.it.reservengo.dto.localDTO.DisplayLocalDTO; +import mk.ukim.finki.it.reservengo.model.domain.Local; import mk.ukim.finki.it.reservengo.model.domain.LocalManager; import org.springframework.web.multipart.MultipartFile; @@ -28,3 +31,7 @@ void update(Long id, LocalManager manager); + + Local findLocalByManagerId(Long id); + + void editLocalInfo(Long localId, CreateLocalDetailsDTO createLocalDetailsDTO); } Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalService.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalService.java (revision 3af859482e05cea71ece3262dfe30a4b9b00c861) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/LocalService.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -1,5 +1,7 @@ package mk.ukim.finki.it.reservengo.service.intf; +import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDetailsDTO; import mk.ukim.finki.it.reservengo.model.domain.Local; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -13,3 +15,17 @@ void delete(Long id); + + void addLogo(Long localId, MultipartFile multipartFile); + + void deleteLogo(Long localId); + + void uploadPhotos(Long localId, List photos); + + void deletePhotos(Long localId, List photoPaths); + + void uploadMenu(Long localId, MultipartFile localMenuFile); + + void deleteMenu(Long localId); + + void updateInfoLocal(Long localId, CreateLocalDetailsDTO createLocalDetailsDTO); } Index: ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/LocalManagerController.java =================================================================== --- ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/LocalManagerController.java (revision 3af859482e05cea71ece3262dfe30a4b9b00c861) +++ ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/controller/LocalManagerController.java (revision 8e5c5565415ef271e097037883517abd94b28d6d) @@ -1,6 +1,12 @@ package mk.ukim.finki.it.reservengo.web.controller; +import mk.ukim.finki.it.reservengo.dto.localDTO.CreateLocalDetailsDTO; +import mk.ukim.finki.it.reservengo.dto.localDTO.DisplayLocalDTO; +import mk.ukim.finki.it.reservengo.dto.localDTO.DisplayLocalDetailsDTO; +import mk.ukim.finki.it.reservengo.model.domain.User; import mk.ukim.finki.it.reservengo.service.intf.LocalManagerService; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -19,41 +25,61 @@ @PostMapping("/{localId}/upload-logo") - public ResponseEntity uploadLogo(@PathVariable Long localId, - @RequestParam("logo") MultipartFile logoFile) { + public ResponseEntity uploadLogo(@PathVariable Long localId, + @RequestParam("logo") MultipartFile logoFile) { localManagerService.uploadLocalLogo(localId, logoFile); - return ResponseEntity.ok().build(); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping("/{localId}/delete-logo") - public ResponseEntity deleteLocalLogo(@PathVariable Long localId) { + public ResponseEntity deleteLocalLogo(@PathVariable Long localId) { localManagerService.deleteLocalLogo(localId); - return ResponseEntity.ok().build(); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/{localId}/upload-menu") - public ResponseEntity uploadMenu(@PathVariable Long localId, - @RequestParam("menu") MultipartFile menuFile) { + public ResponseEntity uploadMenu(@PathVariable Long localId, + @RequestParam("menu") MultipartFile menuFile) { localManagerService.uploadLocalMenu(localId, menuFile); - return ResponseEntity.ok().build(); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping("/{localId}/delete-menu") - public ResponseEntity deleteMenu(@PathVariable Long localId) { + public ResponseEntity deleteMenu(@PathVariable Long localId) { localManagerService.deleteLocalMenuPhoto(localId); - return ResponseEntity.ok().build(); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/{localId}/upload-photos") - public ResponseEntity uploadPhotos(@PathVariable Long localId, - @RequestParam("photos") List photos) { + public ResponseEntity uploadPhotos(@PathVariable Long localId, + @RequestParam("photos") List photos) { localManagerService.uploadLocalPhotos(localId, photos); - return ResponseEntity.ok().build(); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @DeleteMapping("/{localId}/delete-photos") - public ResponseEntity deletePhotos(@PathVariable Long localId, - @RequestParam("photos") List photoPaths) { + public ResponseEntity deletePhotos(@PathVariable Long localId, + @RequestParam("photos") List photoPaths) { localManagerService.deleteLocalPhotos(localId, photoPaths); - return ResponseEntity.ok().build(); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @GetMapping("/my-local") + public ResponseEntity getLocalForManager(@AuthenticationPrincipal User user) { + DisplayLocalDTO displayLocalDTO = DisplayLocalDTO.fromLocal(localManagerService.findLocalByManagerId(user.getId())); + return new ResponseEntity<>(displayLocalDTO, HttpStatus.OK); + } + + @GetMapping("/my-local/edit") + public ResponseEntity getLocalInformation(@AuthenticationPrincipal User user) { + DisplayLocalDetailsDTO displayLocalDetailsDTO = DisplayLocalDetailsDTO.from(localManagerService.findLocalByManagerId(user.getId())); + return new ResponseEntity<>(displayLocalDetailsDTO, HttpStatus.OK); + } + + @PostMapping("/{localId}/edit") + public ResponseEntity editLocalInformation(@PathVariable Long localId, + @RequestBody CreateLocalDetailsDTO createLocalDetailsDTO) { + localManagerService.editLocalInfo(localId, createLocalDetailsDTO); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } }