예약 관련 API 구현

.github/workflows/deploy-prod.yml

@@ -136,7 +136,7 @@ jobs:
             set -e
 
             echo "🩺 Checking Application Health..."
-            RESPONSE=\$(curl -s "https://${{ secrets.PROD_SERVER_URL }}/")
+            RESPONSE=\$(curl -s "https://${{ secrets.PROD_SERVER_URL }}/health")
 
             if [ "\$RESPONSE" = "OK" ]; then
               echo "DEPLOYMENT_STATUS=successful"

build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-mail")
 	implementation("org.springframework.boot:spring-boot-starter-validation")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
+	implementation("org.springframework.boot:spring-boot-starter-cache")
 
 	/** AOP */
 	implementation("org.aspectj:aspectjweaver:1.9.19")
@@ -49,6 +50,9 @@ dependencies {
 	runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.5.1")
 	runtimeOnly("com.h2database:h2:2.3.232")
 
+	/** Cache */
+	implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
+
 	/** QueryDSL */
 	implementation("com.querydsl:querydsl-jpa:5.1.0:jakarta")
 	annotationProcessor("com.querydsl:querydsl-apt:5.1.0:jakarta")

src/main/java/com/ampersand/groom/domain/auth/application/service/AuthService.java

@@ -1,9 +1,10 @@
 package com.ampersand.groom.domain.auth.application.service;
 
 import com.ampersand.groom.domain.auth.application.port.AuthPort;
-import com.ampersand.groom.domain.auth.expection.*;
 import com.ampersand.groom.domain.auth.domain.JwtToken;
+import com.ampersand.groom.domain.auth.expection.*;
 import com.ampersand.groom.domain.auth.presentation.data.request.SignupRequest;
+import com.ampersand.groom.domain.member.domain.constant.MemberRole;
 import com.ampersand.groom.domain.member.persistence.entity.MemberJpaEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,18 +30,18 @@ public class AuthService {
     public JwtToken signIn(String email, String password) {
 
         MemberJpaEntity user = authPort.findMembersByCriteria(email)
-                .orElseThrow(()->new UserNotFoundException());
+                .orElseThrow(() -> new UserNotFoundException());
 
-        if(!user.getIsAvailable()) {
+        if (!user.getIsAvailable()) {
             throw new UserForbiddenException();
         }
 
         if (!passwordEncoder.matches(password, user.getPassword())) {
             throw new PasswordInvalidException();
         }
 
-        String accessToken = jwtService.createAccessToken(email);
-        String refreshToken = jwtService.createRefreshToken(email);
+        String accessToken = jwtService.createAccessToken(email, user.getRole());
+        String refreshToken = jwtService.createRefreshToken(email, user.getRole());
 
         return JwtToken.builder()
                 .accessToken(accessToken)
@@ -67,10 +68,10 @@ public JwtToken refreshToken(String refreshToken) {
         }
 
         MemberJpaEntity user = authPort.findMembersByCriteria(email)
-                .orElseThrow(()->new UserNotFoundException());
+                .orElseThrow(() -> new UserNotFoundException());
 
-        String newAccessToken = jwtService.createAccessToken(email);
-        String newRefreshToken = jwtService.createRefreshToken(email);
+        String newAccessToken = jwtService.createAccessToken(email, user.getRole());
+        String newRefreshToken = jwtService.createRefreshToken(email, user.getRole());
 
         return JwtToken.builder()
                 .accessToken(newAccessToken)
@@ -93,6 +94,7 @@ public void signup(SignupRequest request) {
                 .password(passwordEncoder.encode(request.getPassword()))
                 .generation(1)
                 .isAvailable(true)
+                .role(MemberRole.ROLE_STUDENT)
                 .build();
 
         authPort.save(newUser);

src/main/java/com/ampersand/groom/domain/auth/application/service/JwtService.java

@@ -1,9 +1,11 @@
 package com.ampersand.groom.domain.auth.application.service;
 
+import com.ampersand.groom.domain.member.domain.constant.MemberRole;
 import io.jsonwebtoken.*;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -21,33 +23,29 @@ public class JwtService {
     private final long accessTokenExpiration;
     private final long refreshTokenExpiration;
 
-    public String createAccessToken(String email) {
-        return generateToken(email, accessTokenExpiration);
+    public String createAccessToken(String email, MemberRole roles) {
+        return generateToken(email, accessTokenExpiration, roles);
     }
 
-    public String createRefreshToken(String email) {
-        String refreshToken = generateToken(email, refreshTokenExpiration);
-
+    public String createRefreshToken(String email, MemberRole roles) {
+        String refreshToken = generateToken(email, refreshTokenExpiration, roles);
         redisTemplate.opsForValue().set("refresh_token:" + email, refreshToken, refreshTokenExpiration, TimeUnit.SECONDS);
-
         return refreshToken;
     }
 
     public boolean refreshToken(String email, String refreshToken) {
         String storedToken = redisTemplate.opsForValue().get("refresh_token:" + email);
 
-        if (storedToken == null || !storedToken.equals(refreshToken)) {
-            return false;
-        }
-        return true;
+        return storedToken != null && storedToken.equals(refreshToken);
     }
 
-    private String generateToken(String subject, long expirationMs) {
+    private String generateToken(String subject, long expirationMs, MemberRole roles) {
         Date now = new Date();
         return Jwts.builder()
-                .setSubject(subject)
-                .setIssuedAt(now)
-                .setExpiration(new Date(now.getTime() + expirationMs))
+                .claim("sub", subject)
+                .claim("iat", now.getTime())
+                .claim("exp", now.getTime() + expirationMs)
+                .claim("role", roles)
                 .signWith(secretKey)
                 .compact();
     }
@@ -56,6 +54,12 @@ public String getEmailFromToken(String token) {
         return parseClaims(token).getSubject();
     }
 
+    public MemberRole getRoleFromToken(String token) {
+        Claims claims = parseClaims(token);
+        String role = claims.get("role", String.class);
+        return role != null ? MemberRole.valueOf(role) : null;
+    }
+
     public boolean validateToken(String token) {
         try {
             parseClaims(token);
@@ -67,10 +71,10 @@ public boolean validateToken(String token) {
 
     private Claims parseClaims(String token) {
         return Jwts.parser()
-                .setSigningKey(secretKey)
+                .verifyWith(secretKey)
                 .build()
-                .parseClaimsJws(token)
-                .getBody();
+                .parseSignedClaims(token)
+                .getPayload();
     }
 
     public String resolveToken(HttpServletRequest request) {

src/main/java/com/ampersand/groom/domain/booking/application/BookingApplicationAdapter.java

@@ -0,0 +1,48 @@
+package com.ampersand.groom.domain.booking.application;
+
+import com.ampersand.groom.domain.booking.application.port.BookingApplicationPort;
+import com.ampersand.groom.domain.booking.application.usecase.*;
+import com.ampersand.groom.domain.booking.presentation.data.response.GetBookingResponse;
+import com.ampersand.groom.domain.booking.presentation.data.response.GetPlaceResponse;
+import com.ampersand.groom.global.annotation.adapter.Adapter;
+import com.ampersand.groom.global.annotation.adapter.constant.AdapterType;
+import lombok.RequiredArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Adapter(AdapterType.INBOUND)
+@RequiredArgsConstructor
+public class BookingApplicationAdapter implements BookingApplicationPort {
+
+    private final FindPlaceByBookingAvailabilityUseCase findPlaceByBookingAvailabilityUseCase;
+    private final FindBookingByDateAndTimeAndPlaceUseCase findBookingByDateAndTimeAndPlaceUseCase;
+    private final CreateBookingUseCase createBookingUseCase;
+    private final UpdateBookingUseCase updateBookingUseCase;
+    private final DeleteBookingUseCase deleteBookingUseCase;
+
+    @Override
+    public List<GetPlaceResponse> findPlaceByBookingAvailability(LocalDate date, String time, String placeType) {
+        return findPlaceByBookingAvailabilityUseCase.execute(date, time, placeType);
+    }
+
+    @Override
+    public List<GetBookingResponse> findBookingByDateAndTimeAndPlace(LocalDate date, String time, String place) {
+        return findBookingByDateAndTimeAndPlaceUseCase.execute(date, time, place);
+    }
+
+    @Override
+    public void createBooking(String time, String place, List<Long> participants) {
+        createBookingUseCase.execute(time, place, participants);
+    }
+
+    @Override
+    public void updateBooking(Long id, String time, String place, List<Long> participants) {
+        updateBookingUseCase.execute(id, time, place, participants);
+    }
+
+    @Override
+    public void deleteBooking(Long id) {
+        deleteBookingUseCase.execute(id);
+    }
+}

src/main/java/com/ampersand/groom/domain/booking/application/port/BookingApplicationPort.java

@@ -0,0 +1,19 @@
+package com.ampersand.groom.domain.booking.application.port;
+
+import com.ampersand.groom.domain.booking.presentation.data.response.GetBookingResponse;
+import com.ampersand.groom.domain.booking.presentation.data.response.GetPlaceResponse;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public interface BookingApplicationPort {
+    List<GetPlaceResponse> findPlaceByBookingAvailability(LocalDate date, String time, String placeType);
+
+    List<GetBookingResponse> findBookingByDateAndTimeAndPlace(LocalDate date, String time, String place);
+
+    void createBooking(String time, String place, List<Long> participants);
+
+    void updateBooking(Long id, String time, String place, List<Long> participants);
+
+    void deleteBooking(Long id);
+}

src/main/java/com/ampersand/groom/domain/booking/application/port/BookingPersistencePort.java

@@ -0,0 +1,19 @@
+package com.ampersand.groom.domain.booking.application.port;
+
+import com.ampersand.groom.domain.booking.domain.Booking;
+import com.ampersand.groom.domain.member.domain.Member;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public interface BookingPersistencePort {
+    List<Booking> findBookingByDateAndTimeAndPlace(LocalDate date, String time, String place);
+
+    Booking findBookingByIdWithLock(Long bookingId);
+
+    Boolean ExistsBookingByDateAndTimeAndPlace(LocalDate date, String time, String place);
+
+    void saveBooking(Booking booking);
+
+    void deleteBookingById(Long bookingId);
+}

src/main/java/com/ampersand/groom/domain/booking/application/port/PlacePersistencePort.java

@@ -0,0 +1,10 @@
+package com.ampersand.groom.domain.booking.application.port;
+
+import com.ampersand.groom.domain.booking.domain.Place;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public interface PlacePersistencePort {
+    List<Place> findPlaceByBookingAvailability(LocalDate date, String time, String placeType);
+}

src/main/java/com/ampersand/groom/domain/booking/application/port/TimeSlotPersistencePort.java

@@ -0,0 +1,9 @@
+package com.ampersand.groom.domain.booking.application.port;
+
+import com.ampersand.groom.domain.booking.domain.TimeSlot;
+
+import java.util.List;
+
+public interface TimeSlotPersistencePort {
+    List<TimeSlot> findAllTimeSlots();
+}

src/main/java/com/ampersand/groom/domain/booking/application/usecase/CreateBookingUseCase.java

@@ -0,0 +1,59 @@
+package com.ampersand.groom.domain.booking.application.usecase;
+
+import com.ampersand.groom.domain.booking.application.port.BookingPersistencePort;
+import com.ampersand.groom.domain.booking.application.port.TimeSlotPersistencePort;
+import com.ampersand.groom.domain.booking.domain.Booking;
+import com.ampersand.groom.domain.booking.domain.TimeSlot;
+import com.ampersand.groom.domain.booking.exception.DuplicateBookingException;
+import com.ampersand.groom.domain.booking.exception.InvalidBookingParticipantsException;
+import com.ampersand.groom.domain.booking.exception.InvalidBookingInfomationException;
+import com.ampersand.groom.domain.booking.exception.MaxCapacityExceededException;
+import com.ampersand.groom.domain.member.application.port.MemberPersistencePort;
+import com.ampersand.groom.domain.member.domain.Member;
+import com.ampersand.groom.global.annotation.usecase.UseCaseWithTransaction;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.time.LocalDate;
+import java.util.*;
+
+@UseCaseWithTransaction
+@RequiredArgsConstructor
+public class CreateBookingUseCase {
+
+    private final MemberPersistencePort memberPersistencePort;
+    private final BookingPersistencePort bookingPersistencePort;
+    private final TimeSlotPersistencePort timeSlotPersistencePort;
+
+    public void execute(String time, String place, List<Long> participants) {
+        List<TimeSlot> availableTimeSlots = timeSlotPersistencePort.findAllTimeSlots();
+        TimeSlot selectedTimeSlot = availableTimeSlots.stream()
+                .filter(timeSlot -> timeSlot.getPlace().getPlaceName().equals(place))
+                .filter(timeSlot -> timeSlot.getTimeSlotId().timeLabel().equals(time))
+                .findAny()
+                .orElseThrow(InvalidBookingInfomationException::new);
+        if(selectedTimeSlot.getPlace().getMaxCapacity() < participants.size() + 1) {
+            throw new MaxCapacityExceededException();
+        }
+        bookingPersistencePort.findBookingByDateAndTimeAndPlace(LocalDate.now(), selectedTimeSlot.getTimeSlotId().timeLabel(), place)
+                .stream()
+                .findAny()
+                .ifPresent(booking -> {
+                    throw new DuplicateBookingException();
+                });
+        List<Member> participantEntities = memberPersistencePort.findMembersByIds(participants);
+        String email = SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString();
+        Member president = memberPersistencePort.findMemberByEmail(email);
+        if (participantEntities.size() != participants.size() ||
+                participantEntities.stream().anyMatch(member -> member.getId().equals(president.getId()))) {
+            throw new InvalidBookingParticipantsException();
+        }
+        Booking newBooking = Booking.builder()
+                .bookingDate(LocalDate.now())
+                .timeSlot(selectedTimeSlot)
+                .president(president)
+                .participants(participantEntities)
+                .build();
+        bookingPersistencePort.saveBooking(newBooking);
+    }
+}

src/main/java/com/ampersand/groom/domain/booking/application/usecase/DeleteBookingUseCase.java

@@ -0,0 +1,23 @@
+package com.ampersand.groom.domain.booking.application.usecase;
+
+import com.ampersand.groom.domain.booking.application.port.BookingPersistencePort;
+import com.ampersand.groom.domain.booking.domain.Booking;
+import com.ampersand.groom.domain.booking.exception.NotBookingPresidentException;
+import com.ampersand.groom.global.annotation.usecase.UseCaseWithTransaction;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+@UseCaseWithTransaction
+@RequiredArgsConstructor
+public class DeleteBookingUseCase {
+
+    private final BookingPersistencePort bookingPersistencePort;
+
+    public void execute(Long bookingId) {
+        Booking booking = bookingPersistencePort.findBookingByIdWithLock(bookingId);
+        if (!booking.getPresident().getEmail().equals(SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString())) {
+            throw new NotBookingPresidentException();
+        }
+        bookingPersistencePort.deleteBookingById(bookingId);
+    }
+}

src/main/java/com/ampersand/groom/domain/booking/application/usecase/FindBookingByDateAndTimeAndPlaceUseCase.java

@@ -0,0 +1,24 @@
+package com.ampersand.groom.domain.booking.application.usecase;
+
+import com.ampersand.groom.domain.booking.persistence.BookingPersistenceAdapter;
+import com.ampersand.groom.domain.booking.persistence.mapper.BookingMapper;
+import com.ampersand.groom.domain.booking.presentation.data.response.GetBookingResponse;
+import com.ampersand.groom.global.annotation.usecase.UseCaseWithReadOnlyTransaction;
+import lombok.RequiredArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@RequiredArgsConstructor
+@UseCaseWithReadOnlyTransaction
+public class FindBookingByDateAndTimeAndPlaceUseCase {
+
+    private final BookingPersistenceAdapter bookingPersistenceAdapter;
+    private final BookingMapper bookingMapper;
+
+    public List<GetBookingResponse> execute(LocalDate date, String time, String place) {
+        return bookingPersistenceAdapter.findBookingByDateAndTimeAndPlace(date, time, place).stream()
+                .map(bookingMapper::toResponse)
+                .toList();
+    }
+}