不要となっていたプロパティを削除

[kcd/KCD.git] / KCD / DestroyItem2Command.swift

diff --git a/KCD/DestroyItem2Command.swift b/KCD/DestroyItem2Command.swift
index d31b37a..1fce73b 100644 (file)
--- a/KCD/DestroyItem2Command.swift
+++ b/KCD/DestroyItem2Command.swift
@@ -10,45 +10,37 @@ import Cocoa
 
 final class DestroyItem2Command: JSONCommand {
     
-    override class func canExecuteAPI(_ api: String) -> Bool {
+    override class func canExecuteAPI(_ api: API) -> Bool {
         
-        if api == "/kcsapi/api_req_kousyou/destroyitem2" { return true }
-        
-        return false
+        return api.endpoint == .destroyItem2
     }
     
     override func execute() {
         
-        guard let itemIds = parameter["api_slotitem_ids"]
-            .string?
-            .components(separatedBy: ",")
-            .flatMap({ Int($0) }) else {
-                
-                return Logger.shared.log("api_slotitem_ids is wrong")
-        }
-        
         let store = ServerDataStore.oneTimeEditor()
         
-        store.slotItems(in: itemIds).forEach(store.delete)
+        store.sync { store.slotItems(in: self.parameter["api_slotitem_ids"].integerArray).forEach(store.delete) }
         
-        guard let material = store.material() else {
+        guard let material = store.sync(execute: { store.material() }) else {
             
-            return Logger.shared.log("Material is not found")
-        }
-        guard let gm = data["api_get_material"].arrayObject as? [Int] else {
+            Logger.shared.log("Material is not found")
             
-            return Logger.shared.log("api_get_material is wrong")
+            return
         }
-        
-        let resouces = [#keyPath(Material.fuel), #keyPath(Material.bull), #keyPath(Material.steel), #keyPath(Material.bauxite)]
-        
-        zip(gm, resouces).forEach {
-            
-            if let current = material.value(forKey: $0.1) as? Int {
+        guard let getMaterials = data["api_get_material"].arrayObject as? [Int],
+            getMaterials.count >= 4 else {
+                
+                Logger.shared.log("api_get_material is wrong")
                 
-                material.setValue((current + $0.0) as NSNumber, forKey: $0.1)
-            }
+                return
         }
         
+        store.sync {
+            
+            material.fuel += getMaterials[0]
+            material.bull += getMaterials[1]
+            material.steel += getMaterials[2]
+            material.bauxite += getMaterials[3]
+        }
     }
 }