feat: split WorldModel and FavoriteWorldModel

makinosp · Sep 28, 2024 · e5f43d1 · e5f43d1
1 parent 28eba98
commit e5f43d1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/Sources/VRCKit/Models/FavoriteWorldModel.swift b/Sources/VRCKit/Models/FavoriteWorldModel.swift
@@ -6,19 +6,48 @@
 //
 
 import Foundation
+import MemberwiseInit
 
 struct AnyCodable: Codable {}
 
 public struct FavoriteWorldWrapper: Sendable {
-    public let worlds: [World]
+    public let worlds: [FavoriteWorld]
+}
+
+@MemberwiseInit(.public)
+public struct FavoriteWorld: Codable, Sendable, Identifiable, Hashable {
+    public let id: String
+    public let name: String
+    public let description: String?
+    public let featured: Bool
+    public let authorId: String
+    public let authorName: String
+    public let capacity: Int
+    public let tags: [String]
+    public let releaseStatus: World.ReleaseStatus
+    public let imageUrl: URL?
+    public let thumbnailImageUrl: URL?
+    public let namespace: String?
+    public let organization: String
+    public let previewYoutubeId: String?
+    public let favorites: Int?
+    public let createdAt: Date
+    public let updatedAt: Date
+    public let publicationDate: OptionalISO8601Date
+    public let labsPublicationDate: OptionalISO8601Date
+    public let visits: Int
+    public let popularity: Int
+    public let heat: Int
+    public let favoriteGroup: String
+    public let version: Int?
 }
 
 extension FavoriteWorldWrapper: Decodable {
     public init(from decoder: any Decoder) throws {
         var container = try decoder.unkeyedContainer()
-        var worlds: [World] = []
+        var worlds: [FavoriteWorld] = []
         while !container.isAtEnd {
-            if let world = try? container.decode(World.self) {
+            if let world = try? container.decode(FavoriteWorld.self) {
                 worlds.append(world)
             } else {
                 _ = try container.decode(AnyCodable.self)
@@ -27,3 +56,10 @@ extension FavoriteWorldWrapper: Decodable {
         self.worlds = worlds
     }
 }
+
+extension FavoriteWorld: ImageUrlRepresentable {
+    public func imageUrl(_ resolution: ImageResolution) -> URL? {
+        guard let url = thumbnailImageUrl else { return nil }
+        return replaceImageUrl(url: url, resolution: resolution)
+    }
+}
diff --git a/Sources/VRCKit/Models/WorldModel.swift b/Sources/VRCKit/Models/WorldModel.swift
@@ -32,7 +32,6 @@ public struct World: Codable, Sendable, Identifiable, Hashable {
     public let visits: Int
     public let popularity: Int
     public let heat: Int
-    public let favoriteGroup: String?
     public let version: Int?
 
     public enum ReleaseStatus: String, Codable, Sendable {

diff --git a/Sources/VRCKit/Protocols/WorldServiceProtocol.swift b/Sources/VRCKit/Protocols/WorldServiceProtocol.swift
@@ -7,5 +7,5 @@
 
 public protocol WorldServiceProtocol: Sendable {
     func fetchWorld(worldId: String) async throws -> World
-    func fetchFavoritedWorlds(n: Int) async throws -> [World]
+    func fetchFavoritedWorlds(n: Int) async throws -> [FavoriteWorld]
 }
diff --git a/Sources/VRCKit/Services/WorldService.swift b/Sources/VRCKit/Services/WorldService.swift
@@ -20,7 +20,7 @@ public final actor WorldService: APIService, WorldServiceProtocol {
         return try await Serializer.shared.decode(response.data)
     }
 
-    public func fetchFavoritedWorlds(n: Int = 100) async throws -> [World] {
+    public func fetchFavoritedWorlds(n: Int = 100) async throws -> [FavoriteWorld] {
         let queryItems = [URLQueryItem(name: "n", value: n.description)]
         let response = try await client.request(path: "\(path)/favorites", method: .get, queryItems: queryItems)
         let favoriteWorldWrapper: FavoriteWorldWrapper = try await Serializer.shared.decode(response.data)