refact: code refactoring Favorite models

Author: makinosp

Sources/VRCKit/Models/Favorite/FavoriteGroupModel.swift

@@ -0,0 +1,36 @@
+//
+//  FavoriteModel.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/10/06.
+//
+
+import MemberwiseInit
+
+@MemberwiseInit(.public)
+public struct FavoriteGroup: Codable, Sendable, Identifiable, Hashable {
+    public let id: String
+    public let displayName: String
+    public let name: String
+    public let ownerId: String
+    public let tags: [String]
+    public let type: FavoriteType
+    public let visibility: Visibility
+
+    public enum Visibility: String, Codable, Sendable {
+        case `private`, friends, `public`
+    }
+}
+
+@MemberwiseInit
+struct RequestToUpdateFavoriteGroup: Codable, Sendable {
+    let displayName: String?
+    let visibility: FavoriteGroup.Visibility?
+    @Init(default: []) let tags: [String]
+}
+
+public struct FavoriteGroupParams: Sendable {
+    let type: FavoriteType
+    let name: String
+    let userId: String
+}

Sources/VRCKit/Models/Favorite/FavoriteListModel.swift

@@ -0,0 +1,17 @@
+//
+//  FavoriteList.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/10/06.
+//
+
+public struct FavoriteList: Sendable, Identifiable {
+    public let id: String
+    public let favorites: [Favorite]
+}
+
+public extension FavoriteList {
+    func allFavoritesAre(_ type: FavoriteType) -> Bool {
+        favorites.allSatisfy { $0.type == type }
+    }
+}

Sources/VRCKit/Models/Favorite/FavoriteModel.swift

@@ -7,14 +7,6 @@
 
 import MemberwiseInit
 
-public enum FavoriteType: String, Codable, Sendable, CaseIterable {
-    case world, avatar, friend
-}
-
-extension FavoriteType: Identifiable {
-    public var id: Int { hashValue }
-}
-
 @MemberwiseInit(.public)
 public struct Favorite: Codable, Sendable, Identifiable {
     public let id: String
@@ -23,41 +15,8 @@ public struct Favorite: Codable, Sendable, Identifiable {
     public let type: FavoriteType
 }
 
-public struct FavoriteDetail: Sendable, Identifiable {
-    public let id: String
-    public let favorites: [Favorite]
-}
-
-public extension FavoriteDetail {
-    func allFavoritesAre(_ type: FavoriteType) -> Bool {
-        favorites.allSatisfy { $0.type == type }
-    }
-}
-
-@MemberwiseInit(.public)
-public struct FavoriteGroup: Codable, Sendable, Identifiable, Hashable {
-    public let id: String
-    public let displayName: String
-    public let name: String
-    public let ownerId: String
-    public let tags: [String]
-    public let type: FavoriteType
-    public let visibility: Visibility
-
-    public enum Visibility: String, Codable, Sendable {
-        case `private`, friends, `public`
-    }
-}
-
 struct RequestToAddFavorite: Codable, Sendable {
     let type: FavoriteType
     let favoriteId: String
     let tags: [String]
 }
-
-@MemberwiseInit
-struct RequestToUpdateFavoriteGroup: Codable, Sendable {
-    let displayName: String?
-    let visibility: FavoriteGroup.Visibility?
-    @Init(default: []) let tags: [String]
-}

Sources/VRCKit/Models/Favorite/FavoriteTypeModel.swift

@@ -0,0 +1,14 @@
+//
+//  FavoriteModel.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/10/06.
+//
+
+public enum FavoriteType: String, Codable, Sendable, CaseIterable {
+    case world, avatar, friend
+}
+
+extension FavoriteType: Identifiable {
+    public var id: Int { hashValue }
+}

Sources/VRCKit/Protocols/FavoriteServiceProtocol.swift

@@ -6,10 +6,9 @@
 //
 
 public protocol FavoriteServiceProtocol: Sendable {
-    typealias FavoriteGroupParams = (type: FavoriteType, name: String, userId: String)
     func listFavoriteGroups() async throws -> [FavoriteGroup]
     func listFavorites(n: Int, type: FavoriteType, tag: String?) async throws -> [Favorite]
-    func fetchFavoriteGroupDetails(favoriteGroups: [FavoriteGroup]) async throws -> [FavoriteDetail]
+    func fetchFavoriteList(favoriteGroups: [FavoriteGroup]) async throws -> [FavoriteList]
     func addFavorite(type: FavoriteType, favoriteId: String, tag: String) async throws -> Favorite
     func updateFavoriteGroup(
         params: FavoriteGroupParams,

Sources/VRCKit/Services/FavoriteService.swift

@@ -49,11 +49,9 @@ public final actor FavoriteService: APIService, FavoriteServiceProtocol {
     /// Fetches details of favorite groups asynchronously.
     /// - Parameter favoriteGroups: An array of `FavoriteGroup` objects.
     /// - Returns: An array of `FavoriteDetail` objects containing detailed information about the favorite groups.
-    public func fetchFavoriteGroupDetails(
-        favoriteGroups: [FavoriteGroup]
-    ) async throws -> [FavoriteDetail] {
-        var results: [FavoriteDetail] = []
-        try await withThrowingTaskGroup(of: FavoriteDetail.self) { taskGroup in
+    public func fetchFavoriteList(favoriteGroups: [FavoriteGroup]) async throws -> [FavoriteList] {
+        var results: [FavoriteList] = []
+        try await withThrowingTaskGroup(of: FavoriteList.self) { taskGroup in
             for favoriteGroup in favoriteGroups.filter({ $0.type == .friend }) {
                 taskGroup.addTask { [weak self] in
                     guard let self = self else {
@@ -63,7 +61,7 @@ public final actor FavoriteService: APIService, FavoriteServiceProtocol {
                         type: .friend,
                         tag: favoriteGroup.name
                     )
-                    return FavoriteDetail(id: favoriteGroup.id, favorites: favorites)
+                    return FavoriteList(id: favoriteGroup.id, favorites: favorites)
                 }
             }
             for try await favoriteGroupDetail in taskGroup {