クラス内でしか使わないenumと関数をクラス内に隠蔽した

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

diff --git a/KCD/ShipMapper.swift b/KCD/ShipMapper.swift
index fcbaa8b..fdecaa0 100644 (file)
--- a/KCD/ShipMapper.swift
+++ b/KCD/ShipMapper.swift
@@ -9,39 +9,6 @@
 import Cocoa
 import SwiftyJSON
 
-fileprivate enum ShipAPI: String {
-    
-    case getMemberShip = "/kcsapi/api_get_member/ship"
-    case port = "/kcsapi/api_port/port"
-    case getMemberShip3 = "/kcsapi/api_get_member/ship3"
-    case kousyouGetShip = "/kcsapi/api_req_kousyou/getship"
-    case getMemberShipDeck = "/kcsapi/api_get_member/ship_deck"
-    case kaisouPowerUp = "/kcsapi/api_req_kaisou/powerup"
-    case kaisouSlotDeprive = "/kcsapi/api_req_kaisou/slot_deprive"
-}
-
-fileprivate func dataKeys(_ apiResponse: APIResponse) -> [String] {
-    
-    guard let shipApi = ShipAPI(rawValue: apiResponse.api)
-        else { return ["api_data"] }
-    
-    switch shipApi {
-    case .port: return ["api_data", "api_ship"]
-        
-    case .getMemberShip3: return ["api_data", "api_ship_data"]
-        
-    case .kousyouGetShip: return ["api_data", "api_ship"]
-        
-    case .getMemberShipDeck: return ["api_data", "api_ship_data"]
-        
-    case .kaisouPowerUp: return ["api_data", "api_ship"]
-        
-    case .kaisouSlotDeprive: return ["api_data", "api_ship_data", "api_set_ship"]
-        
-    case .getMemberShip: return ["api_data"]
-    }
-}
-
 extension MappingConfiguration {
     
     func change(dataKeys: [String]) -> MappingConfiguration {
@@ -64,7 +31,7 @@ final class ShipMapper: JSONMapper {
         
         self.apiResponse = apiResponse
         self.configuration = MappingConfiguration(entity: Ship.entity,
-                                                  dataKeys: dataKeys(apiResponse),
+                                                  dataKeys: ShipMapper.dataKeys(apiResponse),
                                                   editorStore: ServerDataStore.oneTimeEditor(),
                                                   ignoreKeys:
             ["api_gomes", "api_gomes2", "api_broken", "api_powup",
@@ -91,6 +58,40 @@ final class ShipMapper: JSONMapper {
         self.configuration = configuration
     }
     
+    
+    private enum ShipAPI: String {
+        
+        case getMemberShip = "/kcsapi/api_get_member/ship"
+        case port = "/kcsapi/api_port/port"
+        case getMemberShip3 = "/kcsapi/api_get_member/ship3"
+        case kousyouGetShip = "/kcsapi/api_req_kousyou/getship"
+        case getMemberShipDeck = "/kcsapi/api_get_member/ship_deck"
+        case kaisouPowerUp = "/kcsapi/api_req_kaisou/powerup"
+        case kaisouSlotDeprive = "/kcsapi/api_req_kaisou/slot_deprive"
+    }
+    
+    private class func dataKeys(_ apiResponse: APIResponse) -> [String] {
+        
+        guard let shipApi = ShipAPI(rawValue: apiResponse.api)
+            else { return ["api_data"] }
+        
+        switch shipApi {
+        case .port: return ["api_data", "api_ship"]
+            
+        case .getMemberShip3: return ["api_data", "api_ship_data"]
+            
+        case .kousyouGetShip: return ["api_data", "api_ship"]
+            
+        case .getMemberShipDeck: return ["api_data", "api_ship_data"]
+            
+        case .kaisouPowerUp: return ["api_data", "api_ship"]
+            
+        case .kaisouSlotDeprive: return ["api_data", "api_ship_data", "api_set_ship"]
+            
+        case .getMemberShip: return ["api_data"]
+        }
+    }
+    
     private var registerIds: [Int] = []
     private lazy var masterShips: [MasterShip] = {