[EC-53] BE/refactor 회의실 예약 생성 api 리팩토링 및 예외처리 (#43)

devyejin · web-flow · commit ecb3feb38dfb · 2025-03-21T12:39:57.000+09:00
* [EC-53] chore: WIP

* [EC-53] feat: 캠퍼스내 회의실 일치여부 예외 처리

* [EC-53] feat: 예외 처리
diff --git a/api/src/main/java/org/example/educheck/domain/meetingroomreservation/service/MeetingRoomReservationService.java b/api/src/main/java/org/example/educheck/domain/meetingroomreservation/service/MeetingRoomReservationService.java
@@ -1,30 +1,25 @@
 package org.example.educheck.domain.meetingroomreservation.service;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.example.educheck.domain.meetingroom.entity.MeetingRoom;
 import org.example.educheck.domain.meetingroom.repository.MeetingRoomRepository;
-import org.example.educheck.domain.meetingroomreservation.TimeSlot;
 import org.example.educheck.domain.meetingroomreservation.dto.request.MeetingRoomReservationRequestDto;
 import org.example.educheck.domain.meetingroomreservation.entity.MeetingRoomReservation;
 import org.example.educheck.domain.meetingroomreservation.repository.MeetingRoomReservationRepository;
 import org.example.educheck.domain.member.entity.Member;
 import org.example.educheck.domain.member.repository.MemberRepository;
+import org.example.educheck.global.common.exception.custom.common.ResourceMismatchException;
 import org.example.educheck.global.common.exception.custom.common.ResourceNotFoundException;
 import org.example.educheck.global.common.exception.custom.reservation.ReservationConflictException;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.List;
 
-@Slf4j
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
@@ -33,12 +28,11 @@ public class MeetingRoomReservationService {
     private final MeetingRoomReservationRepository meetingRoomReservationRepository;
     private final MemberRepository memberRepository;
     private final MeetingRoomRepository meetingRoomRepository;
-    private final RedisTemplate<String, Object> redisTemplate;
 
     @Transactional
     public void createReservation(UserDetails user, Long campusId, MeetingRoomReservationRequestDto requestDto) {
 
-        Member findMember = memberRepository.findByEmail(user.getUsername()).orElseThrow(() -> new ResourceNotFoundException("존재하지 않는 사용자입니다."));
+        Member findMember = memberRepository.findByEmail(user.getUsername()).orElseThrow(() -> new IllegalArgumentException("존재하지 않는 member입니다."));
 
         MeetingRoom meetingRoom = meetingRoomRepository.findById(requestDto.getMeetingRoomId())
                 .orElseThrow(() -> new ResourceNotFoundException("해당 회의실이 존재하지 않습니다."));
@@ -47,45 +41,13 @@ public void createReservation(UserDetails user, Long campusId, MeetingRoomReserv
 
         validateReservationTime(requestDto.getStartTime(), requestDto.getEndTime());
 
-        TimeSlot timeSlot = TimeSlot.from(requestDto);
 
-        //신버전
-        if (!isAvailable(meetingRoom.getId(), timeSlot)) {
-            throw new ReservationConflictException();
-        }
+        validateReservableTime(meetingRoom, requestDto.getStartTime(), requestDto.getEndTime());
 
-        //RDB에 예약 -> Redis 슬롯 처리
         MeetingRoomReservation meetingRoomReservation = requestDto.toEntity(findMember, meetingRoom);
         meetingRoomReservationRepository.save(meetingRoomReservation);
-
-        updateRedisSlots(meetingRoom.getId(), timeSlot, true);
-
-        log.info("createReservation 메서드, 예약 성공");
-    }
-
-    private void updateRedisSlots(Long roomId, TimeSlot timeSlot, boolean isReserved) {
-
-        String redisKey = generateSlotKey(roomId, timeSlot.getDate());
-
-        Boolean[] slots = (Boolean[]) redisTemplate.opsForValue().get(redisKey);
-
-        if (slots == null) {
-            initDailyReservationsSlots(timeSlot.getDate());
-            slots = (Boolean[]) redisTemplate.opsForValue().get(redisKey);
-        }
-
-        int startSlotIndex = calculateSlotIndex(timeSlot.getStartTime());
-        int endSlotIndex = calculateSlotIndex(timeSlot.getEndTime());
-
-        for (int i = startSlotIndex; i <= endSlotIndex; i++) {
-            slots[i] = isReserved;
-        }
-
-        redisTemplate.opsForValue().set(redisKey, slots);
-
     }
 
-
     /**
      * 예약은 9시부터 22시까지 가능
      */
@@ -96,84 +58,38 @@ private void validateReservationTime(LocalDateTime startTime, LocalDateTime endT
 
 
         if (endTime.isBefore(startTime)) {
-            throw new IllegalArgumentException("시작 시간이 종료 시간보다 늦을 수 없습니다.");
+            throw new ReservationConflictException("시작 시간이 종료 시간보다 늦을 수 없습니다.");
         }
 
         if (startTime.isAfter(endTime)) {
-            throw new IllegalArgumentException("종료 시간이 시작 시간보다 빠를 수 없습니다.");
+            throw new ReservationConflictException("종료 시간이 시작 시간보다 빠를 수 없습니다.");
         }
 
         if (ChronoUnit.MINUTES.between(startTime, endTime) < 15) {
-            throw new IllegalArgumentException("최소 예약 시간은 15분입니다.");
+            throw new ReservationConflictException("최소 예약 시간은 15분입니다.");
         }
 
         if (startTime.toLocalTime().isBefore(startOfDay) || endTime.toLocalTime().isAfter(endOfDay)) {
-            throw new IllegalArgumentException("예약 가능 시간은 오전 9시부터 오후 10시까지입니다.");
+            throw new ReservationConflictException("예약 가능 시간은 오전 9시부터 오후 10시까지입니다.");
         }
 
     }
 
+    private void validateReservableTime(MeetingRoom meetingRoom, LocalDateTime startTime, LocalDateTime endTime) {
+        LocalDate date = startTime.toLocalDate();
+        boolean result = meetingRoomReservationRepository.existsOverlappingReservation(meetingRoom,
+                date, startTime, endTime);
 
-    //TODO: 쿼리 발생하는거 확인 후, FETCH JOIN 처리 등 고려 하기
-    private void validateUserCampusMatchMeetingRoom(Long campusId, MeetingRoom meetingRoom) {
-
-        if (!campusId.equals(meetingRoom.getCampusId())) {
-            throw new IllegalArgumentException("해당 회의실은 캠퍼스내 회의실이 아닙니다.");
-        }
-    }
-
-    private String generateSlotKey(Long roomId, LocalDate date) {
-        return String.format("mettingRoom:%d:date:%s", roomId, date.format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-    }
-
-    private int calculateSlots(int startHour, int endHour, int slotDurationMinutes) {
-        int totalMinutes = (endHour - startHour) * 60;
-        return totalMinutes / slotDurationMinutes;
-
-    }
-
-    private void initDailyReservationsSlots(LocalDate date) {
-        List<MeetingRoom> roomList = meetingRoomRepository.findAll();
-
-        for (MeetingRoom room : roomList) {
-            String redisKey = generateSlotKey(room.getId(), date);
-
-            int slotsCount = calculateSlots(9, 22, 15);
-            Boolean[] slots = new Boolean[slotsCount];
-            for (int i = 0; i < slotsCount; i++) {
-                slots[i] = false;
-            }
-
-            redisTemplate.opsForValue().set(redisKey, slots);
+        if (result) {
+            throw new ReservationConflictException();
         }
     }
 
-    public boolean isAvailable(Long meetingRoomId, TimeSlot timeSlot) {
-        String redisKey = generateSlotKey(meetingRoomId, timeSlot.getDate());
-        Boolean[] slots = (Boolean[]) redisTemplate.opsForValue().get(redisKey);
-
-        if (slots == null) {
-            initDailyReservationsSlots(timeSlot.getDate());
-            slots = (Boolean[]) redisTemplate.opsForValue().get(redisKey);
-        }
-
-        int startSlotIndex = calculateSlotIndex(timeSlot.getStartTime());
-        int endSlotIndex = calculateSlotIndex(timeSlot.getStartTime());
+    //TODO: 쿼리 발생하는거 확인 후, FETCH JOIN 처리 등 고려 하기
+    private void validateUserCampusMatchMeetingRoom(Long campusId, MeetingRoom meetingRoom) {
 
-        for (int i = startSlotIndex; i <= endSlotIndex; i++) {
-            if (slots[i]) {
-                return false;
-            }
+        if (!campusId.equals(meetingRoom.getCampusId())) {
+            throw new ResourceMismatchException("해당 회의실은 캠퍼스내 회의실이 아닙니다.");
         }
-
-        return true;
-    }
-
-    private int calculateSlotIndex(LocalTime localTime) {
-        int hour = localTime.getHour();
-        int minute = localTime.getMinute();
-
-        return (hour - 9) * 4 + (minute / 15);
-
     }
 }
diff --git a/api/src/main/java/org/example/educheck/global/common/config/RedisConfig.java b/api/src/main/java/org/example/educheck/global/common/config/RedisConfig.java
@@ -1,5 +1,6 @@
 package org.example.educheck.global.common.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -34,10 +35,19 @@ public RedisTemplate<String, Object> redisTemplate() {
         RedisTemplate<String, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
 
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.activateDefaultTyping(
+                objectMapper.getPolymorphicTypeValidator(),
+                ObjectMapper.DefaultTyping.NON_FINAL
+        );
+
+        GenericJackson2JsonRedisSerializer serializer = new GenericJackson2JsonRedisSerializer(objectMapper);
+
+        template.setValueSerializer(serializer);
+        template.setHashValueSerializer(serializer);
         template.setHashKeySerializer(new StringRedisSerializer());
-        template.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
+        template.setKeySerializer(new StringRedisSerializer());
+        template.afterPropertiesSet();
 
         return template;
     }
diff --git a/api/src/main/java/org/example/educheck/global/common/exception/ErrorCode.java b/api/src/main/java/org/example/educheck/global/common/exception/ErrorCode.java
@@ -10,15 +10,17 @@ public enum ErrorCode {
 
     //0000 회원
     //1000 예약
+    RESERVATION_CONFLICT(HttpStatus.CONFLICT, "2000", "해당 시간에는 이미 예약이 있습니다. 다른 시간을 선택해주세요."),
+
     //2000 
 
-    //예시 2개
-    RESERVATION_CONFLICT(HttpStatus.CONFLICT, "6000", "해당 시간에는 이미 예약이 있습니다."),
+    //예시
     MEETINGROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "3000", "회의실을 찾을 수 없습니다."),
 
     //4000 5000 공통
     INVALID_INPUT(HttpStatus.BAD_REQUEST, "4000", "입력값이 올바르지 않습니다."),
     RESOURCE_NOT_FOUND(HttpStatus.NOT_FOUND, "4004", "해당 리소스가 존재하지 않습니다."),
+    MISMATCHED_RESOURCE(HttpStatus.BAD_REQUEST, "4008", "요청한 리소스가 일치하지 않습니다.")
     UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "4010", "인증에 실패했습니다.");
 
     private final HttpStatus status;
diff --git a/api/src/main/java/org/example/educheck/global/common/exception/custom/common/ResourceMismatchException.java b/api/src/main/java/org/example/educheck/global/common/exception/custom/common/ResourceMismatchException.java
@@ -0,0 +1,18 @@
+package org.example.educheck.global.common.exception.custom.common;
+
+
+import org.example.educheck.global.common.exception.ErrorCode;
+
+public class ResourceMismatchException extends GlobalException {
+    public ResourceMismatchException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+
+    public ResourceMismatchException(String customMessage) {
+        super(ErrorCode.MISMATCHED_RESOURCE, customMessage);
+    }
+
+    public ResourceMismatchException() {
+        super(ErrorCode.MISMATCHED_RESOURCE, ErrorCode.MISMATCHED_RESOURCE.getMessage());
+    }
+}
diff --git a/api/src/main/java/org/example/educheck/global/common/exception/custom/reservation/ReservationConflictException.java b/api/src/main/java/org/example/educheck/global/common/exception/custom/reservation/ReservationConflictException.java
@@ -9,6 +9,10 @@ public ReservationConflictException(ErrorCode errorCode) {
     }
 
     public ReservationConflictException() {
-        super(ErrorCode.RESERVATION_CONFLICT, ErrorCode.RESERVATION_CONFLICT.getMessage());
+        super(ErrorCode.RESERVATION_CONFLICT);
+    }
+
+    public ReservationConflictException(String customMessage) {
+        super(ErrorCode.RESERVATION_CONFLICT, customMessage);
     }
 }
diff --git a/api/src/main/java/org/example/educheck/global/security/config/SecurityConfig.java b/api/src/main/java/org/example/educheck/global/security/config/SecurityConfig.java
@@ -33,7 +33,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .sessionManagement(session -> session
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(auth -> auth
-                                .requestMatchers("/**").permitAll()
+                                .requestMatchers("/api/auth/login", "/api/auth/signup").permitAll()
+                                .anyRequest().authenticated()
                         // TODO: 인증 엔드포인트 수정
                 )
                 // TODO: 비밀번호 예외처리
diff --git a/api/src/main/java/org/example/educheck/global/security/jwt/JwtTokenUtil.java b/api/src/main/java/org/example/educheck/global/security/jwt/JwtTokenUtil.java
@@ -71,7 +71,7 @@ public String createRefreshToken(Authentication authentication) {
     }
 
     public String createAccessToken(Authentication authentication) {
-        long accessTokenValidityMilliSeconds = 1000L * 60 * 60;
+        long accessTokenValidityMilliSeconds = 1000L * 60 * 60 * 24 * 7; // 개발 7일
 
         return createToken(authentication, accessTokenValidityMilliSeconds);
     }
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
@@ -10,3 +10,4 @@ spring.docker.compose.lifecycle-management=start-and-stop
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
 jwt.secret=${JWT_SECRET}
+logging.level.org.springframework.security=DEBUG
diff --git a/api/src/test/java/org/example/educheck/domain/meetingroomreservation/http.http b/api/src/test/java/org/example/educheck/domain/meetingroomreservation/http.http
@@ -3,13 +3,13 @@ GET https://examples.http-client.intellij.net/get
     ?generated-in=IntelliJ IDEA
 
 ###
-POST http://localhost:8080/api/campuses/17/meeting-rooms/reservations
+POST http://localhost:8080/api/campuses/1/meeting-rooms/reservations
 Content-Type: application/json
-Authorization: eyJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3NDI0MDQzNTcsImV4cCI6MTc0MjQwNDQxN30.P2eXpnR_dDaoqRVu2AdZoLmprZru_IXKNGdBispM3BY
+Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0ZXN0QG5hdmVyLmNvbSIsInJvbGVzIjpbIlNUVURFTlQiXSwiaWF0IjoxNzQyNDkyMTgxLCJleHAiOjE3NDI0OTU3ODF9.fgPPSxZZMWZvD1CmcIE1sYc4AdbIkXBp6EO
 
 {
   "startTime": "2025-03-20T09:00:00",
   "endTime": "2025-03-20T10:00:00",
-  "meetingRoomId": 60,
-  "courseId": 1
+  "meetingRoomId": 2,
+  "courseId": 5
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,10 @@ public ReservationConflictException(ErrorCode errorCode) {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public ReservationConflictException() {`
`12`		`- super(ErrorCode.RESERVATION_CONFLICT, ErrorCode.RESERVATION_CONFLICT.getMessage());`
	`12`	`+ super(ErrorCode.RESERVATION_CONFLICT);`
	`13`	`+ }`
	`14`	`+`
	`15`	`+ public ReservationConflictException(String customMessage) {`
	`16`	`+ super(ErrorCode.RESERVATION_CONFLICT, customMessage);`
`13`	`17`	`}`
`14`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public String createRefreshToken(Authentication authentication) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public String createAccessToken(Authentication authentication) {`
`74`		`- long accessTokenValidityMilliSeconds = 1000L * 60 * 60;`
	`74`	`+ long accessTokenValidityMilliSeconds = 1000L * 60 * 60 * 24 * 7; // 개발 7일`
`75`	`75`
`76`	`76`	`return createToken(authentication, accessTokenValidityMilliSeconds);`
`77`	`77`	`}`