Feature/refatoracao boas praticas

cadastral/src/main/java/com/unipampa/crud/config/security/SecurityConfig.java

@@ -32,6 +32,7 @@ public class SecurityConfig {
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http.authorizeHttpRequests(auth -> auth
                         .requestMatchers(HttpMethod.POST, PUBLIC_MATCHERS).permitAll()
+                        .requestMatchers("/accommodations/images/**").permitAll()
                         .requestMatchers(HttpMethod.POST, "/accommodations/**").hasAnyRole(HOST, ADMIN)
                         .requestMatchers(HttpMethod.GET, "/accommodations/**").hasAnyRole(HOST, GUEST, ADMIN)
                         .requestMatchers(HttpMethod.GET, "/accommodations/{id}").hasAnyRole(HOST, GUEST, ADMIN)

cadastral/src/main/java/com/unipampa/crud/entities/Accommodation.java

@@ -3,14 +3,11 @@
 import com.unipampa.crud.enums.AccommodationType;
 import lombok.Builder;
 import lombok.Data;
-import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import org.springframework.data.annotation.Id;
 import java.math.BigDecimal;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 @Builder
 @Document

cadastral/src/main/java/com/unipampa/crud/exceptions/ResourceNotFoundException.java

@@ -0,0 +1,12 @@
+package com.unipampa.crud.exceptions;
+
+import java.io.Serial;
+
+public class ResourceNotFoundException extends RuntimeException {
+    @Serial
+    private static final long serialVersionUID = -5528826721501929445L;
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+}

cadastral/src/main/java/com/unipampa/crud/mappers/AccommodationMapper.java

@@ -4,11 +4,23 @@
 import com.unipampa.crud.dto.AccommodationDTO;
 import com.unipampa.crud.dto.AccommodationRequestDTO;
 import com.unipampa.crud.entities.Accommodation;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Component
 public class AccommodationMapper {
 
+
+    @Autowired
+    private HttpServletRequest request;
+
     private final ObjectMapper objectMapper;
 
     public AccommodationMapper(ObjectMapper objectMapper) {
@@ -24,6 +36,33 @@ public Accommodation toEntity(AccommodationRequestDTO requestDTO) {
     }
 
     public AccommodationDTO toDTO(Accommodation entity) {
-        return objectMapper.convertValue(entity, AccommodationDTO.class);
+        String urlBase = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
+        List<String> imageUrls = entity.getImagesUrls().stream()
+                .map(path -> {
+                    Path p = Paths.get(path);
+                    String id = p.getParent().getFileName().toString(); // exemplo: "6804eaef24e9aa24141421a1"
+                    String filename = p.getFileName().toString();
+                    return urlBase + "/accommodations/images/" + id + "/" + filename;
+                })
+                .collect(Collectors.toList());
+
+        return new AccommodationDTO(
+                entity.getId(),
+                entity.getTitle(),
+                entity.getNeighborhood(),
+                entity.getZipCode(),
+                entity.getCity(),
+                entity.getDescription(),
+                entity.getAddress(),
+                entity.getState(),
+                entity.getPrice(),
+                entity.getStreetNumber(),
+                entity.getImagesUrls() != null ? entity.getImagesUrls().size() : 0,
+                entity.getType(),
+                entity.getMaxOccupancy(),
+                imageUrls
+        );
+
+
     }
 }

cadastral/src/main/java/com/unipampa/crud/resources/AccommodationResource.java

@@ -1,5 +1,7 @@
 package com.unipampa.crud.resources;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.unipampa.crud.config.security.SecurityUtil;
 import com.unipampa.crud.dto.AccommodationDTO;
 import com.unipampa.crud.dto.AccommodationRequestDTO;
@@ -13,12 +15,24 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.MediaTypeFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -28,6 +42,13 @@
 @RequestMapping("/accommodations")
 public class AccommodationResource {
 
+    private static final String ACOMODACAO_NAO_ENCONTRADA_PARA_EXCLUSAO = "Acomodação não encontrada para o ID fornecido. Exclusão não realizada.";
+    private static final String ACOMODACAO_NAO_ECONTRADA_PARA_ATUALIZACAO = "Acomodação não encontrada para o ID fornecido. Atualização não realizada.";
+    private static final String ERRO_AO_ATUALIZAR_ACOMODACAO = "Erro ao atualizar a acomodação. Verifique os dados fornecidos.";
+
+    @Value("${app.uploads-dir}")
+    private String uploadsDir;
+
     @Autowired
     private AccommodationService accommodationService;
 
@@ -46,21 +67,24 @@ public class AccommodationResource {
             @ApiResponse(responseCode = "400", description = "Dados inválidos fornecidos",
                     content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
-    public ResponseEntity<AccommodationDTO> save(@RequestBody AccommodationRequestDTO accommodationDTO) {
+    public ResponseEntity<AccommodationDTO> save(
+            @RequestPart ("dados") String dadosJson,
+            @RequestPart ("images") MultipartFile[] images
+    ) throws IOException {
 
-        validations.forEach(e -> e.validate(accommodationDTO));
+        ObjectMapper mapper = new ObjectMapper();
+        AccommodationRequestDTO accommodationDTO = mapper.readValue(dadosJson, AccommodationRequestDTO.class);
 
+        validations.forEach(e -> e.validate(accommodationDTO));
         var accommodation = accommodationMapper.toEntity(accommodationDTO);
-
+        String novoId = new ObjectId().toString();
+        accommodation.setId(novoId);
         String authenticatedUserId = SecurityUtil.getAuthenticatedUserId();
         accommodation.setHostId(authenticatedUserId);
-
-        accommodationService.save(accommodation);
+        accommodationService.save(accommodation, images);
 
         URI location = URI.create("/accommodations/" + accommodation.getId());
-
         var accomodationResponseDTO = accommodationMapper.toDTO(accommodation);
-
         return ResponseEntity.created(location).body(accomodationResponseDTO);
     }
 
@@ -110,20 +134,11 @@ public ResponseEntity<Object> getById(@PathVariable("id") String id) {
                     content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     public ResponseEntity<Object> deleteAccommodation(@PathVariable("id") String id) {
-        Optional<Accommodation> accommodation = accommodationService.findById(id);
-
+        var accommodation = accommodationService.findById(id);
         if (accommodation.isEmpty()) {
-            ErrorResponse errorResponse = new ErrorResponse("Acomodação não encontrada para o ID fornecido. Exclusão não realizada.", LocalDateTime.now());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse(ACOMODACAO_NAO_ENCONTRADA_PARA_EXCLUSAO, LocalDateTime.now()));
         }
-
-        String authenticatedUserId = SecurityUtil.getAuthenticatedUserId();
-        boolean isAdmin = SecurityUtil.isAuthenticatedAdmin();
-
-        if (!isAdmin && !accommodation.get().getHostId().equals(authenticatedUserId)) {
-            throw new SecurityException("Você não tem permissão para deletar esta acomodação");
-        }
-
+        accommodationService.validateAuthorizationUser(accommodation);
         accommodationService.delete(id);
         return ResponseEntity.noContent().build();
     }
@@ -141,38 +156,54 @@ public ResponseEntity<Object> deleteAccommodation(@PathVariable("id") String id)
     })
     public ResponseEntity<Object> updateAccommodation(
             @PathVariable("id") String id,
-            @RequestBody AccommodationRequestDTO accommodationDTO
-    ) {
-        Optional<Accommodation> existingAccommodation = accommodationService.findById(id);
+            @RequestPart("dados") String dadosJson,
+            @RequestPart(value = "images", required = false) MultipartFile[] images) throws JsonProcessingException {
+
+        var existingAccommodation = accommodationService.findById(id);
         if (existingAccommodation.isEmpty()) {
-            ErrorResponse errorResponse = new ErrorResponse("Acomodação não encontrada para o ID fornecido. Atualização não realizada.", LocalDateTime.now());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse(ACOMODACAO_NAO_ECONTRADA_PARA_ATUALIZACAO, LocalDateTime.now()));
         }
+        accommodationService.validateAuthorizationUser(existingAccommodation);
 
-        String authenticatedUserId = SecurityUtil.getAuthenticatedUserId();
-        boolean isAdmin = SecurityUtil.isAuthenticatedAdmin();
+        ObjectMapper mapper = new ObjectMapper();
+        AccommodationRequestDTO accommodationDTO = mapper.readValue(dadosJson, AccommodationRequestDTO.class);
 
-        if (!isAdmin && !existingAccommodation.get().getHostId().equals(authenticatedUserId)) {
-            throw new SecurityException("Você não tem permissão para atualizar esta acomodação");
-        }
 
-        try {
-            validations.forEach(e -> e.validate(accommodationDTO));
+        validations.forEach(e -> e.validate(accommodationDTO));
 
-            Accommodation accommodation = existingAccommodation.get();
-            accommodation.setTitle(accommodationDTO.title());
-            accommodation.setAddress(accommodationDTO.address());
-            accommodation.setPrice(accommodationDTO.price());
+        Accommodation accommodation = existingAccommodation.get();
 
-            accommodationService.save(accommodation);
+        accommodation.setTitle(accommodationDTO.title());
+        accommodation.setAddress(accommodationDTO.address());
+        accommodation.setPrice(accommodationDTO.price());
 
+        try {
+            accommodationService.save(accommodation, images);
             AccommodationDTO updatedDTO = accommodationMapper.toDTO(accommodation);
             return ResponseEntity.ok(updatedDTO);
 
         } catch (Exception e) {
-            ErrorResponse errorResponse = new ErrorResponse("Erro ao atualizar a acomodação. Verifique os dados fornecidos.", LocalDateTime.now());
+            ErrorResponse errorResponse = new ErrorResponse(ERRO_AO_ATUALIZAR_ACOMODACAO, LocalDateTime.now());
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
         }
     }
 
+    @GetMapping("images/{id}/{filename}")
+    public ResponseEntity<Resource> getImage(@PathVariable String id, @PathVariable String filename) throws MalformedURLException, MalformedURLException {
+        Path path = Paths.get(uploadsDir + id).resolve(filename);
+
+        if (!Files.exists(path)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        Resource resource = new UrlResource(path.toUri());
+
+        MediaType contentType = MediaTypeFactory.getMediaType(resource)
+                .orElse(MediaType.APPLICATION_OCTET_STREAM);
+
+        return ResponseEntity.ok()
+                .contentType(contentType)
+                .body(resource);
+    }
+
 }