refactor: 프로필 아바타에서 CacheableImage 제거

Author: opficdev

Application/DevLogPresentation/Sources/Common/Component/CacheableImage.swift

@@ -57,12 +57,7 @@ struct ProfileView: View {
         ScrollView {
             LazyVStack(alignment: .leading, spacing: 16) {
                 HStack {
-                    CacheableImage(url: coordinator.viewModel.state.avatarURL) {
-                        Image(systemName: "person.crop.circle.fill")
-                            .resizable()
-                            .scaledToFill()
-                            .foregroundStyle(Color(.systemGray2))
-                    }
+                    profileAvatarImage
                     .frame(width: 60, height: 60)
                     .cornerRadius(30)
                     .foregroundStyle(Color.gray)
@@ -129,6 +124,21 @@ struct ProfileView: View {
         .toolbar { profileToolbarContent }
     }
 
+    @ViewBuilder
+    private var profileAvatarImage: some View {
+        if let data = coordinator.viewModel.state.avatarImageData?.data,
+           let uiImage = UIImage(data: data) {
+            Image(uiImage: uiImage)
+                .resizable()
+                .scaledToFill()
+        } else {
+            Image(systemName: "person.crop.circle.fill")
+                .resizable()
+                .scaledToFill()
+                .foregroundStyle(Color(.systemGray2))
+        }
+    }
+
     @ToolbarContentBuilder
     private var profileToolbarContent: some ToolbarContent {
         ToolbarItem(placement: .topBarTrailing) {

Application/DevLogPresentation/Sources/Profile/ProfileView.swift

@@ -21,6 +21,7 @@ final class ProfileViewCoordinator {
         self.container = container
         self.viewModel = ProfileViewModel(
             fetchUserDataUseCase: container.resolve(FetchUserDataUseCase.self),
+            fetchProfileImageDataUseCase: container.resolve(FetchProfileImageDataUseCase.self),
             fetchTodosUseCase: container.resolve(FetchTodosUseCase.self),
             upsertStatusMessageUseCase: container.resolve(UpsertStatusMessageUseCase.self),
             networkConnectivityUseCase: container.resolve(ObserveNetworkConnectivityUseCase.self),

Application/DevLogPresentation/Sources/Profile/ProfileViewCoordinator.swift

@@ -10,6 +10,18 @@ import Combine
 import DevLogCore
 import DevLogDomain
 
+struct ProfileAvatarImageData: Equatable {
+    let id: Int
+    let data: Data
+
+    static func == (
+        lhs: ProfileAvatarImageData,
+        rhs: ProfileAvatarImageData
+    ) -> Bool {
+        lhs.id == rhs.id
+    }
+}
+
 @Observable
 final class ProfileViewModel: StorePattern {
     struct State: Equatable {
@@ -19,6 +31,7 @@ final class ProfileViewModel: StorePattern {
         var isLoading: Bool = false
         var statusMessage: String = ""
         var avatarURL: URL?
+        var avatarImageData: ProfileAvatarImageData?
         var earliestQuarterStart: Date?
         var selectedQuarterStart: Date?
         var showQuarterPicker: Bool = false
@@ -41,6 +54,7 @@ final class ProfileViewModel: StorePattern {
         case tapResetStatusMessageButton
         case willUpdateStatusMessage
         case fetchUserData(UserProfile)
+        case setAvatarImageData(URL, Data)
         case setActivityQuarter(
             quarterStart: Date,
             quarter: HeatmapQuarter,
@@ -60,13 +74,15 @@ final class ProfileViewModel: StorePattern {
 
     enum SideEffect {
         case fetchUserData
+        case fetchAvatarImageData(URL)
         case fetchActivityQuarter(Date)
         case updateStatusMessage(String)
         case updateHeatmapActivityKinds(Set<ActivityKind>)
     }
 
     private(set) var state = State()
     private let fetchUserDataUseCase: FetchUserDataUseCase
+    private let fetchProfileImageDataUseCase: FetchProfileImageDataUseCase
     private let fetchTodosUseCase: FetchTodosUseCase
     private let upsertStatusMessageUseCase: UpsertStatusMessageUseCase
     private let networkConnectivityUseCase: ObserveNetworkConnectivityUseCase
@@ -78,13 +94,15 @@ final class ProfileViewModel: StorePattern {
 
     init(
         fetchUserDataUseCase: FetchUserDataUseCase,
+        fetchProfileImageDataUseCase: FetchProfileImageDataUseCase,
         fetchTodosUseCase: FetchTodosUseCase,
         upsertStatusMessageUseCase: UpsertStatusMessageUseCase,
         networkConnectivityUseCase: ObserveNetworkConnectivityUseCase,
         fetchHeatmapActivityTypesUseCase: FetchHeatmapActivityTypesUseCase,
         updateHeatmapActivityTypesUseCase: UpdateHeatmapActivityTypesUseCase
     ) {
         self.fetchUserDataUseCase = fetchUserDataUseCase
+        self.fetchProfileImageDataUseCase = fetchProfileImageDataUseCase
         self.fetchTodosUseCase = fetchTodosUseCase
         self.upsertStatusMessageUseCase = upsertStatusMessageUseCase
         self.networkConnectivityUseCase = networkConnectivityUseCase
@@ -121,14 +139,25 @@ final class ProfileViewModel: StorePattern {
         case .tapResetStatusMessageButton:
             state.statusMessage = ""
         case .fetchUserData(let profile):
+            let previousAvatarURL = state.avatarURL
             state.name = profile.name
             state.email = profile.email
             state.statusMessage = profile.statusMessage
             state.avatarURL = profile.avatarURL
+            if previousAvatarURL != profile.avatarURL {
+                state.avatarImageData = nil
+            }
+            if let avatarURL = profile.avatarURL {
+                effects = [.fetchAvatarImageData(avatarURL)]
+            }
             if state.earliestQuarterStart == nil {
                 state.earliestQuarterStart = quarterStart(for: profile.createdAt)
                     ?? calendar.startOfDay(for: profile.createdAt)
             }
+        case .setAvatarImageData(let url, let data):
+            guard state.avatarURL == url else { break }
+            let id = (state.avatarImageData?.id ?? 0) + 1
+            state.avatarImageData = ProfileAvatarImageData(id: id, data: data)
         case .setQuarterPickerPresented(let isPresented):
             state.showQuarterPicker = isPresented
         case .setQuarterPickerYear(let year):
@@ -202,6 +231,13 @@ final class ProfileViewModel: StorePattern {
                     send(.setAlert(true))
                 }
             }
+        case .fetchAvatarImageData(let url):
+            Task {
+                do {
+                    let data = try await fetchProfileImageDataUseCase.execute(from: url)
+                    send(.setAvatarImageData(url, data))
+                } catch { }
+            }
         case .fetchActivityQuarter(let quarterStart):
             beginLoading(mode: .delayed)
             Task {

Application/DevLogPresentation/Sources/Profile/ProfileViewModel.swift

@@ -0,0 +1,65 @@
+//
+//  ProfileViewModelTests.swift
+//  DevLogPresentationTests
+//
+//  Created by opfic on 6/11/26.
+//
+
+import Testing
+import Foundation
+import DevLogDomain
+@testable import DevLogPresentation
+
+@MainActor
+struct ProfileViewModelTests {
+    @Test("같은 아바타 URL을 다시 받아도 프로필 이미지 데이터를 다시 요청한다")
+    func 같은_아바타_URL을_다시_받아도_프로필_이미지_데이터를_다시_요청한다() async {
+        let imageData = Data([1, 2, 3])
+        let spy = FetchProfileImageDataUseCaseSpy(data: imageData)
+        let viewModel = makeProfileViewModel(fetchProfileImageDataUseCase: spy)
+        let avatarURL = URL(string: "https://example.com/avatar.png")!
+        let profile = UserProfile(
+            name: "opfic",
+            email: "opfic@example.com",
+            statusMessage: "status",
+            avatarURL: avatarURL,
+            createdAt: Date(timeIntervalSince1970: 0)
+        )
+
+        viewModel.send(.fetchUserData(profile))
+        await waitUntil {
+            spy.calledURLs == [avatarURL]
+        }
+
+        viewModel.send(.fetchUserData(profile))
+        await waitUntil {
+            spy.calledURLs == [avatarURL, avatarURL]
+        }
+
+        #expect(spy.calledURLs == [avatarURL, avatarURL])
+        #expect(viewModel.state.avatarImageData?.data == imageData)
+    }
+}
+
+@MainActor
+private func makeProfileViewModel(
+    fetchProfileImageDataUseCase: FetchProfileImageDataUseCase
+) -> ProfileViewModel {
+    ProfileViewModel(
+        fetchUserDataUseCase: FetchUserDataUseCaseSpy(
+            profile: UserProfile(
+                name: "opfic",
+                email: "opfic@example.com",
+                statusMessage: "",
+                avatarURL: nil,
+                createdAt: Date(timeIntervalSince1970: 0)
+            )
+        ),
+        fetchProfileImageDataUseCase: fetchProfileImageDataUseCase,
+        fetchTodosUseCase: FetchTodosUseCaseSpy(),
+        upsertStatusMessageUseCase: UpsertStatusMessageUseCaseSpy(),
+        networkConnectivityUseCase: ObserveNetworkConnectivityUseCaseSpy(),
+        fetchHeatmapActivityTypesUseCase: FetchHeatmapActivityTypesUseCaseSpy(),
+        updateHeatmapActivityTypesUseCase: UpdateHeatmapActivityTypesUseCaseSpy()
+    )
+}

Application/DevLogPresentation/Tests/Profile/ProfileViewModelTests.swift

@@ -192,6 +192,56 @@ final class FetchTodosUseCaseSpy: FetchTodosUseCase {
     }
 }
 
+final class FetchUserDataUseCaseSpy: FetchUserDataUseCase {
+    var profile: UserProfile
+
+    init(profile: UserProfile) {
+        self.profile = profile
+    }
+
+    func execute() async throws -> UserProfile {
+        profile
+    }
+}
+
+final class FetchProfileImageDataUseCaseSpy: FetchProfileImageDataUseCase {
+    var data: Data
+    private(set) var calledURLs: [URL] = []
+
+    init(data: Data) {
+        self.data = data
+    }
+
+    func execute(from url: URL) async throws -> Data {
+        calledURLs.append(url)
+        return data
+    }
+}
+
+final class UpsertStatusMessageUseCaseSpy: UpsertStatusMessageUseCase {
+    private(set) var messages: [String] = []
+
+    func execute(_ message: String) async throws {
+        messages.append(message)
+    }
+}
+
+final class FetchHeatmapActivityTypesUseCaseSpy: FetchHeatmapActivityTypesUseCase {
+    var activityTypes: [String] = []
+
+    func execute() -> [String] {
+        activityTypes
+    }
+}
+
+final class UpdateHeatmapActivityTypesUseCaseSpy: UpdateHeatmapActivityTypesUseCase {
+    private(set) var activityTypes: [[String]] = []
+
+    func execute(_ activityTypes: [String]) {
+        self.activityTypes.append(activityTypes)
+    }
+}
+
 final class FetchWebPagesUseCaseSpy: FetchWebPagesUseCase {
     var webPages: [WebPage]
     private(set) var calledQueries: [String] = []