Merge pull request #40 from TP-RENTPLACE/feature/add-user-reservations-and-properties

Feature/add user reservations and properties

Author: Kattsyn

rentplace/src/main/java/kattsyn/dev/rentplace/controllers/PropertyController.java

@@ -76,6 +76,21 @@ public ResponseEntity<List<PropertyDTO>> getProperties() {
         return ResponseEntity.ok(properties);
     }
 
+    @Operation(
+            summary = "Получение объявлений пользователя",
+            description = "Позволяет получить все объявления пользователя по его токену. Только для авторизованных пользователей."
+    )
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Успешно", content = @Content(mediaType = "application/json", schema = @Schema(implementation = PropertyDTO[].class))),
+            @ApiResponse(responseCode = "500", description = "Непредвиденная ошибка со стороны сервера", content = @Content)
+    })
+    @SecurityRequirement(name = "JWT")
+    @GetMapping("/my")
+    public ResponseEntity<List<PropertyDTO>> getUserProperties(Authentication authentication) {
+        List<PropertyDTO> properties = propertyService.findAllByOwnerEmail(authentication.getName());
+        return ResponseEntity.ok(properties);
+    }
+
     @Operation(
             summary = "Получить объявление",
             description = "Получить объявление по id"

rentplace/src/main/java/kattsyn/dev/rentplace/controllers/ReservationController.java

@@ -44,6 +44,21 @@ public ResponseEntity<List<ReservationDTO>> getReservations() {
         return ResponseEntity.ok(reservationDTOS);
     }
 
+    @Operation(
+            summary = "Получение всех бронирований пользователя",
+            description = "Позволяет получить все бронирования пользователя"
+    )
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Успешно", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ReservationDTO[].class))),
+            @ApiResponse(responseCode = "500", description = "Непредвиденная ошибка со стороны сервера", content = @Content)
+    })
+    @GetMapping("/my")
+    @SecurityRequirement(name = "JWT")
+    public ResponseEntity<List<ReservationDTO>> getUserReservations(Authentication authentication) {
+        List<ReservationDTO> reservationDTOS = reservationService.findAllReservationsByRenterEmail(authentication.getName());
+        return ResponseEntity.ok(reservationDTOS);
+    }
+
     @Operation(
             summary = "Получение бронирования",
             description = "Получение бронирования по id")
@@ -78,7 +93,6 @@ public ResponseEntity<ReservationDTO> getReservation(@PathVariable
     })
     @PreAuthorize("hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_USER')" )
     @SecurityRequirement(name = "JWT")
-    @SecurityRequirement(name = "JWT")
     @PostMapping(path = "/", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<ReservationDTO> createReservation(@Valid @ModelAttribute ReservationCreateEditDTO reservationCreateEditDTO,
                                                             Authentication authentication) {

rentplace/src/main/java/kattsyn/dev/rentplace/repositories/PropertyRepository.java

@@ -18,4 +18,6 @@ public interface PropertyRepository extends JpaRepository<Property, Long> {
     """)
     List<Property> findAllWithRelations();
 
+    List<Property> findAllByOwnerEmail(String email);
+
 }

rentplace/src/main/java/kattsyn/dev/rentplace/repositories/ReservationRepository.java

@@ -3,5 +3,10 @@
 import kattsyn.dev.rentplace.entities.Reservation;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface ReservationRepository extends JpaRepository<Reservation, Long> {
+
+    List<Reservation> findAllByRenterEmail(String email);
+
 }

rentplace/src/main/java/kattsyn/dev/rentplace/services/PropertyService.java

@@ -16,6 +16,8 @@ public interface PropertyService {
 
     List<PropertyDTO> findAll();
 
+    List<PropertyDTO> findAllByOwnerEmail(String email);
+
     PropertyDTO findById(long id);
 
     Property getPropertyById(long id);

rentplace/src/main/java/kattsyn/dev/rentplace/services/ReservationService.java

@@ -26,4 +26,6 @@ public interface ReservationService {
 
     List<ReservationDTO> findAllReservations();
 
+    List<ReservationDTO> findAllReservationsByRenterEmail(String email);
+
 }

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/PropertyServiceImpl.java

@@ -64,6 +64,11 @@ public List<PropertyDTO> findAll() {
         return propertyMapper.fromProperties(propertyRepository.findAllWithRelations());
     }
 
+    @Override
+    public List<PropertyDTO> findAllByOwnerEmail(String email) {
+        return propertyMapper.fromProperties(propertyRepository.findAllByOwnerEmail(email));
+    }
+
     @Override
     @Transactional
     public Property getPropertyById(long id) {

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/ReservationServiceImpl.java

@@ -59,6 +59,11 @@ public List<ReservationDTO> findAllReservations() {
         return reservationMapper.fromReservations(reservationRepository.findAll());
     }
 
+    @Override
+    public List<ReservationDTO> findAllReservationsByRenterEmail(String email) {
+        return reservationMapper.fromReservations(reservationRepository.findAllByRenterEmail(email));
+    }
+
     @Override
     public Reservation getReservationById(long reservationId) {
         return reservationRepository.findById(reservationId).orElseThrow(