Merge branch 'dev' into feat/#56

Author: KIMSEI1124

.github/workflows/backend-server-test.yml

@@ -1,40 +1,40 @@
-name: 🧪 Backend Tests on Pull Request
-
-on:
-  pull_request:
-    branches:
-      - main
-      - dev
-
-jobs:
-  project-test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 📦 Checkout repository
-        uses: actions/checkout@v4
-
-      - name: 🖼️ Install ImageMagick
-        run: sudo apt-get install -y imagemagick
-
-      - name: 🏗️ Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: 🎟️ Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: 🧪 Spring Boot Test
-        run: ./gradlew clean test -i
-
-      - name: Add coverage to PR
-        id: jacoco
-        uses: madrapps/[email protected]
-        with:
-          title: 📄 Jacoco Coverage Report
-          paths: ${{ github.workspace }}/**/reports/jacoco/test/jacocoTestReport.xml
-          token: ${{ secrets.GITHUB_TOKEN }}
-          min-coverage-overall: 80
-          min-coverage-changed-files: 80
+#name: 🧪 Backend Tests on Pull Request
+#
+#on:
+#  pull_request:
+#    branches:
+#      - main
+#      - dev
+#
+#jobs:
+#  project-test:
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - name: 📦 Checkout repository
+#        uses: actions/checkout@v4
+#
+#      - name: 🖼️ Install ImageMagick
+#        run: sudo apt-get install -y imagemagick
+#
+#      - name: 🏗️ Set up JDK 17
+#        uses: actions/setup-java@v4
+#        with:
+#          distribution: 'temurin'
+#          java-version: '17'
+#
+#      - name: 🎟️ Grant execute permission for gradlew
+#        run: chmod +x gradlew
+#
+#      - name: 🧪 Spring Boot Test
+#        run: ./gradlew clean test -i
+#
+#      - name: Add coverage to PR
+#        id: jacoco
+#        uses: madrapps/[email protected]
+#        with:
+#          title: 📄 Jacoco Coverage Report
+#          paths: ${{ github.workspace }}/**/reports/jacoco/test/jacocoTestReport.xml
+#          token: ${{ secrets.GITHUB_TOKEN }}
+#          min-coverage-overall: 80
+#          min-coverage-changed-files: 80

application/wypl-core/src/main/java/com/wypl/wyplcore/auth/service/AuthServiceImpl.java

@@ -15,10 +15,10 @@
 import com.wypl.jpamemberdomain.member.OauthProvider;
 import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
 import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
-import com.wypl.jpamemberdomain.member.repository.MemberRepository;
 import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository;
 import com.wypl.jpamemberdomain.member.utils.SocialMemberRepositoryUtils;
 import com.wypl.wyplcore.auth.data.response.AuthTokensResponse;
+import com.wypl.wyplcore.member.service.MemberServiceImpl;
 
 import lombok.RequiredArgsConstructor;
 
@@ -28,8 +28,8 @@
 public class AuthServiceImpl {
 	private final GoogleOAuthClient googleOAuthClient;
 	private final SocialMemberRepository socialMemberRepository;
-	private final MemberRepository memberRepository;
 	private final AuthDomainServiceImpl authDomainService;
+	private final MemberServiceImpl memberService;
 
 	@Transactional
 	public AuthTokensResponse generateToken(final String provider, final String code) {
@@ -68,21 +68,18 @@ public void logout(AuthMember authMember) {
 	public void quitMember(AuthMember authMember) {
 		// Todo : 회원 탈퇴 로직 논의
 		deleteToken(authMember);
-		deleteMember(authMember);
+		memberService.deleteMember(authMember);
 	}
 
 	private void deleteToken(AuthMember authMember) {
 		authDomainService.deleteToken(authMember.accessToken());
 	}
 
-	private void deleteMember(AuthMember authMember) {
-		memberRepository.deleteById(authMember.id());
-	}
-
 	private boolean isInvalidRefreshToken(String accessToken, String refreshToken) {
 		return refreshToken.isEmpty() || !refreshToken.equals(authDomainService.getRefreshToken(accessToken));
 	}
 
+	// todo:
 	private long findMemberIdAfterSaveMember(String accessToken, GoogleUserInfoResponse googleUserInfoResponse) {
 		if (isNewMember(googleUserInfoResponse)) {
 			LocalDate birthday = googleOAuthClient.fetchBirthday(accessToken);
@@ -105,6 +102,7 @@ private long findMemberIdAfterSaveMember(String accessToken, GoogleUserInfoRespo
 		return SocialMemberRepositoryUtils.getSocialMember(socialMemberRepository, googleUserInfoResponse.id()).getId();
 	}
 
+	// todo:
 	private boolean isNewMember(GoogleUserInfoResponse googleUserInfoResponse) {
 		return !socialMemberRepository.existsByOauthProviderAndOauthId(OauthProvider.GOOGLE,
 			googleUserInfoResponse.id());

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/data/DateSearchCondition.java

@@ -0,0 +1,6 @@
+package com.wypl.wyplcore.calendar.data;
+
+import java.time.LocalDate;
+
+public record DateSearchCondition(LocalDate startDate, LocalDate endDate) {
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/data/request/CalendarFindRequest.java

@@ -0,0 +1,16 @@
+package com.wypl.wyplcore.calendar.data.request;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+public record CalendarFindRequest(
+
+	@JsonProperty("calendar_type")
+	CalendarType calendarType,
+
+	@JsonProperty("start_date")
+	LocalDate today
+) {
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/data/response/CalendarSchedulesResponse.java

@@ -0,0 +1,16 @@
+package com.wypl.wyplcore.calendar.data.response;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
+
+public record CalendarSchedulesResponse(
+
+	@JsonProperty("schedule_count")
+	int scheduleCount,
+
+	@JsonProperty("schedules")
+	List<ScheduleFindResponse> schedules
+) {
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/CalendarService.java

@@ -0,0 +1,84 @@
+package com.wypl.wyplcore.calendar.service;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.wypl.googleoauthclient.domain.AuthMember;
+import com.wypl.jpacalendardomain.calendar.domain.Calendar;
+import com.wypl.jpacalendardomain.calendar.domain.MemberCalendar;
+import com.wypl.jpacalendardomain.calendar.domain.Schedule;
+import com.wypl.jpacalendardomain.calendar.repository.ScheduleRepository;
+import com.wypl.jpamemberdomain.member.domain.Member;
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.calendar.data.request.CalendarFindRequest;
+import com.wypl.wyplcore.calendar.data.response.CalendarSchedulesResponse;
+import com.wypl.wyplcore.calendar.service.strategy.CalendarStrategy;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
+import com.wypl.wyplcore.schedule.service.repetition.RepetitionService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class CalendarService {
+
+	private final ScheduleRepository scheduleRepository;
+
+	private final Map<CalendarType, CalendarStrategy> calendarStrategyMap;
+
+	/**
+	 * 캘린더의 일정을 조회한다.
+	 * @param authMember : 인증된 사용자 정보
+	 * @param calendarId : 조회할 캘린더 ID
+	 * @param calendarFindRequest : 캘린더 조회 조건
+	 * @return FindCalendarResponse
+	 */
+	@Transactional(readOnly = true)
+	public CalendarSchedulesResponse findCalendar(AuthMember authMember, long calendarId,
+		CalendarFindRequest calendarFindRequest) {
+
+		Calendar foundCalendar = null;  // FIXME: calendarId로 foundCalendar 엔티티 검증 필요.
+		MemberCalendar foundMemberCalendar = null; // FIXME: memberCalendar 엔티티 검증 필요.
+		Member foundMember = null; // FIXME: member 엔티티 검증 필요.
+
+		DateSearchCondition dateSearchCondition = getDateSearchCondition(calendarFindRequest.today(),
+			calendarFindRequest.calendarType());
+
+		List<Schedule> schedules = scheduleRepository.findByCalendarIdAndBetweenStartDateAndEndDate(calendarId,
+			dateSearchCondition.startDate(), dateSearchCondition.endDate());
+
+		List<ScheduleFindResponse> responses = schedules.stream()
+			.flatMap(schedule -> getScheduleResponsesWithRepetition(schedule, dateSearchCondition.startDate(),
+				dateSearchCondition.endDate()).stream())
+			.toList();
+
+		return new CalendarSchedulesResponse(responses.size(), responses);
+	}
+
+	/**
+	 * RepetitionService를 통해 반복 일정을 가공하여 조회한다.
+	 * @param schedule : 일정 정보
+	 * @param startDate : 조회 시작일
+	 * @param endDate : 조회 종료일
+	 * @return List<ScheduleFindResponse> : 일정 반복 정보를 통해 리스트 형태로 가공하여 반환된다.
+	 */
+	private List<ScheduleFindResponse> getScheduleResponsesWithRepetition(Schedule schedule, LocalDate startDate,
+		LocalDate endDate) {
+		return RepetitionService.getScheduleResponses(schedule, startDate, endDate);
+	}
+
+	/**
+	 * CalendarType에 따라 DateSearchCondition을 반환한다.
+	 * @param today : 조회 기준일
+	 * @param calendarType : 조회할 캘린더 타입
+	 * @return DateSearchCondition : DateSearchCondition 객체를 반환한다.
+	 */
+	private DateSearchCondition getDateSearchCondition(LocalDate today, CalendarType calendarType) {
+		return calendarStrategyMap.get(calendarType).getDateSearchCondition(today);
+	}
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/CalendarServiceUtil.java

@@ -0,0 +1,15 @@
+package com.wypl.wyplcore.calendar.service;
+
+import java.time.LocalDate;
+
+public class CalendarServiceUtil {
+
+	public static LocalDate getMaxDate(LocalDate date1, LocalDate date2) {
+		return date1.isBefore(date2) ? date2 : date1;
+	}
+
+	public static LocalDate getMinDate(LocalDate date1, LocalDate date2) {
+		return date1.isBefore(date2) ? date1 : date2;
+	}
+
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/strategy/CalendarStrategy.java

@@ -0,0 +1,13 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.LocalDate;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+public interface CalendarStrategy {
+
+	CalendarType getCalendarType();
+
+	DateSearchCondition getDateSearchCondition(LocalDate today);
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/strategy/CalendarStrategyConfig.java

@@ -0,0 +1,29 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+@Configuration
+public class CalendarStrategyConfig {
+
+	private final Map<CalendarType, CalendarStrategy> calendarStrategyMap = new HashMap<>();
+
+	@Autowired
+	public CalendarStrategyConfig(List<CalendarStrategy> calendarStrategies) {
+		calendarStrategies.forEach(calendarStrategy -> {
+			calendarStrategyMap.put(calendarStrategy.getCalendarType(), calendarStrategy);
+		});
+	}
+
+	@Bean
+	public Map<CalendarType, CalendarStrategy> calendarStrategyMap() {
+		return calendarStrategyMap;
+	}
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/strategy/DayCalendarStrategy.java

@@ -0,0 +1,26 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.LocalDate;
+
+import org.springframework.stereotype.Component;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class DayCalendarStrategy implements CalendarStrategy {
+
+	@Override
+	public CalendarType getCalendarType() {
+		return CalendarType.DAY;
+	}
+
+	@Override
+	public DateSearchCondition getDateSearchCondition(LocalDate today) {
+		return new DateSearchCondition(today, today);
+	}
+
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/strategy/MonthCalendarStrategy.java

@@ -0,0 +1,28 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+
+import org.springframework.stereotype.Component;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class MonthCalendarStrategy implements CalendarStrategy {
+
+	@Override
+	public CalendarType getCalendarType() {
+		return CalendarType.MONTH;
+	}
+
+	@Override
+	public DateSearchCondition getDateSearchCondition(LocalDate today) {
+		LocalDate searchStartDate = today.withDayOfMonth(1);
+		LocalDate searchEndDate = today.with(TemporalAdjusters.lastDayOfMonth());
+		return new DateSearchCondition(searchStartDate, searchEndDate);
+	}
+}