20260818

.env.example

@@ -10,6 +10,7 @@ DB_URL=jdbc:mysql://your-db-host:3306/moru?serverTimezone=Asia/Seoul&characterEn
 DB_USERNAME=
 DB_PASSWORD=
 JPA_DDL_AUTO=validate
+FLYWAY_ENABLED=true
 
 JWT_SECRET=
 JWT_ACCESS_TOKEN_EXPIRATION=1h

build.gradle

@@ -19,6 +19,7 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-flyway'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-webmvc'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -43,6 +44,7 @@ dependencies {
 	compileOnly 'org.projectlombok:lombok'
 
 	runtimeOnly 'com.mysql:mysql-connector-j'
+	runtimeOnly 'org.flywaydb:flyway-mysql'
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
 	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
 

docker-compose.prod.yml

@@ -26,6 +26,7 @@ services:
       SPRING_JPA_HIBERNATE_DDL_AUTO: ${JPA_DDL_AUTO:-validate}
       SPRING_JPA_OPEN_IN_VIEW: "false"
       SPRING_JPA_PROPERTIES_HIBERNATE_FORMAT_SQL: "false"
+      SPRING_FLYWAY_ENABLED: ${FLYWAY_ENABLED:-true}
 
       LOGGING_LEVEL_ORG_HIBERNATE_SQL: info
       LOGGING_LEVEL_ORG_HIBERNATE_ORM_JDBC_BIND: off
@@ -51,6 +52,8 @@ services:
 
     restart: unless-stopped
 
+    stop_grace_period: 90s
+
     logging: *awslogs
 
     healthcheck:

src/main/java/com/moru/server/domain/member/controller/AuthController.java

@@ -39,7 +39,7 @@ public class AuthController {
             - Authorization 헤더 없이 호출합니다.
             - kakao: token에 카카오 accessToken을 전달합니다.
             - google: token에 Google idToken을 전달합니다.
-            - apple: token에 Apple identityToken을 전달합니다.
+            - apple: identityToken에 Apple identityToken을 전달합니다. token도 호환됩니다.
             """;
     private static final String KAKAO_REQUEST_EXAMPLE = """
             {
@@ -55,7 +55,7 @@ public class AuthController {
             """;
     private static final String APPLE_REQUEST_EXAMPLE = """
             {
-              "token": "apple_identity_token",
+              "identityToken": "apple_identity_token",
               "authorizationCode": "apple_authorization_code"
             }
             """;

src/main/java/com/moru/server/domain/member/converter/MemberConverter.java

@@ -23,6 +23,7 @@ public static MemberResponseDTO.TtsUpdateResponse toTtsUpdateResponse(Member mem
                 .ttsId(member.getVoiceType().getId())
                 .voiceCode(member.getVoiceType().getName())
                 .displayName(member.getVoiceType().getLabel())
+                .selectionVersion(member.getVoiceSelectionVersion())
                 .build();
     }
 

src/main/java/com/moru/server/domain/member/dto/AuthRequestDTO.java

@@ -1,5 +1,6 @@
 package com.moru.server.domain.member.dto;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 
@@ -8,7 +9,8 @@ public record AuthRequestDTO() {
     @Schema(description = "소셜 로그인 요청")
     public record SocialLoginRequest(
             @NotBlank(message = "소셜 토큰은 필수입니다.")
-            @Schema(description = "소셜 플랫폼에서 발급받은 토큰. kakao는 accessToken, google은 idToken, apple은 identityToken을 전달합니다.", example = "kakao_access_token")
+            @JsonAlias("identityToken")
+            @Schema(description = "소셜 플랫폼에서 발급받은 토큰. kakao는 accessToken, google은 idToken, apple은 token 또는 identityToken을 전달합니다.", example = "kakao_access_token")
             String token,
 
             @Schema(description = "Apple 로그인 필수 인가 코드. kakao/google은 null로 전달합니다.", example = "apple_authorization_code")

src/main/java/com/moru/server/domain/member/dto/MemberResponseDTO.java

@@ -41,7 +41,15 @@ public record TtsUpdateResponse(
             String voiceCode,
 
             @Schema(description = "TTS 목소리 표시 이름", example = "민서")
-            String displayName
+            String displayName,
+
+            @Schema(description = """
+                    이번 변경으로 올라간 최신 목소리 선택 버전. 목소리를 바꿀 때마다 1씩 증가한다.
+                    이 응답 시점에 회원의 모든 루틴 TTS 는 PENDING 으로 초기화되며,
+                    재합성이 끝난 스텝은 TTS 조회 응답의 selectionVersion 이 이 값과 같아진다.
+                    두 값이 같고 ttsStatus 가 COMPLETED 인 스텝만 새 목소리로 만들어진 음원이다.""",
+                    example = "3")
+            Long selectionVersion
     ) {
     }
 

src/main/java/com/moru/server/domain/member/entity/Member.java

@@ -45,6 +45,10 @@ public class Member extends BaseEntity {
     @JoinColumn(name = "tts_id")
     private TTS voiceType;
 
+    @Column(name = "voice_selection_version", nullable = false)
+    @Builder.Default
+    private Long voiceSelectionVersion = 0L;
+
     @Column(name = "profile_image_key", length = 500)
     private String profileImageKey;
 
@@ -67,4 +71,8 @@ public void completeOnboarding() {
     public void updateVoiceType(TTS voiceType) {
         this.voiceType = voiceType;
     }
+
+    public void bumpVoiceSelectionVersion() {
+        this.voiceSelectionVersion++;
+    }
 }

src/main/java/com/moru/server/domain/member/service/command/member/MemberCommandServiceImpl.java

@@ -4,32 +4,105 @@
 import com.moru.server.domain.member.dto.MemberResponseDTO;
 import com.moru.server.domain.member.entity.Member;
 import com.moru.server.domain.member.repository.MemberRepository;
+import com.moru.server.domain.routine.entity.RoutineTTS;
+import com.moru.server.domain.routine.event.RoutineTtsVoiceChangedEvent;
+import com.moru.server.domain.routine.repository.RoutineTTSRepository;
 import com.moru.server.domain.tts.entity.TTS;
 import com.moru.server.domain.tts.repository.TTSRepository;
 import com.moru.server.global.exception.BusinessException;
 import com.moru.server.global.response.code.status.ErrorStatus;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+import java.util.List;
 
 @Service
+@Slf4j
 @RequiredArgsConstructor
 @Transactional
 public class MemberCommandServiceImpl implements MemberCommandService {
 
     private final MemberRepository memberRepository;
     private final TTSRepository ttsRepository;
+    private final RoutineTTSRepository routineTTSRepository;
+    private final ApplicationEventPublisher eventPublisher;
+
+    @Value("${google.tts.enabled:false}")
+    private boolean ttsEnabled;
 
-    @Override
+     @Override
     public MemberResponseDTO.TtsUpdateResponse updateTts(Long memberId, Long ttsId) {
-        Member member = memberRepository.findById(memberId)
+        Member member = memberRepository.findByIdForUpdate(memberId)
                 .orElseThrow(() -> new BusinessException(ErrorStatus.MEMBER_NOT_FOUND));
 
         TTS tts = ttsRepository.findById(ttsId)
                 .orElseThrow(() -> new BusinessException(ErrorStatus.TTS_NOT_FOUND));
 
+        if (isSameVoice(member, ttsId)) {
+            log.info("[TTS] 동일한 목소리라 재합성하지 않음. memberId={}, ttsId={}", memberId, ttsId);
+            return MemberConverter.toTtsUpdateResponse(member);
+        }
+
         member.updateVoiceType(tts);
+        member.bumpVoiceSelectionVersion();
+
+        if (!ttsEnabled) {
+            markAllFailed(memberId);
+            return MemberConverter.toTtsUpdateResponse(member);
+        }
+
+        requestRegeneration(memberId, resolveVoiceName(tts), member.getVoiceSelectionVersion());
 
         return MemberConverter.toTtsUpdateResponse(member);
     }
+
+    /**
+     * 재합성을 수행할 워커가 없다. 버전만 올리고 두면 기존 음원이 새 버전인 것처럼 보이므로
+     * 생성 경로(RoutineGroupCommandServiceImpl.publishTtsEvent)와 동일하게 FAILED 로 종결한다.
+     */
+    private void markAllFailed(Long memberId) {
+        List<RoutineTTS> targets = routineTTSRepository.findAllByMemberId(memberId);
+        for (RoutineTTS target : targets) {
+            target.markFailed();
+        }
+        log.info("[TTS] 기능이 비활성화되어 재합성을 건너뛰고 FAILED 로 종결. memberId={}, 건수={}",
+                memberId, targets.size());
+    }
+
+    private boolean isSameVoice(Member member, Long ttsId) {
+        TTS current = member.getVoiceType();
+        return current != null && current.getId().equals(ttsId);
+    }
+
+    private String resolveVoiceName(TTS tts) {
+        String voiceName = tts.getGoogleVoiceName();
+        if (voiceName == null || voiceName.isBlank()) {
+            log.error("[TTS] 목소리 프리셋에 googleVoiceName 이 없어 재합성을 중단. ttsId={}, name={}",
+                    tts.getId(), tts.getName());
+            throw new BusinessException(ErrorStatus.TTS_VOICE_NAME_NOT_CONFIGURED);
+        }
+        return voiceName;
+    }
+
+    private void requestRegeneration(Long memberId, String voiceName, Long voiceVersion) {
+        if (!TransactionSynchronizationManager.isActualTransactionActive()) {
+            throw new IllegalStateException(
+                    "재합성 이벤트는 트랜잭션 안에서 발행해야 한다. memberId=" + memberId);
+        }
+
+        List<RoutineTTS> targets = routineTTSRepository.findAllByMemberId(memberId);
+        for (RoutineTTS target : targets) {
+            target.markPending();
+            eventPublisher.publishEvent(
+                    new RoutineTtsVoiceChangedEvent(target.getId(), voiceName, voiceVersion));
+        }
+
+        log.info("[TTS] 목소리 변경으로 재합성 요청. memberId={}, 건수={}, voiceVersion={}",
+                memberId, targets.size(), voiceVersion);
+    }
 }

src/main/java/com/moru/server/domain/onboarding/controller/OnboardingController.java

@@ -1,6 +1,8 @@
 package com.moru.server.domain.onboarding.controller;
 
+import com.moru.server.domain.onboarding.dto.OnboardingRequestDTO;
 import com.moru.server.domain.onboarding.dto.OnboardingResponseDTO;
+import com.moru.server.domain.onboarding.service.command.OnboardingCommandService;
 import com.moru.server.domain.onboarding.service.query.OnboardingQueryService;
 import com.moru.server.domain.routine.dto.RoutineGroupResponseDTO;
 import com.moru.server.domain.routine.entity.enums.RoutineGoalType;
@@ -9,9 +11,12 @@
 import com.moru.server.global.security.auth.AuthenticatedMember;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,8 +30,22 @@
 public class OnboardingController {
 
     private final OnboardingQueryService onboardingQueryService;
+    private final OnboardingCommandService onboardingCommandService;
     private final RoutineGroupQueryService routineGroupQueryService;
 
+    @Operation(
+            summary = "온보딩 완료",
+            description = "로그인 후 서버에 동기화된 본인 소유 루틴 그룹을 기준으로 온보딩을 완료합니다."
+    )
+    @PostMapping("/complete")
+    public ApiResponse<OnboardingResponseDTO.StatusResponse> completeOnboarding(
+            @AuthenticationPrincipal AuthenticatedMember member,
+            @Valid @RequestBody OnboardingRequestDTO.CompleteRequest request
+    ) {
+        return ApiResponse.onSuccess(
+                onboardingCommandService.completeOnboarding(member.memberId(), request));
+    }
+
     @Operation(summary = "온보딩 완료 여부 조회", description = "현재 로그인한 사용자의 온보딩 완료 여부를 조회합니다.")
     @GetMapping("/status")
     public ApiResponse<OnboardingResponseDTO.StatusResponse> getOnboardingStatus(

src/main/java/com/moru/server/domain/onboarding/dto/OnboardingRequestDTO.java

@@ -0,0 +1,15 @@
+package com.moru.server.domain.onboarding.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+public record OnboardingRequestDTO() {
+
+    @Schema(description = "온보딩 완료 요청")
+    public record CompleteRequest(
+            @NotNull(message = "routineGroupId는 필수입니다.")
+            @Schema(description = "동기화가 완료된 회원 소유 루틴 그룹 ID", example = "15")
+            Long routineGroupId
+    ) {
+    }
+}

src/main/java/com/moru/server/domain/onboarding/dto/OnboardingResponseDTO.java

@@ -4,7 +4,7 @@
 
 public record OnboardingResponseDTO() {
 
-    @Schema(description = "온보딩 완료 여부 조회 응답")
+    @Schema(description = "온보딩 완료 상태 응답")
     public record StatusResponse(
             @Schema(description = "온보딩 완료 여부", example = "false")
             Boolean onboardingCompleted

src/main/java/com/moru/server/domain/onboarding/service/command/OnboardingCommandService.java

@@ -0,0 +1,12 @@
+package com.moru.server.domain.onboarding.service.command;
+
+import com.moru.server.domain.onboarding.dto.OnboardingRequestDTO;
+import com.moru.server.domain.onboarding.dto.OnboardingResponseDTO;
+
+public interface OnboardingCommandService {
+
+    OnboardingResponseDTO.StatusResponse completeOnboarding(
+            Long memberId,
+            OnboardingRequestDTO.CompleteRequest request
+    );
+}

src/main/java/com/moru/server/domain/onboarding/service/command/OnboardingCommandServiceImpl.java

@@ -0,0 +1,43 @@
+package com.moru.server.domain.onboarding.service.command;
+
+import com.moru.server.domain.member.entity.Member;
+import com.moru.server.domain.member.repository.MemberRepository;
+import com.moru.server.domain.onboarding.dto.OnboardingRequestDTO;
+import com.moru.server.domain.onboarding.dto.OnboardingResponseDTO;
+import com.moru.server.domain.routine.repository.RoutineGroupRepository;
+import com.moru.server.global.exception.BusinessException;
+import com.moru.server.global.response.code.status.ErrorStatus;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class OnboardingCommandServiceImpl implements OnboardingCommandService {
+
+    private final MemberRepository memberRepository;
+    private final RoutineGroupRepository routineGroupRepository;
+
+    @Override
+    public OnboardingResponseDTO.StatusResponse completeOnboarding(
+            Long memberId,
+            OnboardingRequestDTO.CompleteRequest request
+    ) {
+        Member member = memberRepository.findByIdForUpdate(memberId)
+                .orElseThrow(() -> new BusinessException(ErrorStatus.MEMBER_NOT_FOUND));
+
+        boolean ownsRoutineGroup = routineGroupRepository
+                .existsByIdAndMember_Id(request.routineGroupId(), memberId);
+        if (!ownsRoutineGroup) {
+            throw new BusinessException(ErrorStatus.ROUTINE_GROUP_NOT_FOUND);
+        }
+
+        if (Boolean.TRUE.equals(member.getOnboardingCompleted())) {
+            return new OnboardingResponseDTO.StatusResponse(true);
+        }
+
+        member.completeOnboarding();
+        return new OnboardingResponseDTO.StatusResponse(true);
+    }
+}

src/main/java/com/moru/server/domain/routine/dto/RoutineTTSResponseDTO.java

@@ -42,7 +42,15 @@ public record RoutineTTSStep(
                 String ttsStatus,
 
                 @Schema(description = "음원 파일 S3 URL", example = "https://.../101.mp3", nullable = true)
-                String s3Url
+                String s3Url,
+
+                @Schema(description = """
+                        이 음원이 만들어진 목소리 선택 버전. 합성에 성공한 시점에만 기록된다.
+                        PATCH /members/me/tts 응답의 selectionVersion 과 이 값이 같고
+                        ttsStatus 가 COMPLETED 일 때만 최신 목소리로 만들어진 음원이다.
+                        값이 더 작으면 아직 재합성이 끝나지 않아 이전 목소리의 음원이 내려가는 중이다.""",
+                        example = "3", nullable = true)
+                Long selectionVersion
         ) {}
     }
 }