Changes in sql and database config

.github/workflows/ci.yml

@@ -36,9 +36,10 @@ jobs:
       DB_PASSWORD: password
       SERVER_PORT: 8080
       # Cloudinary dummy variables for testing
-      CLOUDINARY_CLOUD_NAME: dummy_cloud_name
-      CLOUDINARY_API_KEY: dummy_api_key
-      CLOUDINARY_API_SECRET: dummy_api_secret
+      CLOUDINARY_CLOUD_NAME: ${{ secrets.CLOUDINARY_CLOUD_NAME }}
+      CLOUDINARY_API_KEY: ${{ secrets.CLOUDINARY_API_KEY }}
+      CLOUDINARY_API_SECRET: ${{ secrets.CLOUDINARY_API_SECRET }}
+
       # Email dummy variables for testing
       EMAIL: test@example.com
       EMAIL_PASSWORD: dummy_password

.github/workflows/test.yml

@@ -10,6 +10,13 @@ on:
 
 jobs:
   test-docker:
+
+    env:
+      # Cloudinary dummy variables for testing
+      CLOUDINARY_CLOUD_NAME: ${{ secrets.CLOUDINARY_CLOUD_NAME }}
+      CLOUDINARY_API_KEY: ${{ secrets.CLOUDINARY_API_KEY }}
+      CLOUDINARY_API_SECRET: ${{ secrets.CLOUDINARY_API_SECRET }}
+
     # Use the latest Ubuntu runner for consistent test environment
     runs-on: ubuntu-latest
 
@@ -36,4 +43,4 @@ jobs:
         if: always()  # Run even if previous steps fail
         run: docker compose -f docker-compose-test.yml down -v
         # down: Stop and remove containers
-        # -v: Remove associated volumes
+        # -v: Remove associated volumes

docker-compose-test.yml

@@ -30,6 +30,10 @@ services:
       - DB_URL_TEST=jdbc:mysql://sleepUp-test-db:3306/sleepUp # Database connection URL using service name
       - DB_USER=sleepUp # Database username
       - DB_PASSWORD=sleepUp123 # Database password
+      - CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
+      - CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
+      - CLOUDINARY_API_SECRET=${CLOUDINARY_API_SECRET}
+
 
     # Restart policy - never restart (single-run test container)
     restart: no
@@ -77,4 +81,4 @@ services:
 # Network configuration
 networks:
   sleepUp-network:
-    driver: bridge # Use bridge driver for container-to-container communication
+    driver: bridge # Use bridge driver for container-to-container communication

kubernetes/deployment.yml

@@ -38,7 +38,10 @@ spec:
           env:
             # Spring Boot profile configuration
             - name: SPRING_PROFILES_ACTIVE
-              value: "kubernetes"
+              valueFrom:
+                configMapKeyRef:
+                  name: config
+                  key: spring-profiles-active
             # Application server port
             - name: SERVER_PORT
               value: "8080"

src/main/java/com/SleepUp/SU/accommodation/controller/AccommodationController.java

@@ -5,6 +5,9 @@
 import com.SleepUp.SU.accommodation.dto.AccommodationResponseSummary;
 import com.SleepUp.SU.accommodation.service.AccommodationService;
 import com.SleepUp.SU.user.entity.CustomUserDetails;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -16,26 +19,49 @@
 
 import java.util.List;
 
+@Tag(name = "Accommodation", description = "Operation related to accommodations")
 @RestController
 @RequestMapping("/accommodations")
 @RequiredArgsConstructor
 public class AccommodationController {
     private final AccommodationService accommodationService;
 
     @GetMapping
+    @Operation(summary = "Get All Accommodations", description = "Retrieve a list of all accommodations with summary details.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "Successfully retrieved list of accommodations"),
+                    @ApiResponse(responseCode = "204", ref = "#/components/responses/NoContent"),
+                    @ApiResponse(responseCode = "403", ref = "#/components/responses/Forbidden"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.OK)
     public List<AccommodationResponseSummary> getAllAccommodations(@AuthenticationPrincipal CustomUserDetails customUserDetails){
         return accommodationService.getAllAccommodations();
     }
 
     @GetMapping("/{id}")
+    @Operation(summary = "Get Accommodation Details", description = "Retrieve detailed information about a specific accommodation by its ID.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "Successfully retrieved accommodation details"),
+                    @ApiResponse(responseCode = "403", ref = "#/components/responses/Forbidden"),
+                    @ApiResponse(responseCode = "404", ref = "#/components/responses/AccommodationFound"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.OK)
     public AccommodationResponseDetail getAccommodationDetailById(@PathVariable Long id) {
         return accommodationService.getAccommodationById(id);
     }
 
     @PreAuthorize("isAuthenticated()")
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(summary = "Create Accommodation", description = "Create a new accommodation with the provided details.",
+            responses = {
+                    @ApiResponse(responseCode = "201", description = "Successfully created a new accommodation"),
+                    @ApiResponse(responseCode = "400", ref = "#/components/responses/BadRequest"),
+                    @ApiResponse(responseCode = "401", ref = "#/components/responses/Unauthorized"),
+                    @ApiResponse(responseCode = "403", ref = "#/components/responses/Forbidden"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.CREATED)
     public AccommodationResponseDetail createAccommodation(
             @Valid @ModelAttribute AccommodationRequest accommodationRequest,
@@ -45,6 +71,15 @@ public AccommodationResponseDetail createAccommodation(
 
     @PreAuthorize("hasRole('ADMIN') or @accommodationAccessEvaluator.isOwner(#id, principal.id)")
     @PutMapping(path = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(summary = "Update Accommodation", description = "Update the details of an existing accommodation by its ID.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "Successfully updated accommodation details"),
+                    @ApiResponse(responseCode = "400", ref = "#/components/responses/BadRequest"),
+                    @ApiResponse(responseCode = "401", ref = "#/components/responses/Unauthorized"),
+                    @ApiResponse(responseCode = "403", ref = "#/components/responses/Forbidden"),
+                    @ApiResponse(responseCode = "404", ref = "#/components/responses/AccommodationFound"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.OK)
     public AccommodationResponseDetail updateAccommodation(
             @PathVariable Long id,
@@ -54,6 +89,14 @@ public AccommodationResponseDetail updateAccommodation(
 
     @PreAuthorize("hasRole('ADMIN') or @accommodationAccessEvaluator.isOwner(#id, principal.id)")
     @DeleteMapping("/{id}")
+    @Operation(summary = "Delete Accommodation", description = "Delete an existing accommodation by its ID.",
+            responses = {
+                    @ApiResponse(responseCode = "204", description = "Successfully deleted the accommodation"),
+                    @ApiResponse(responseCode = "401", ref = "#/components/responses/Unauthorized"),
+                    @ApiResponse(responseCode = "403", ref = "#/components/responses/Forbidden"),
+                    @ApiResponse(responseCode = "404", ref = "#/components/responses/AccommodationFound"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public ResponseEntity<Object> deleteAccommodation(@PathVariable Long id){
         accommodationService.deleteAccommodation(id);

src/main/java/com/SleepUp/SU/accommodation/dto/FilterAccommodationDTO.java

@@ -25,5 +25,7 @@ public record FilterAccommodationDTO(
         String location,
 
         LocalDate fromDate,
-        LocalDate toDate
+        LocalDate toDate,
+
+        Boolean petFriendly
 ) {}

src/main/java/com/SleepUp/SU/accommodation/filter/AccommodationFilterController.java

@@ -2,6 +2,9 @@
 
 import com.SleepUp.SU.accommodation.dto.AccommodationResponseSummary;
 import com.SleepUp.SU.accommodation.dto.FilterAccommodationDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -10,6 +13,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+@Tag(name = "Accommodation Filter", description = "Operations related to filtering accommodations")
 @RestController
 @RequestMapping("/accommodations")
 @RequiredArgsConstructor
@@ -18,6 +22,12 @@ public class AccommodationFilterController {
     private final AccommodationFilterService accommodationFilterService;
 
     @GetMapping("/filter")
+    @Operation(summary = "Filter Accommodations", description = "Retrieve a paginated list of accommodations based on filter criteria.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "Successfully retrieved filtered accommodations"),
+                    @ApiResponse(responseCode = "400", ref = "#/components/responses/BadRequest"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.OK)
     public Page<AccommodationResponseSummary> getAllFilteredAccommodationsWithPagination(
             @ModelAttribute @Valid FilterAccommodationDTO filter,
@@ -28,4 +38,4 @@ public Page<AccommodationResponseSummary> getAllFilteredAccommodationsWithPagina
         return accommodationFilterService.getAllFilteredAccommodationsWithPagination(filter, pageable);
     }
 
-}
+}

src/main/java/com/SleepUp/SU/accommodation/filter/AccommodationSpecification.java

@@ -62,30 +62,39 @@ public static Specification<Accommodation> noBookingOverlap(LocalDate newStartDa
                 return null;
             }
 
+            assert query != null;
             Subquery<Long> subquery = query.subquery(Long.class);
             Root<Reservation> reservationRoot = subquery.from(Reservation.class);
             subquery.select(cb.count(reservationRoot));
 
-            // Match reservations for the same accommodation
             Predicate sameAccommodation = cb.equal(reservationRoot.get("accommodation").get("id"), root.get("id"));
 
-            // Exclude cancelled reservations
             Predicate notCancelled = cb.notEqual(reservationRoot.get("bookingStatus"), BookingStatus.CANCELLED);
 
-            // Overlapping date ranges
             Predicate overlap = cb.not(cb.or(
                     cb.greaterThan(reservationRoot.get("checkInDate"), newEndDate),
                     cb.lessThan(reservationRoot.get("checkOutDate"), newStartDate)
             ));
 
-            // Compose subquery where clause: same accommodation AND not cancelled AND overlapping
             subquery.where(cb.and(sameAccommodation, notCancelled, overlap));
 
-            // Main predicate: count of overlapping, non-cancelled reservations must be zero
             return cb.equal(subquery, 0L);
         };
     }
 
+    public static Specification<Accommodation> petFriendly(Boolean petFriendly) {
+        return (root, query, cb) -> {
+            if (petFriendly == null) {
+                return null;
+            }
+            if (petFriendly) {
+                return cb.isTrue(root.get("petFriendly"));
+            } else {
+                return cb.isFalse(root.get("petFriendly"));
+            }
+        };
+    }
+
     public Specification<Accommodation> buildSpecification(FilterAccommodationDTO filter) {
         return Specification.<Accommodation>unrestricted()
                 .and(AccommodationSpecification.hasName(filter.name()))
@@ -94,6 +103,7 @@ public Specification<Accommodation> buildSpecification(FilterAccommodationDTO fi
                 .and(AccommodationSpecification.guestNumber(filter.guestNumber()))
                 .and(AccommodationSpecification.locatedAt(filter.location()))
                 .and(AccommodationSpecification.availableBetween(filter.fromDate(), filter.toDate()))
-                .and(noBookingOverlap(filter.fromDate(), filter.toDate()));
+                .and(noBookingOverlap(filter.fromDate(), filter.toDate()))
+                .and(AccommodationSpecification.petFriendly(filter.petFriendly()));
     }
 }

src/main/java/com/SleepUp/SU/accommodation/owner/AccommodationOwnerController.java

@@ -2,6 +2,9 @@
 
 import com.SleepUp.SU.accommodation.dto.AccommodationResponseSummary;
 import com.SleepUp.SU.user.entity.CustomUserDetails;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -13,6 +16,7 @@
 
 import java.util.List;
 
+@Tag(name = "Accommodation Owner", description = "Operations related to accommodations by owners")
 @RestController
 @RequestMapping("/accommodations")
 @RequiredArgsConstructor
@@ -21,6 +25,13 @@ public class AccommodationOwnerController {
     private final AccommodationOwnerService accommodationOwnerService;
 
     @GetMapping("/me")
+    @Operation(summary = "Get All My Accommodations", description = "Retrieve a list of accommodations owned by the authenticated user.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "Successfully retrieved list of accommodations"),
+                    @ApiResponse(responseCode = "400", ref = "#/components/responses/BadRequest"),
+                    @ApiResponse(responseCode = "403", ref = "#/components/responses/Forbidden"),
+                    @ApiResponse(responseCode = "500", ref = "#/components/responses/InternalServerError")
+            })
     @ResponseStatus(HttpStatus.OK)
     public List<AccommodationResponseSummary> getAllOwnerAccommodations(@AuthenticationPrincipal CustomUserDetails customUserDetails){
         return accommodationOwnerService.getAllAccommodationsByOwnerId(customUserDetails.getId());

src/main/java/com/SleepUp/SU/accommodation/security/AccommodationAccessEvaluator.java

@@ -1,23 +1,22 @@
 package com.SleepUp.SU.accommodation.security;
 
-import com.SleepUp.SU.accommodation.repository.AccommodationRepository;
+import com.SleepUp.SU.accommodation.utils.AccommodationServiceHelper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class AccommodationAccessEvaluator {
-    private final AccommodationRepository accommodationRepository;
+    private final AccommodationServiceHelper accommodationServiceHelper;
 
     public boolean isOwner(Long accommodationId, Long userId) {
-        boolean owner = accommodationRepository.existsByIdAndManagedBy_Id(accommodationId, userId);
+        boolean owner = accommodationServiceHelper.isAccommodationOwnedByUser(accommodationId, userId);
         if (!owner) {
             throw new AccessDeniedException(
-                    "User ID " + userId + " cannot access Accommodation ID " + accommodationId +
-                            ". Only the owner is authorized to access this resource."
+                    "Cause: You are not the owner of this accommodation."
             );
         }
-        return true;
+        return owner;
     }
 }

src/main/java/com/SleepUp/SU/accommodation/utils/AccommodationServiceHelper.java

@@ -28,6 +28,10 @@ public Accommodation getAccommodationEntityById(Long id) {
         return accommodationRepository.findById(id).orElseThrow(() -> new AccommodationNotFoundByIdException(id));
     }
 
+    public boolean isAccommodationOwnedByUser(Long accommodationId, Long userId){
+        return accommodationRepository.existsByIdAndManagedBy_Id(accommodationId, userId);
+    }
+
     public void cloudinaryManagement(AccommodationRequest accommodationRequest, Accommodation accommodationIsExisting) {
         if (accommodationRequest.image() != null && !accommodationRequest.image().isEmpty()) {
             deleteImageCloudinary(accommodationIsExisting.getImageUrl());

src/main/java/com/SleepUp/SU/auth/AuthController.java

@@ -4,7 +4,7 @@
 import com.SleepUp.SU.user.entity.CustomUserDetails;
 import com.SleepUp.SU.user.dto.UserRequest;
 import com.SleepUp.SU.user.dto.UserResponse;
-import com.SleepUp.SU.utils.ApiMessageDto;
+import com.SleepUp.SU.utils.dto.ApiMessageDto;
 import jakarta.mail.MessagingException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;

src/main/java/com/SleepUp/SU/auth/AuthService.java

@@ -10,7 +10,7 @@
 import com.SleepUp.SU.user.dto.UserRequest;
 import com.SleepUp.SU.user.dto.UserResponse;
 import com.SleepUp.SU.user.role.Role;
-import com.SleepUp.SU.utils.ApiMessageDto;
+import com.SleepUp.SU.utils.dto.ApiMessageDto;
 import com.SleepUp.SU.utils.email.EmailServiceHelper;
 import jakarta.mail.MessagingException;
 import jakarta.transaction.Transactional;
@@ -42,11 +42,9 @@ public class AuthService {
 
     @Transactional
     public UserResponse register(UserRequest request) throws MessagingException {
-        userServiceHelper.validateUserDoesNotExist(request.username(), request.email());
-        String encodedPassword = passwordEncoder.encode(request.password());
-        User user = userMapper.toEntity(request, encodedPassword, Role.USER);
-        emailServiceHelper.sendWelcomeEmail(request, user);
-        return userMapper.toResponse(userRepository.save(user));
+        User savedUser = userServiceHelper.createUser(request, Role.USER);
+        emailServiceHelper.sendWelcomeEmail(savedUser);
+        return userMapper.toResponse(savedUser);
     }
 
     public AuthResponse login(LoginRequest loginRequest) {