Update all clothing data #97

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/environments/Items.swift

@@ -16,30 +16,21 @@ public class Items: ObservableObject {
     @Published public var villagersHouse: [String: VillagerHouse] = [:]
 
     private var villagerItemsCache: [String: [Item]] = [:]
-
-    private let migrated: [Category] = [.housewares, .art, .miscellaneous, .wallMounted, .recipes]
 
     init() {
         for category in Category.allCases {
-            if Category.furnitures().contains(category) {
+            // Migrated to new JSOn format
+            if let filename = Category.dataFilename(category: category) {
                 _ = NookPlazaAPIService
-                    .fetchFile(name: "furnitures")
+                    .fetchFile(name: filename)
                     .replaceError(with: NewItemResponse(total: 0, results: []))
                     .eraseToAnyPublisher()
                     .map{ $0.results.filter{ $0.content.appCategory == category }.map{ $0.content }}
                     .subscribe(on: DispatchQueue.global())
                     .receive(on: DispatchQueue.main)
                     .sink(receiveValue: { [weak self] items in self?.categories[category] = items })
-            } else if migrated.contains(category) {
-                _ = NookPlazaAPIService
-                    .fetch(endpoint: category)
-                    .replaceError(with: NewItemResponse(total: 0, results: []))
-                    .eraseToAnyPublisher()
-                    .map{ $0.results.map{ $0.content }}
-                    .subscribe(on: DispatchQueue.global())
-                    .receive(on: DispatchQueue.main)
-                    .sink(receiveValue: { [weak self] items in self?.categories[category] = items })
             } else {
+                // Old JSON format
                 _ = NookPlazaAPIService
                     .fetch(endpoint: category)
                     .replaceError(with: ItemResponse(total: 0, results: []))

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/models/Category.swift

@@ -13,7 +13,8 @@ public enum Category: String, CaseIterable {
     case housewares, miscellaneous
     case wallMounted = "wall-mounted"
     case wallpapers, floors, rugs, photos, posters, fencing, tools
-    case tops, bottoms, dresses, headwear, accessories, socks, shoes, bags
+    case tops, bottoms, headwear, accessories, socks, shoes, bags
+    case dressup = "Dress-Up"
     case umbrellas, music, recipes, construction, nookmiles, other
     case art, bugs, fish, fossils
 
@@ -65,16 +66,31 @@ public enum Category: String, CaseIterable {
             return "icon-fish"
         case .tools:
             return "icon-tool"
-        case .dresses:
+        case .dressup:
             return "icon-top"
         case .shoes:
             return "icon-shoes"
         }
     }
 
-    public static func furnitures() -> [Category] {
+    public static func dataFilename(category: Category) -> String? {
+        if APIFurnitures().contains(category) {
+            return "furnitures"
+        } else if APIClothing().contains(category) {
+            return "clothing"
+        } else if category == .recipes {
+            return category.rawValue
+        }
+        return nil
+    }
+
+    public static func APIFurnitures() -> [Category] {
         [.housewares, .miscellaneous, .wallMounted, .art]
     }
+
+    public static func APIClothing() -> [Category] {
+        [.accessories, .headwear, .tops, .bottoms, .dressup, .socks, .shoes, .bags]
+    }
 
     public static func villagerFurnitures() -> [Category] {
         [.housewares, .miscellaneous, .wallMounted, .art,
@@ -88,7 +104,7 @@ public enum Category: String, CaseIterable {
     }
 
     public static func wardrobe() -> [Category] {
-        [.tops, .bottoms, .dresses, .headwear,
+        [.tops, .bottoms, .dressup, .headwear,
          .accessories, .socks, .shoes, .bags, .umbrellas]
     }
 
@@ -99,7 +115,7 @@ public enum Category: String, CaseIterable {
     public static func icons() -> [Category] {
         return  [.housewares, .recipes, .floors, .rugs, .wallpapers,
                 .fencing, .music, .tools, .nookmiles, .construction, .tops,
-                 .bottoms, .dresses, .headwear, .accessories, .socks, .bags, .umbrellas,
+                 .bottoms, .dressup, .headwear, .accessories, .socks, .bags, .umbrellas,
                  .fish, .bugs, .fossils]
     }
 }

ACHNBrowserUI/ACHNBrowserUI/packages/Backend/Sources/Backend/models/Item.swift

@@ -55,6 +55,7 @@ public struct Item: Codable, Equatable, Identifiable, Hashable {
 
     public let obtainedFrom: String?
     public let obtainedFromNew: [String]?
+    public let sourceNote: String?
     public let dIY: Bool?
     public let customize: Bool?
 
@@ -69,6 +70,8 @@ public struct Item: Codable, Equatable, Identifiable, Hashable {
             return .bugs
         } else if category == "Nook Miles" {
             return .nookmiles
+        } else if category == "Dress-Up" {
+            return .dressup
         }
         return Category(rawValue: category.lowercased())!
     }
@@ -157,6 +160,7 @@ public let static_item = Item(name: "Acoustic guitar",
                        itemImage: nil,
                        obtainedFrom: "Crafting",
                        obtainedFromNew: ["Crafting"],
+                       sourceNote: "From somewhere",
                        dIY: true,
                        customize: true,
                        variants: nil,

ACHNBrowserUI/ACHNBrowserUI/views/categories/CategoriesView.swift

@@ -34,7 +34,7 @@ struct CategoriesView: View {
                                               icon: Backend.Category.fossils.iconName(),
                                               categories: Backend.Category.nature())
                             makeSubCategories(name: "Wardrobe",
-                                              icon: Backend.Category.dresses.iconName(),
+                                              icon: Backend.Category.dressup.iconName(),
                                               categories: Backend.Category.wardrobe())
                             makeCategories()
                         } else {