Merge pull request #301 from ASAP-as-soon-as-possible/develop

1.2.1

README.md

@@ -4,7 +4,7 @@
 ![image](https://github.com/user-attachments/assets/5ab65502-bdc4-4ab1-955b-9b23c9c5498f)
 
 
-ASAP은선호도 분석을 통해 최대 인원이 참석 가능한 회의시간을 자동으로 결정해 줌으로써, **다수가 시간을 조율하며 딜레이되는 시간을 줄여주는 서비스** 입니다.
+ASAP은 선호도 분석을 통해 최대 인원이 참석 가능한 회의시간을 자동으로 결정해 줌으로써, **다수가 시간을 조율하며 딜레이되는 시간을 줄여주는 서비스** 입니다.
 
 회의 관련 정보를 하나의 큐카드로 정리해 제공함으로써 회의 시간 외 추가 공지사항을 단톡방에 올리는 수고로움 또한 덜어주고자 합니다.
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'com.asap'
-version = '1.2.0'
+version = '1.2.1'
 
 java {
     sourceCompatibility = '17'

src/main/java/com/asap/server/persistence/domain/enums/TimeSlot.java

@@ -14,47 +14,48 @@
 @AllArgsConstructor
 @Getter
 public enum TimeSlot {
-    SLOT_6_00("06:00"),
-    SLOT_6_30("06:30"),
-    SLOT_7_00("07:00"),
-    SLOT_7_30("07:30"),
-    SLOT_8_00("08:00"),
-    SLOT_8_30("08:30"),
-    SLOT_9_00("09:00"),
-    SLOT_9_30("09:30"),
-    SLOT_10_00("10:00"),
-    SLOT_10_30("10:30"),
-    SLOT_11_00("11:00"),
-    SLOT_11_30("11:30"),
-    SLOT_12_00("12:00"),
-    SLOT_12_30("12:30"),
-    SLOT_13_00("13:00"),
-    SLOT_13_30("13:30"),
-    SLOT_14_00("14:00"),
-    SLOT_14_30("14:30"),
-    SLOT_15_00("15:00"),
-    SLOT_15_30("15:30"),
-    SLOT_16_00("16:00"),
-    SLOT_16_30("16:30"),
-    SLOT_17_00("17:00"),
-    SLOT_17_30("17:30"),
-    SLOT_18_00("18:00"),
-    SLOT_18_30("18:30"),
-    SLOT_19_00("19:00"),
-    SLOT_19_30("19:30"),
-    SLOT_20_00("20:00"),
-    SLOT_20_30("20:30"),
-    SLOT_21_00("21:00"),
-    SLOT_21_30("21:30"),
-    SLOT_22_00("22:00"),
-    SLOT_22_30("22:30"),
-    SLOT_23_00("23:00"),
-    SLOT_23_30("23:30"),
-    SLOT_24_00("24:00");
+    SLOT_6_00("06:00", 0),
+    SLOT_6_30("06:30", 1),
+    SLOT_7_00("07:00", 2),
+    SLOT_7_30("07:30", 3),
+    SLOT_8_00("08:00", 4),
+    SLOT_8_30("08:30", 5),
+    SLOT_9_00("09:00", 6),
+    SLOT_9_30("09:30", 7),
+    SLOT_10_00("10:00", 8),
+    SLOT_10_30("10:30", 9),
+    SLOT_11_00("11:00", 10),
+    SLOT_11_30("11:30", 11),
+    SLOT_12_00("12:00", 12),
+    SLOT_12_30("12:30", 13),
+    SLOT_13_00("13:00", 14),
+    SLOT_13_30("13:30", 15),
+    SLOT_14_00("14:00", 16),
+    SLOT_14_30("14:30", 17),
+    SLOT_15_00("15:00", 18),
+    SLOT_15_30("15:30", 19),
+    SLOT_16_00("16:00", 20),
+    SLOT_16_30("16:30", 21),
+    SLOT_17_00("17:00", 22),
+    SLOT_17_30("17:30", 23),
+    SLOT_18_00("18:00", 24),
+    SLOT_18_30("18:30", 25),
+    SLOT_19_00("19:00", 26),
+    SLOT_19_30("19:30", 27),
+    SLOT_20_00("20:00", 28),
+    SLOT_20_30("20:30", 29),
+    SLOT_21_00("21:00", 30),
+    SLOT_21_30("21:30", 31),
+    SLOT_22_00("22:00", 32),
+    SLOT_22_30("22:30", 33),
+    SLOT_23_00("23:00", 34),
+    SLOT_23_30("23:30", 35),
+    SLOT_24_00("24:00", 36);
 
     @Getter
     @JsonValue
     private final String time;
+    private final int index;
 
     //유저 가능 Time Slot 을 start 부터 end 까지 추가
     public static List<TimeSlot> getTimeSlots(int start, int end) {

src/main/java/com/asap/server/service/MeetingService.java

@@ -3,8 +3,21 @@
 import static com.asap.server.common.exception.Error.INVALID_MEETING_HOST_EXCEPTION;
 import static com.asap.server.common.exception.Error.MEETING_VALIDATION_FAILED_EXCEPTION;
 
-import com.asap.server.common.utils.DateUtil;
+import com.asap.server.common.exception.Error;
+import com.asap.server.common.exception.model.ConflictException;
+import com.asap.server.common.exception.model.ForbiddenException;
+import com.asap.server.common.exception.model.NotFoundException;
+import com.asap.server.common.exception.model.UnauthorizedException;
 import com.asap.server.common.jwt.JwtService;
+import com.asap.server.common.utils.DateUtil;
+import com.asap.server.persistence.domain.ConfirmedDateTime;
+import com.asap.server.persistence.domain.Meeting;
+import com.asap.server.persistence.domain.Place;
+import com.asap.server.persistence.domain.User;
+import com.asap.server.persistence.domain.enums.Role;
+import com.asap.server.persistence.repository.meeting.MeetingRepository;
+import com.asap.server.persistence.repository.timeblock.TimeBlockRepository;
+import com.asap.server.persistence.repository.timeblock.dto.TimeBlockDto;
 import com.asap.server.presentation.controller.dto.request.MeetingConfirmRequestDto;
 import com.asap.server.presentation.controller.dto.request.MeetingSaveRequestDto;
 import com.asap.server.presentation.controller.dto.response.AvailableDatesDto;
@@ -14,20 +27,7 @@
 import com.asap.server.presentation.controller.dto.response.MeetingScheduleResponseDto;
 import com.asap.server.presentation.controller.dto.response.MeetingTitleResponseDto;
 import com.asap.server.presentation.controller.dto.response.TimeTableResponseDto;
-import com.asap.server.persistence.domain.ConfirmedDateTime;
-import com.asap.server.persistence.domain.Meeting;
-import com.asap.server.persistence.domain.Place;
-import com.asap.server.persistence.domain.User;
-import com.asap.server.persistence.domain.enums.Role;
-import com.asap.server.common.exception.Error;
-import com.asap.server.common.exception.model.ConflictException;
-import com.asap.server.common.exception.model.ForbiddenException;
-import com.asap.server.common.exception.model.NotFoundException;
-import com.asap.server.common.exception.model.UnauthorizedException;
-import com.asap.server.persistence.repository.meeting.MeetingRepository;
-import com.asap.server.persistence.repository.timeblock.TimeBlockRepository;
-import com.asap.server.persistence.repository.timeblock.dto.TimeBlockDto;
-import com.asap.server.service.meeting.MeetingTimeRecommendService;
+import com.asap.server.service.meeting.recommend.MeetingTimeRecommendService;
 import com.asap.server.service.vo.BestMeetingTimeVo;
 import com.asap.server.service.vo.BestMeetingTimeWithUsersVo;
 import java.time.LocalDate;