Merge pull request #407 from Namo-log/refactor/406

[Refactor/406] 개인/생일 일정 생성 시 participant 정보도 업데이트 되도록 수정

application/external-api-v2/src/main/java/com/namo/spring/application/external/api/schedule/converter/ScheduleConverter.java

@@ -15,15 +15,15 @@ private ScheduleConverter() {
         throw new IllegalStateException("Util Class");
     }
 
-    public static Schedule toBirthdaySchedule(String title, Period period){
+    public static Schedule toBirthdaySchedule(String title, String nickname, Period period){
         return Schedule.builder()
                 .title(title)
                 .period(period)
                 .location(null)
                 .scheduleType(ScheduleType.BIRTHDAY.getValue())
                 .imageUrl(null)
-                .participantCount(null)
-                .participantNicknames(null)
+                .participantCount(1)
+                .participantNicknames(nickname)
                 .build();
     }
 

application/external-api-v2/src/main/java/com/namo/spring/application/external/api/schedule/service/ScheduleMaker.java

@@ -1,12 +1,10 @@
 package com.namo.spring.application.external.api.schedule.service;
 
-import com.namo.spring.application.external.api.schedule.converter.LocationConverter;
 import com.namo.spring.application.external.api.schedule.dto.MeetingScheduleRequest;
 import com.namo.spring.application.external.api.schedule.dto.PersonalScheduleRequest;
 import com.namo.spring.core.infra.common.properties.ImageUrlProperties;
 import com.namo.spring.db.mysql.domains.schedule.entity.Schedule;
 import com.namo.spring.db.mysql.domains.schedule.service.ScheduleService;
-import com.namo.spring.db.mysql.domains.schedule.type.Location;
 import com.namo.spring.db.mysql.domains.schedule.type.Period;
 import com.namo.spring.db.mysql.domains.schedule.type.ScheduleType;
 import com.namo.spring.db.mysql.domains.user.entity.Member;
@@ -32,15 +30,15 @@ public class ScheduleMaker {
     private final ScheduleService scheduleService;
     private final ImageUrlProperties imageUrlProperties;
 
-    public Schedule createPersonalSchedule(PersonalScheduleRequest.PostPersonalScheduleDto dto, Period period) {
-        Schedule schedule = toSchedule(dto.getTitle(), period, dto.getLocation(), PERSONAL_SCHEDULE_TYPE, null, null,
-                null);
+    public Schedule createPersonalSchedule(PersonalScheduleRequest.PostPersonalScheduleDto dto, Period period, String nickname) {
+        Schedule schedule = toSchedule(dto.getTitle(), period, dto.getLocation(), PERSONAL_SCHEDULE_TYPE, null, 1,
+                nickname);
         return scheduleService.createSchedule(schedule);
     }
 
-    public Schedule createMeetingSchedule(MeetingScheduleRequest.PostMeetingScheduleDto dto, Period period) {
+    public Schedule createMeetingSchedule(MeetingScheduleRequest.PostMeetingScheduleDto dto, Period period, String nickname) {
         String imageUrl = dto.getImageUrl() != null ? dto.getImageUrl() : imageUrlProperties.getMeeting();
-        Schedule schedule = toSchedule(dto.getTitle(), period, dto.getLocation(), MEETING_SCHEDULE_TYPE, imageUrl, 0, "");
+        Schedule schedule = toSchedule(dto.getTitle(), period, dto.getLocation(), MEETING_SCHEDULE_TYPE, imageUrl, 1, nickname);
         return scheduleService.createSchedule(schedule);
     }
 
@@ -54,8 +52,8 @@ public void createBirthdaySchedules(Member member){
         String title = member.getNickname() + "님의 생일";
         Period currentYearPeriod = toPeriodOfBirthdaySchedule(member, currentYear);
         Period nextYearPeriod = toPeriodOfBirthdaySchedule(member, currentYear+1);
-        Schedule currentYearBirthday = toBirthdaySchedule(title, currentYearPeriod);
-        Schedule nextYearBirthday = toBirthdaySchedule(title, nextYearPeriod);
+        Schedule currentYearBirthday = toBirthdaySchedule(title, member.getNickname(), currentYearPeriod);
+        Schedule nextYearBirthday = toBirthdaySchedule(title, member.getNickname(), nextYearPeriod);
         scheduleService.createSchedules(List.of(currentYearBirthday, nextYearBirthday));
     }
 

application/external-api-v2/src/main/java/com/namo/spring/application/external/api/schedule/service/ScheduleManageService.java

@@ -73,7 +73,7 @@ public Schedule getMeetingSchedule(Long scheduleId) {
 
     public Schedule createPersonalSchedule(PersonalScheduleRequest.PostPersonalScheduleDto request, Member member) {
         Period period = getValidatedPeriod(request.getPeriod().getStartDate(), request.getPeriod().getEndDate());
-        Schedule schedule = scheduleMaker.createPersonalSchedule(request, period);
+        Schedule schedule = scheduleMaker.createPersonalSchedule(request, period, member.getNickname());
         participantManageService.createPersonalScheduleParticipant(member, schedule, request.getCategoryId());
         return schedule;
     }
@@ -83,7 +83,7 @@ public Schedule createMeetingSchedule(MeetingScheduleRequest.PostMeetingSchedule
         List<Member> participants = participantManageService.getFriendshipValidatedParticipants(owner.getId(),
                 request.getParticipants());
         Period period = getValidatedPeriod(request.getPeriod().getStartDate(), request.getPeriod().getEndDate());
-        Schedule schedule = scheduleMaker.createMeetingSchedule(request, period);
+        Schedule schedule = scheduleMaker.createMeetingSchedule(request, period, owner.getNickname());
         participantManageService.createMeetingScheduleParticipants(owner, schedule, participants);
         return schedule;
     }

application/external-api-v2/src/main/java/com/namo/spring/application/external/api/user/facade/AuthFacade.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.namo.spring.application.external.api.schedule.service.ScheduleMaker;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +36,7 @@ public class AuthFacade {
     private final MemberManageService memberManageService;
     private final TagGenerator tagGenerator;
     private final PaletteService paletteService;
+    private final ScheduleMaker scheduleMaker;
 
     @Transactional
     public MemberResponse.SignUpDto socialSignup(MemberRequest.SocialSignUpDto signUpDto, SocialType socialType) {
@@ -114,7 +116,8 @@ public Member completeSignup(MemberRequest.CompleteSignUpDto dto, Long memberId)
         Palette palette = paletteService.getPalette(dto.getColorId());
         member.signUpComplete(dto.getName(), dto.getNickname(), dto.getBirthday(), dto.getBio(), tag, palette,
                 dto.getProfileImage());
-        memberManageService.saveMember(member);
+        Member savedMember = memberManageService.saveMember(member);
+        scheduleMaker.createBirthdaySchedules(savedMember);
         return member;
     }
 }

storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/schedule/entity/Schedule.java

@@ -58,8 +58,10 @@ public class Schedule extends BaseTimeEntity {
     @JdbcTypeCode(SqlTypes.VARCHAR)
     private String imageUrl;
 
+    @Column(nullable = false)
     private Integer participantCount;
 
+    @Column(nullable = false)
     private String participantNicknames;
 
     @OneToMany(mappedBy = "schedule", cascade = CascadeType.ALL, orphanRemoval = true)

storage/db-mysql-v2/src/main/resources/db/migration/dev/V1.1.6__Modify_columns_from_schedule_table.sql

@@ -0,0 +1,28 @@
+-- V1.1.6__Modify_columns_from_schedule_table
+
+-- participant_count 업데이트
+UPDATE schedule
+SET
+    participant_count = 1
+WHERE
+    schedule_type = 0
+  AND participant_count IS NULL;
+
+-- participant_nicknames 업데이트, 개인/생일 일정에 대해서만
+UPDATE schedule s
+SET s.participant_nicknames = (
+    SELECT m.nickname
+    FROM participant p
+        JOIN member m ON p.member_id = m.id
+    WHERE p.schedule_id = s.id
+)
+WHERE s.participant_nicknames IS NULL
+  AND s.schedule_type IN (0, 2);
+
+-- NOT NULL 변경
+ALTER TABLE schedule
+    MODIFY participant_nicknames VARCHAR(255) NOT NULL;
+
+-- NOT NULL 변경
+ALTER TABLE schedule
+    MODIFY participant_count INT NOT NULL;