🩹 [STMT-62] 스터디 도메인 누락된 컬럼들 추가 (#109)

* 🩹 [STMT-62] 스터디 도메인 누락된 컬럼 추가 - 정기모임 시간 - 정기모임 반복 * 🩹 [STMT-62] 스터디 상세 정보 조회 api - 누락된 정보 반환 응답에 추가 * 🩹 [STMT-62] sql - table `study` ddl 수정 및 dummy data 수정 * 🚧 [STMT-62] 리뷰반영: 클래스 단에 트랜잭션 어노테이션 추가 * 🚧 [STMT-62] 리뷰반영: 모임 반복 mapping 로직 mapper에 위임 - repeat는 한번 반복 한다는 의미가 있어 명사형의 여러번 반복한다는 뜻을 가진 repetition으로 클래스명 변경 - MeetingRepetitionPersistenceMapper 클래스를 구현하여 해당 클래스에서 Repetition을 mapping하는 로직 구현 * 🎨 [STMT-62] StudyPersistenceMapper 코드 포맷팅 * 🎨 [STMT-62] StudyPersistenceMapper 재포맷팅 * 🩹 [STMT-62] 컬럼 추가에 따른 스터디 상세 정보 응답에 추가 * ✅ [STMT-62] 스터디 상세 정보 가져오기 api test 수정
Stumeet · Mar 31, 2024 · 9b32074 · 9b32074
1 parent b7bf2b5
commit 9b32074
Show file tree

Hide file tree

Showing 12 changed files with 154 additions and 23 deletions.
diff --git a/src/main/java/com/stumeet/server/study/adapter/in/web/response/StudyDetailResponse.java b/src/main/java/com/stumeet/server/study/adapter/in/web/response/StudyDetailResponse.java
@@ -1,6 +1,7 @@
 package com.stumeet.server.study.adapter.in.web.response;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 import lombok.Builder;
@@ -18,6 +19,9 @@ public record StudyDetailResponse(
 	int headcount,
 	LocalDateTime startDate,
 	LocalDateTime endDate,
+	LocalTime meetingTime,
+	String meetingRepetitionType,
+	List<String> meetingRepetitionDates,
 	boolean isFinished,
 	boolean isDeleted
 ) {

diff --git a/src/main/java/com/stumeet/server/study/adapter/out/persistance/entity/StudyJpaEntity.java b/src/main/java/com/stumeet/server/study/adapter/out/persistance/entity/StudyJpaEntity.java
@@ -1,6 +1,7 @@
 package com.stumeet.server.study.adapter.out.persistance.entity;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
@@ -72,6 +73,14 @@ public class StudyJpaEntity extends BaseTimeEntity {
 	@Comment("종료일")
 	private LocalDateTime endDate;
 
+	@Column(name = "meeting_time", nullable = false)
+	@Comment("정기모임 시간")
+	private LocalTime meetingTime;
+
+	@Column(name = "meeting_repetition")
+	@Comment("정기모임 반복")
+	private String meetingRepetition;
+
 	@Column(name = "is_finished", nullable = false)
 	@ColumnDefault("false")
 	@Comment("완료 여부")

diff --git a/...umeet/server/study/adapter/out/persistance/mapper/MeetingRepetitionPersistenceMapper.java b/...umeet/server/study/adapter/out/persistance/mapper/MeetingRepetitionPersistenceMapper.java
@@ -0,0 +1,28 @@
+package com.stumeet.server.study.adapter.out.persistance.mapper;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.stumeet.server.study.domain.ScheduleRepetitionType;
+import com.stumeet.server.study.domain.StudyMeetingSchedule;
+
+@Component
+public class MeetingRepetitionPersistenceMapper {
+
+	private static final String REPEAT_DELIMITER = ";";
+
+	public StudyMeetingSchedule.Repetition toDomain(String meetingRepetition) {
+		List<String> repetitionElements = List.of(meetingRepetition.split(REPEAT_DELIMITER));
+
+		return StudyMeetingSchedule.Repetition.of(
+				ScheduleRepetitionType.valueOf(repetitionElements.getFirst()),
+				repetitionElements.subList(1, repetitionElements.size()));
+	}
+
+	public String toColumn(StudyMeetingSchedule.Repetition repetition) {
+		return repetition.getType().toString()
+				+ REPEAT_DELIMITER
+				+ String.join(REPEAT_DELIMITER, repetition.getDates());
+	}
+}
diff --git a/.../java/com/stumeet/server/study/adapter/out/persistance/mapper/StudyPersistenceMapper.java b/.../java/com/stumeet/server/study/adapter/out/persistance/mapper/StudyPersistenceMapper.java
@@ -5,6 +5,7 @@
 import com.stumeet.server.study.adapter.out.persistance.entity.StudyJpaEntity;
 import com.stumeet.server.study.domain.Study;
 import com.stumeet.server.study.domain.StudyHeadCount;
+import com.stumeet.server.study.domain.StudyMeetingSchedule;
 import com.stumeet.server.study.domain.StudyPeriod;
 
 import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@
 public class StudyPersistenceMapper {
 
 	private final StudyDomainPersistenceMapper studyDomainPersistenceMapper;
+	private final MeetingRepetitionPersistenceMapper meetingRepetitionPersistenceMapper;
 
 	public Study toDomain(StudyJpaEntity entity) {
 		return Study.builder()
@@ -26,6 +28,10 @@ public Study toDomain(StudyJpaEntity entity) {
 				.period(StudyPeriod.of(entity.getStartDate(), entity.getEndDate()))
 				.headcount(StudyHeadCount.from(entity.getHeadcount()))
 				.image(entity.getImage())
+				.meetingSchedule(
+						StudyMeetingSchedule.of(
+								entity.getMeetingTime(),
+								meetingRepetitionPersistenceMapper.toDomain(entity.getMeetingRepetition())))
 				.isFinished(entity.getIsFinished())
 				.isDeleted(entity.getIsDeleted())
 				.build();
@@ -43,6 +49,9 @@ public StudyJpaEntity toEntity(Study domain) {
 				.endDate(domain.getEndDate())
 				.headcount(domain.getHeadcountNumber())
 				.image(domain.getImage())
+				.meetingTime(domain.getMeetingSchedule().getTime())
+				.meetingRepetition(
+						meetingRepetitionPersistenceMapper.toColumn(domain.getMeetingSchedule().getRepetition()))
 				.isFinished(domain.isFinished())
 				.isDeleted(domain.isDeleted())
 				.build();

diff --git a/src/main/java/com/stumeet/server/study/application/port/out/mapper/StudyUseCaseMapper.java b/src/main/java/com/stumeet/server/study/application/port/out/mapper/StudyUseCaseMapper.java
@@ -21,6 +21,9 @@ public StudyDetailResponse toStudyDetailResponse(Study study) {
 			.endDate(study.getEndDate())
 			.headcount(study.getHeadcountNumber())
 			.image(study.getImage())
+			.meetingTime(study.getMeetingTime())
+			.meetingRepetitionType(study.getMeetingRepeatTypeName())
+			.meetingRepetitionDates(study.getRepetitionDates())
 			.isFinished(study.isFinished())
 			.isDeleted(study.isDeleted())
 			.build();

diff --git a/src/main/java/com/stumeet/server/study/application/service/StudyQueryService.java b/src/main/java/com/stumeet/server/study/application/service/StudyQueryService.java
@@ -1,5 +1,7 @@
 package com.stumeet.server.study.application.service;
 
+import org.springframework.transaction.annotation.Transactional;
+
 import com.stumeet.server.common.annotation.UseCase;
 import com.stumeet.server.study.adapter.in.web.response.StudyDetailResponse;
 import com.stumeet.server.study.application.port.in.StudyQueryUseCase;
@@ -11,6 +13,7 @@
 
 @UseCase
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 public class StudyQueryService implements StudyQueryUseCase {
 
 	private final StudyQueryPort studyQueryPort;

diff --git a/src/main/java/com/stumeet/server/study/domain/ScheduleRepetitionType.java b/src/main/java/com/stumeet/server/study/domain/ScheduleRepetitionType.java
@@ -0,0 +1,14 @@
+package com.stumeet.server.study.domain;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum ScheduleRepetitionType {
+
+	DAILY("매일"),
+	WEEKLY("매주"),
+	MONTHLY("매달");
+
+	private final String name;
+}
diff --git a/src/main/java/com/stumeet/server/study/domain/Study.java b/src/main/java/com/stumeet/server/study/domain/Study.java
@@ -1,6 +1,7 @@
 package com.stumeet.server.study.domain;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 import lombok.AccessLevel;
@@ -21,6 +22,8 @@ public class Study {
 
 	private String region;
 
+	private StudyMeetingSchedule meetingSchedule;
+
 	private String intro;
 
 	private String rule;
@@ -54,5 +57,16 @@ public LocalDateTime getStartDate() {
 	public LocalDateTime getEndDate() {
 		return period.getEndDate();
 	}
-}
 
+	public String getMeetingRepeatTypeName() {
+		return meetingSchedule.getRepetitionType().name();
+	}
+
+	public List<String> getRepetitionDates() {
+		return meetingSchedule.getRepetitionDates();
+	}
+
+	public LocalTime getMeetingTime() {
+		return meetingSchedule.getTime();
+	}
+}
diff --git a/src/main/java/com/stumeet/server/study/domain/StudyMeetingSchedule.java b/src/main/java/com/stumeet/server/study/domain/StudyMeetingSchedule.java
@@ -0,0 +1,41 @@
+package com.stumeet.server.study.domain;
+
+import java.time.LocalTime;
+import java.util.List;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public class StudyMeetingSchedule {
+
+	private final LocalTime time;
+	private final Repetition repetition;
+
+	@Getter
+	@AllArgsConstructor(staticName = "of")
+	public static class Repetition {
+
+		private final ScheduleRepetitionType type;
+
+		private final List<String> dates;
+	}
+
+	public static StudyMeetingSchedule of(LocalTime time, Repetition repetition) {
+		return new StudyMeetingSchedule(time, repetition);
+	}
+
+	public LocalTime getTime() {
+		return time;
+	}
+
+	public ScheduleRepetitionType getRepetitionType() {
+		return repetition.getType();
+	}
+
+	public List<String> getRepetitionDates() {
+		return repetition.getDates();
+	}
+}
diff --git a/src/main/resources/db/migration/V1.4__add_study_table.sql b/src/main/resources/db/migration/V1.4__add_study_table.sql
@@ -20,21 +20,23 @@ CREATE TABLE `study_domain`
 
 CREATE TABLE `study`
 (
-    `id`              BIGINT       NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '스터디 ID',
-    `study_domain_id` BIGINT       NOT NULL COMMENT '스터디 도메인 ID',
-    `name`            VARCHAR(255) NOT NULL COMMENT '스터디명',
-    `region`          VARCHAR(50)  NOT NULL COMMENT '활동 지역',
-    `intro`           VARCHAR(200) NOT NULL COMMENT '소개',
-    `rule`            VARCHAR(200) NULL COMMENT '규칙',
-    `image`           VARCHAR(500) NOT NULL COMMENT '스터디 이미지의 URL',
-    `headcount`       TINYINT(100) NOT NULL DEFAULT 1 COMMENT '인원 수',
-    `start_date`      DATETIME     NOT NULL COMMENT '시작일',
-    `end_date`        DATETIME     NOT NULL COMMENT '종료일',
-    `created_at`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '생성 시간',
-    `updated_at`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '수정 시간',
-    `is_finished`     TINYINT(1) NOT NULL DEFAULT FALSE COMMENT '스터디 완료 여부',
-    `is_deleted`      TINYINT(1) NOT NULL DEFAULT FALSE COMMENT '스터디 삭제 여부',
-    `deleted_at`      DATETIME NULL COMMENT '스터디 삭제 일자',
+    `id`                 BIGINT       NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT '스터디 ID',
+    `study_domain_id`    BIGINT       NOT NULL COMMENT '스터디 도메인 ID',
+    `name`               VARCHAR(255) NOT NULL COMMENT '스터디명',
+    `region`             VARCHAR(50)  NOT NULL COMMENT '활동 지역',
+    `intro`              VARCHAR(200) NOT NULL COMMENT '소개',
+    `rule`               VARCHAR(200) NULL COMMENT '규칙',
+    `image`              VARCHAR(500) NOT NULL COMMENT '스터디 이미지의 URL',
+    `headcount`          TINYINT(100) NOT NULL DEFAULT 1 COMMENT '인원 수',
+    `start_date`         DATETIME     NOT NULL COMMENT '시작일',
+    `end_date`           DATETIME     NOT NULL COMMENT '종료일',
+    `meeting_time`       TIME         NOT NULL COMMENT '정기모임 시간',
+    `meeting_repetition` VARCHAR(100) NOT NULL COMMENT '정기모임 반복',
+    `created_at`         DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '생성 시간',
+    `updated_at`         DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '수정 시간',
+    `is_finished`        TINYINT(1) NOT NULL DEFAULT FALSE COMMENT '스터디 완료 여부',
+    `is_deleted`         TINYINT(1) NOT NULL DEFAULT FALSE COMMENT '스터디 삭제 여부',
+    `deleted_at`         DATETIME NULL COMMENT '스터디 삭제 일자',
 
     CONSTRAINT fk_study_domain_with_study FOREIGN KEY (study_domain_id)
         REFERENCES study_domain (id)

diff --git a/src/main/resources/db/migration/V1.6__insert_study_dummy_data.sql b/src/main/resources/db/migration/V1.6__insert_study_dummy_data.sql
@@ -1,9 +1,10 @@
 INSERT INTO study_domain (id, study_field_id) VALUES (1, 6);
 
-INSERT INTO study (id, study_domain_id, name, region, intro, rule, image, start_date, end_date)
+INSERT INTO study (id, study_domain_id, name, region, intro, rule, image,
+                   meeting_time, meeting_repetition, start_date, end_date)
 VALUES (1, 1, '[임시] 프로그래밍 스터디', '서울', '프로그래밍 스터디 입니다.', '- 매주 목요일 8시\n- 장소: 안암역\n- 제시간에 제출하기!',
         'https://stumeet.s3.ap-northeast-2.amazonaws.com/study/1/image/2023062711172178420.png',
-        '2024-04-01', '2024-05-01');
+        '21:00:00', 'WEEKLY;월;수;목;', '2024-04-01', '2024-05-01');
 
 INSERT INTO study_tag (study_domain_id, name) VALUES (1, 'springboot');
 INSERT INTO study_tag (study_domain_id, name) VALUES (1, 'java');

diff --git a/src/test/java/com/stumeet/server/study/adapter/in/web/StudyQueryApiTest.java b/src/test/java/com/stumeet/server/study/adapter/in/web/StudyQueryApiTest.java
@@ -15,14 +15,12 @@
 
 import com.stumeet.server.common.auth.model.AuthenticationHeader;
 import com.stumeet.server.helper.WithMockMember;
+import com.stumeet.server.stub.StudyStub;
 import com.stumeet.server.stub.TokenStub;
 import com.stumeet.server.template.ApiTest;
 
 class StudyQueryApiTest extends ApiTest {
 
-	private final Long testStudyId = 1L;
-	private final Long notFoundTestStudyId = 0L;
-
 	@Nested
 	@DisplayName("스터디 상세 정보 가져오기")
 	class GetStudyDetail {
@@ -32,7 +30,7 @@ class GetStudyDetail {
 		@WithMockMember
 		@DisplayName("[성공] 스터디 상세 정보 조회를 성공한다.")
 		void successTest() throws Exception {
-			mockMvc.perform(get("/api/v1/studies/{id}", testStudyId)
+			mockMvc.perform(get("/api/v1/studies/{id}", StudyStub.getStudyId())
 							.header(AuthenticationHeader.ACCESS_TOKEN.getName(), TokenStub.getMockAccessToken()))
 					.andExpect(status().isOk())
 					.andDo(document("get-study-detail/success",
@@ -57,6 +55,11 @@ void successTest() throws Exception {
 									fieldWithPath("data.headcount").description("참여 인원 수"),
 									fieldWithPath("data.startDate").description("시작 날짜"),
 									fieldWithPath("data.endDate").description("종료 날짜"),
+									fieldWithPath("data.meetingTime").description("정기모임 시간"),
+									fieldWithPath("data.meetingRepetitionType")
+											.description("정기모임 반복 유형 / `매일`, `매주`, `매달`"),
+									fieldWithPath("data.meetingRepetitionDates")
+											.description("정기모임 반복일 / 매주: 요일, 매달: 날짜"),
 									fieldWithPath("data.isFinished").description("종료 여부"),
 									fieldWithPath("data.isDeleted").description("삭제 여부")
 							)));
@@ -66,7 +69,7 @@ void successTest() throws Exception {
 		@WithMockMember
 		@DisplayName("[실패] 존재하지 않는 스터디의 ID로 요청한 경우 스터디 상세정보 조회를 실패한다.")
 		void invalidRequestTest() throws Exception {
-			mockMvc.perform(get("/api/v1/studies/{id}", notFoundTestStudyId)
+			mockMvc.perform(get("/api/v1/studies/{id}", StudyStub.getInvalidStudyId())
 							.header(AuthenticationHeader.ACCESS_TOKEN.getName(), TokenStub.getMockAccessToken()))
 					.andExpect(status().isNotFound())
 					.andDo(document("get-study-detail/fail/not-found",