Merge pull request #43 from ApptiveDev/dev

[Release] 1.0.17 업데이트

Author: mark77234

KillingPart/Assets.xcassets/killingpart_music_icon_black.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "killingpart_music_icon_black.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "killingpart_music_icon_black 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "killingpart_music_icon_black 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KillingPart/Assets.xcassets/killingpart_music_icon_black.imageset/killingpart_music_icon_black 1.png

@@ -132,3 +132,266 @@ struct DiaryUpdateRequest: Encodable {
 struct DiaryOrderUpdateRequest: Encodable {
     let diaryIds: [Int]
 }
+
+struct MyCalendarDiariesResponse: Decodable {
+    let diariesByDate: [String: [DiaryFeedModel]]
+
+    var diaries: [DiaryFeedModel] {
+        diariesByDate.values.flatMap { $0 }
+    }
+
+    init(diariesByDate: [String: [DiaryFeedModel]]) {
+        self.diariesByDate = Self.normalized(diariesByDate: diariesByDate)
+    }
+
+    init(from decoder: Decoder) throws {
+        if let feeds = try? [CalendarDiaryFeedResponse](from: decoder) {
+            self.diariesByDate = Self.groupedByDate(from: feeds)
+            return
+        }
+
+        if let keyedFeeds = try? [String: [CalendarDiaryFeedResponse]](from: decoder) {
+            self.diariesByDate = Self.normalized(diariesByDate: keyedFeeds)
+            return
+        }
+
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        if let feeds = container.decodeCalendarDiaryFeedArray() {
+            self.diariesByDate = Self.groupedByDate(from: feeds)
+            return
+        }
+
+        if let groups = container.decodeCalendarGroups() {
+            self.diariesByDate = Self.groupedByDate(from: groups)
+            return
+        }
+
+        if let dataContainer = try? container.nestedContainer(keyedBy: CodingKeys.self, forKey: .data) {
+            if let feeds = dataContainer.decodeCalendarDiaryFeedArray() {
+                self.diariesByDate = Self.groupedByDate(from: feeds)
+                return
+            }
+
+            if let groups = dataContainer.decodeCalendarGroups() {
+                self.diariesByDate = Self.groupedByDate(from: groups)
+                return
+            }
+        }
+
+        self.diariesByDate = [:]
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case content
+        case diaries
+        case data
+        case items
+        case list
+        case result
+        case calendar
+        case dates
+    }
+
+    private static func groupedByDate(from feeds: [CalendarDiaryFeedResponse]) -> [String: [DiaryFeedModel]] {
+        var grouped: [String: [DiaryFeedModel]] = [:]
+        for feed in feeds {
+            let key = feed.calendarDateKey
+            guard !key.isEmpty else { continue }
+            grouped[key, default: []].append(feed.toDiaryFeedModel())
+        }
+        return grouped
+    }
+
+    private static func groupedByDate(from groups: [CalendarDiaryGroupPayload]) -> [String: [DiaryFeedModel]] {
+        var grouped: [String: [DiaryFeedModel]] = [:]
+        for group in groups {
+            let normalizedDate = normalizeDateKey(group.date)
+            guard !normalizedDate.isEmpty else { continue }
+            grouped[normalizedDate, default: []].append(contentsOf: group.diaries.map { $0.toDiaryFeedModel() })
+        }
+        return grouped
+    }
+
+    private static func normalized(diariesByDate: [String: [DiaryFeedModel]]) -> [String: [DiaryFeedModel]] {
+        var normalized: [String: [DiaryFeedModel]] = [:]
+        for (rawKey, diaries) in diariesByDate {
+            let key = normalizeDateKey(rawKey)
+            guard !key.isEmpty else { continue }
+            normalized[key, default: []].append(contentsOf: diaries)
+        }
+        return normalized
+    }
+
+    private static func normalized(diariesByDate: [String: [CalendarDiaryFeedResponse]]) -> [String: [DiaryFeedModel]] {
+        var normalized: [String: [DiaryFeedModel]] = [:]
+        for (rawKey, diaries) in diariesByDate {
+            let key = normalizeDateKey(rawKey)
+            guard !key.isEmpty else { continue }
+            normalized[key, default: []].append(contentsOf: diaries.map { $0.toDiaryFeedModel() })
+        }
+        return normalized
+    }
+
+    private static func normalizeDateKey(_ rawDate: String) -> String {
+        let trimmed = rawDate.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return "" }
+        return trimmed.split(separator: "T").first.map(String.init) ?? trimmed
+    }
+}
+
+private extension KeyedDecodingContainer<MyCalendarDiariesResponse.CodingKeys> {
+    func decodeCalendarDiaryFeedArray() -> [CalendarDiaryFeedResponse]? {
+        if let value = try? decode([CalendarDiaryFeedResponse].self, forKey: .content) { return value }
+        if let value = try? decode([CalendarDiaryFeedResponse].self, forKey: .diaries) { return value }
+        if let value = try? decode([CalendarDiaryFeedResponse].self, forKey: .items) { return value }
+        if let value = try? decode([CalendarDiaryFeedResponse].self, forKey: .list) { return value }
+        if let value = try? decode([CalendarDiaryFeedResponse].self, forKey: .result) { return value }
+        return nil
+    }
+
+    func decodeCalendarGroups() -> [CalendarDiaryGroupPayload]? {
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .content) { return value }
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .data) { return value }
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .diaries) { return value }
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .items) { return value }
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .list) { return value }
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .calendar) { return value }
+        if let value = try? decode([CalendarDiaryGroupPayload].self, forKey: .dates) { return value }
+        return nil
+    }
+}
+
+private struct CalendarDiaryGroupPayload: Decodable {
+    let date: String
+    let diaries: [CalendarDiaryFeedResponse]
+
+    private enum CodingKeys: String, CodingKey {
+        case date
+        case day
+        case diaryDate
+        case targetDate
+        case content
+        case diaries
+        case items
+        case list
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        date = (try? container.decode(String.self, forKey: .date))
+            ?? (try? container.decode(String.self, forKey: .day))
+            ?? (try? container.decode(String.self, forKey: .diaryDate))
+            ?? (try? container.decode(String.self, forKey: .targetDate))
+            ?? ""
+
+        diaries = (try? container.decode([CalendarDiaryFeedResponse].self, forKey: .diaries))
+            ?? (try? container.decode([CalendarDiaryFeedResponse].self, forKey: .content))
+            ?? (try? container.decode([CalendarDiaryFeedResponse].self, forKey: .items))
+            ?? (try? container.decode([CalendarDiaryFeedResponse].self, forKey: .list))
+            ?? []
+    }
+}
+
+private struct CalendarDiaryFeedResponse: Decodable {
+    let diaryId: Int
+    let artist: String
+    let musicTitle: String
+    let albumImageUrl: String
+    let content: String
+    let videoUrl: String
+    let scope: DiaryScope
+    let duration: String
+    let totalDuration: String
+    let start: String
+    let end: String
+    let createDate: String
+    let updateDate: String
+
+    private enum CodingKeys: String, CodingKey {
+        case diaryId
+        case artist
+        case musicTitle
+        case albumImageUrl
+        case content
+        case videoUrl
+        case scope
+        case duration
+        case totalDuration
+        case start
+        case end
+        case createDate
+        case updateDate
+    }
+
+    var calendarDateKey: String {
+        let created = Self.normalizedDateKey(from: createDate)
+        if !created.isEmpty { return created }
+        return Self.normalizedDateKey(from: updateDate)
+    }
+
+    func toDiaryFeedModel() -> DiaryFeedModel {
+        DiaryFeedModel(
+            diaryId: diaryId,
+            artist: artist,
+            musicTitle: musicTitle,
+            albumImageUrl: albumImageUrl,
+            content: content,
+            videoUrl: videoUrl,
+            scope: scope,
+            duration: duration,
+            totalDuration: totalDuration,
+            start: start,
+            end: end,
+            createDate: createDate,
+            updateDate: updateDate,
+            isLiked: false,
+            isStored: false,
+            likeCount: 0,
+            userId: 0,
+            username: nil,
+            tag: nil,
+            profileImageUrl: nil
+        )
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        diaryId = (try? container.decode(Int.self, forKey: .diaryId))
+            ?? Int((try? container.decode(String.self, forKey: .diaryId)) ?? "")
+            ?? 0
+        artist = (try? container.decode(String.self, forKey: .artist)) ?? ""
+        musicTitle = (try? container.decode(String.self, forKey: .musicTitle)) ?? ""
+        albumImageUrl = (try? container.decode(String.self, forKey: .albumImageUrl)) ?? ""
+        content = (try? container.decode(String.self, forKey: .content)) ?? ""
+        videoUrl = (try? container.decode(String.self, forKey: .videoUrl)) ?? ""
+        scope = (try? container.decode(DiaryScope.self, forKey: .scope)) ?? .private
+        duration = (try? container.decode(String.self, forKey: .duration)) ?? ""
+        totalDuration = (try? container.decode(String.self, forKey: .totalDuration)) ?? ""
+        start = (try? container.decode(String.self, forKey: .start)) ?? ""
+        end = (try? container.decode(String.self, forKey: .end)) ?? ""
+        createDate = (try? container.decode(String.self, forKey: .createDate)) ?? ""
+        updateDate = (try? container.decode(String.self, forKey: .updateDate)) ?? ""
+    }
+
+    private static func normalizedDateKey(from rawDate: String) -> String {
+        let trimmed = rawDate.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return "" }
+        return trimmed.split(separator: "T").first.map(String.init) ?? trimmed
+    }
+}
+
+extension DiaryFeedModel {
+    var calendarDateKey: String {
+        let created = Self.normalizedDateKey(from: createDate)
+        if !created.isEmpty { return created }
+        return Self.normalizedDateKey(from: updateDate)
+    }
+
+    private static func normalizedDateKey(from rawDate: String) -> String {
+        let trimmed = rawDate.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return "" }
+        return trimmed.split(separator: "T").first.map(String.init) ?? trimmed
+    }
+}

KillingPart/Assets.xcassets/killingpart_music_icon_black.imageset/killingpart_music_icon_black 2.png

@@ -3,4 +3,5 @@ import Foundation
 extension Notification.Name {
     static let authenticationSessionExpired = Notification.Name("authenticationSessionExpired")
     static let diaryCreated = Notification.Name("diaryCreated")
+    static let navigateToPlayKillingPart = Notification.Name("navigateToPlayKillingPart")
 }

KillingPart/Assets.xcassets/killingpart_music_icon_black.imageset/killingpart_music_icon_black.png

@@ -0,0 +1,93 @@
+import Foundation
+
+protocol CalendarServicing {
+    func fetchMyCalendarDiaries(startDate: String, endDate: String) async throws -> MyCalendarDiariesResponse
+}
+
+enum CalendarServiceError: LocalizedError {
+    case invalidResponse
+    case serverError(statusCode: Int, message: String?)
+    case decodingFailed
+    case sessionExpired
+    case networkFailure(message: String)
+
+    var errorDescription: String? {
+        switch self {
+        case .invalidResponse:
+            return "서버 응답을 확인할 수 없어요."
+        case .serverError(_, let message):
+            return message ?? "캘린더 데이터를 불러오지 못했어요."
+        case .decodingFailed:
+            return "캘린더 응답 파싱에 실패했어요."
+        case .sessionExpired:
+            return "세션이 만료되었어요. 다시 로그인해 주세요."
+        case .networkFailure(let message):
+            return message
+        }
+    }
+}
+
+struct CalendarService: CalendarServicing {
+    private let apiClient: APIClienting
+
+    init(apiClient: APIClienting = APIClient.shared) {
+        self.apiClient = apiClient
+    }
+
+    func fetchMyCalendarDiaries(startDate: String, endDate: String) async throws -> MyCalendarDiariesResponse {
+        let trimmedStartDate = startDate.trimmingCharacters(in: .whitespacesAndNewlines)
+        let trimmedEndDate = endDate.trimmingCharacters(in: .whitespacesAndNewlines)
+
+        var queryItems: [URLQueryItem] = []
+        if !trimmedStartDate.isEmpty {
+            queryItems.append(URLQueryItem(name: "start", value: trimmedStartDate))
+        }
+        if !trimmedEndDate.isEmpty {
+            queryItems.append(URLQueryItem(name: "end", value: trimmedEndDate))
+        }
+
+        let request = APIRequest(
+            path: "/diaries/my/calendar",
+            method: .get,
+            queryItems: queryItems,
+            requiresAuthorization: true
+        )
+
+        do {
+            return try await apiClient.request(request, responseType: MyCalendarDiariesResponse.self)
+        } catch {
+            if isRequestCancelled(error) { throw error }
+            throw mapError(error)
+        }
+    }
+
+    private func mapError(_ error: Error) -> CalendarServiceError {
+        if let calendarError = error as? CalendarServiceError {
+            return calendarError
+        }
+
+        if let apiError = error as? APIClientError {
+            switch apiError {
+            case .invalidResponse:
+                return .invalidResponse
+            case .missingAccessToken, .missingRefreshToken, .unauthorized:
+                return .sessionExpired
+            case .serverError(let statusCode, let message):
+                return .serverError(statusCode: statusCode, message: message)
+            case .decodingFailed:
+                return .decodingFailed
+            }
+        }
+
+        return .networkFailure(message: "캘린더 요청 중 오류가 발생했어요.")
+    }
+
+    private func isRequestCancelled(_ error: Error) -> Bool {
+        if error is CancellationError {
+            return true
+        }
+
+        let nsError = error as NSError
+        return nsError.domain == NSURLErrorDomain && nsError.code == NSURLErrorCancelled
+    }
+}