fix - QA 반영 (#34)

* fix(diary): videoUrl 필드 유튜브 id로 변경

* fix: 백그라운드 상태 복귀 시 유튜브 영상 재생 이슈해결

Author: mark77234

KillingPart/ViewModels/Add/AddSearchDetailViewModel.swift

@@ -287,13 +287,87 @@ final class AddSearchDetailViewModel: ObservableObject {
     }
 
     private var videoURLForSave: String? {
-        if let embedURL = selectedVideo?.embedURL?.absoluteString {
-            return embedURL
+        guard let selectedVideo else { return nil }
+
+        if let normalizedVideoID = normalizedYouTubeVideoID(from: selectedVideo.id) {
+            return normalizedVideoID
         }
 
-        guard let selectedVideo else { return nil }
-        let videoID = selectedVideo.id.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !videoID.isEmpty else { return nil }
-        return "https://www.youtube.com/watch?v=\(videoID)"
+        if
+            let embedURLString = selectedVideo.embedURL?.absoluteString,
+            let normalizedVideoID = normalizedYouTubeVideoID(from: embedURLString)
+        {
+            return normalizedVideoID
+        }
+
+        return nil
+    }
+
+    private func normalizedYouTubeVideoID(from value: String) -> String? {
+        let trimmedValue = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmedValue.isEmpty else { return nil }
+
+        if let extractedVideoID = extractYouTubeVideoID(from: trimmedValue) {
+            return extractedVideoID
+        }
+
+        if
+            !trimmedValue.contains("/"),
+            !trimmedValue.contains("?"),
+            !trimmedValue.contains("&"),
+            !trimmedValue.contains("="),
+            !trimmedValue.contains(".")
+        {
+            return trimmedValue
+        }
+
+        return nil
+    }
+
+    private func extractYouTubeVideoID(from value: String) -> String? {
+        guard let components = URLComponents(string: value) else {
+            return nil
+        }
+
+        let pathComponents = components.path.split(separator: "/").map(String.init)
+        if let embedIndex = pathComponents.firstIndex(of: "embed"),
+           pathComponents.indices.contains(embedIndex + 1) {
+            let candidate = pathComponents[embedIndex + 1]
+            if !candidate.isEmpty {
+                return candidate
+            }
+        }
+
+        if let shortsIndex = pathComponents.firstIndex(of: "shorts"),
+           pathComponents.indices.contains(shortsIndex + 1) {
+            let candidate = pathComponents[shortsIndex + 1]
+            if !candidate.isEmpty {
+                return candidate
+            }
+        }
+
+        if let liveIndex = pathComponents.firstIndex(of: "live"),
+           pathComponents.indices.contains(liveIndex + 1) {
+            let candidate = pathComponents[liveIndex + 1]
+            if !candidate.isEmpty {
+                return candidate
+            }
+        }
+
+        if
+            let host = components.host?.lowercased(),
+            host.contains("youtu.be"),
+            let firstPath = pathComponents.first,
+            !firstPath.isEmpty
+        {
+            return firstPath
+        }
+
+        if let watchVideoID = components.queryItems?.first(where: { $0.name == "v" })?.value,
+           !watchVideoID.isEmpty {
+            return watchVideoID
+        }
+
+        return nil
     }
 }

KillingPart/ViewModels/My/MyCollection/MyCollectionViewModel.swift

@@ -238,11 +238,12 @@ final class MyCollectionViewModel: ObservableObject {
 
         do {
             let response = try await diaryService.fetchMyFeeds(page: page, size: size)
+            let normalizedFeeds = normalizeFeedVideoURLs(in: response.content)
             if mode == .initial {
-                myFeeds = response.content
+                myFeeds = normalizedFeeds
             } else {
                 let existingFeedIDs = Set(myFeeds.map(\.id))
-                let newFeeds = response.content.filter { !existingFeedIDs.contains($0.id) }
+                let newFeeds = normalizedFeeds.filter { !existingFeedIDs.contains($0.id) }
                 myFeeds.append(contentsOf: newFeeds)
                 if newFeeds.isEmpty {
                     hasLoadedMyFeeds = true
@@ -264,6 +265,38 @@ final class MyCollectionViewModel: ObservableObject {
         }
     }
 
+    private func normalizeFeedVideoURLs(in feeds: [DiaryFeedModel]) -> [DiaryFeedModel] {
+        feeds.map { feed in
+            let normalizedVideoURL = resolvedVideoURLForPlayback(from: feed.videoUrl)
+            guard normalizedVideoURL != feed.videoUrl else { return feed }
+            return feed.replacingVideoURL(normalizedVideoURL)
+        }
+    }
+
+    private func resolvedVideoURLForPlayback(from rawVideoURL: String) -> String {
+        let trimmedVideoURL = rawVideoURL.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmedVideoURL.isEmpty else { return rawVideoURL }
+        guard isLikelyYouTubeVideoID(trimmedVideoURL) else { return trimmedVideoURL }
+        return "https://www.youtube.com/embed/\(trimmedVideoURL)?playsinline=1"
+    }
+
+    private func isLikelyYouTubeVideoID(_ value: String) -> Bool {
+        if value.hasPrefix("//") {
+            return false
+        }
+
+        if let components = URLComponents(string: value),
+           components.scheme != nil || components.host != nil {
+            return false
+        }
+
+        return !value.contains("/")
+            && !value.contains("?")
+            && !value.contains("&")
+            && !value.contains("=")
+            && !value.contains(".")
+    }
+
     private enum FeedLoadMode {
         case initial
         case pagination
@@ -327,3 +360,30 @@ final class MyCollectionViewModel: ObservableObject {
         }
     }
 }
+
+private extension DiaryFeedModel {
+    func replacingVideoURL(_ newVideoURL: String) -> DiaryFeedModel {
+        DiaryFeedModel(
+            diaryId: diaryId,
+            artist: artist,
+            musicTitle: musicTitle,
+            albumImageUrl: albumImageUrl,
+            content: content,
+            videoUrl: newVideoURL,
+            scope: scope,
+            duration: duration,
+            totalDuration: totalDuration,
+            start: start,
+            end: end,
+            createDate: createDate,
+            updateDate: updateDate,
+            isLiked: isLiked,
+            isStored: isStored,
+            likeCount: likeCount,
+            userId: userId,
+            username: username,
+            tag: tag,
+            profileImageUrl: profileImageUrl
+        )
+    }
+}

KillingPart/Views/Screens/Main/Add/AddSearchDetail/AddSearchDetailView.swift

@@ -2,8 +2,10 @@ import SwiftUI
 
 struct AddSearchDetailView: View {
     @Environment(\.dismiss) private var dismiss
+    @Environment(\.scenePhase) private var scenePhase
     @StateObject private var viewModel: AddSearchDetailViewModel
     @State private var isForwardStepTransition = true
+    @State private var playerReloadToken = UUID()
     private let onSaved: (() -> Void)?
 
     init(
@@ -20,7 +22,10 @@ struct AddSearchDetailView: View {
 
             ScrollView {
                 VStack(alignment: .leading, spacing: AppSpacing.m) {
-                    AddSearchDetailVideoSection(viewModel: viewModel)
+                    AddSearchDetailVideoSection(
+                        viewModel: viewModel,
+                        playerReloadToken: playerReloadToken
+                    )
                     AddSearchDetailTrackInfoSection(track: viewModel.track)
                     detailInputSection
                         .clipped()
@@ -41,6 +46,10 @@ struct AddSearchDetailView: View {
         .task {
             await viewModel.loadIfNeeded()
         }
+        .onChange(of: scenePhase) { phase in
+            guard phase == .active else { return }
+            playerReloadToken = UUID()
+        }
         .navigationTitle("")
         .navigationBarTitleDisplayMode(.inline)
         .toolbar(.visible, for: .navigationBar)

KillingPart/Views/Screens/Main/Add/AddSearchDetail/components/AddSearchDetailVideoSection.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct AddSearchDetailVideoSection: View {
     @ObservedObject var viewModel: AddSearchDetailViewModel
+    let playerReloadToken: UUID
     private let videoAspectRatio: CGFloat = 16 / 9
     private let videoCornerRadius: CGFloat = 16
 
@@ -18,6 +19,7 @@ struct AddSearchDetailVideoSection: View {
                             startSeconds: viewModel.startSeconds,
                             endSeconds: viewModel.endSeconds
                         )
+                            .id(playerReloadToken)
                             .frame(maxWidth: .infinity)
                             .aspectRatio(videoAspectRatio, contentMode: .fit)
                             .allowsHitTesting(false)

KillingPart/Views/Screens/Main/My/MyCollection/[diaryId]/MyCollectionDiary.swift

@@ -3,6 +3,7 @@ import UIKit
 
 struct MyCollectionDiary: View {
     @Environment(\.dismiss) private var dismiss
+    @Environment(\.scenePhase) private var scenePhase
     @FocusState private var isCommentEditorFocused: Bool
 
     let diaryId: Int
@@ -12,6 +13,7 @@ struct MyCollectionDiary: View {
     @StateObject private var viewModel: MyCollectionDiaryViewModel
     @State private var isDeleteDialogPresented = false
     @State private var keyboardHeight: CGFloat = 0
+    @State private var playerReloadToken = UUID()
 
     private let commentFocusAnchorID = "my-collection-diary-comment-focus-anchor"
 
@@ -59,7 +61,8 @@ struct MyCollectionDiary: View {
                                 MyCollectionDiaryVideoSection(
                                     videoURL: videoURL,
                                     startSeconds: viewModel.startSeconds,
-                                    endSeconds: viewModel.endSeconds
+                                    endSeconds: viewModel.endSeconds,
+                                    playerReloadToken: playerReloadToken
                                 )
 
                                 MyCollectionDiaryTrackSection(
@@ -133,6 +136,10 @@ struct MyCollectionDiary: View {
         .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)) { notification in
             updateKeyboardHeight(from: notification)
         }
+        .onChange(of: scenePhase) { phase in
+            guard phase == .active else { return }
+            playerReloadToken = UUID()
+        }
         .navigationTitle("")
         .navigationBarTitleDisplayMode(.inline)
         .toolbar(.visible, for: .navigationBar)

KillingPart/Views/Screens/Main/My/MyCollection/[diaryId]/components/MyCollectionDiaryVideoSection.swift

@@ -4,6 +4,7 @@ struct MyCollectionDiaryVideoSection: View {
     let videoURL: URL?
     let startSeconds: Double
     let endSeconds: Double
+    let playerReloadToken: UUID
 
     private let videoAspectRatio: CGFloat = 16 / 9
     private let videoCornerRadius: CGFloat = 16
@@ -14,6 +15,7 @@ struct MyCollectionDiaryVideoSection: View {
             startSeconds: startSeconds,
             endSeconds: endSeconds
         )
+        .id(playerReloadToken)
         .frame(maxWidth: .infinity)
         .aspectRatio(videoAspectRatio, contentMode: .fill)
         .allowsHitTesting(false)