From: masakih Date: Sun, 12 Aug 2018 11:35:24 +0000 (+0900) Subject: CoreDataの不要なプロパティを削除 X-Git-Url: http://git.osdn.net/view?p=kcd%2FKCD.git;a=commitdiff_plain;h=e1e7b6a81045a53ffc7081ef4e5f471d99a788bc CoreDataの不要なプロパティを削除 --- diff --git a/KCD/Basic.swift b/KCD/Basic.swift index 64ee85ae..2a3132c1 100644 --- a/KCD/Basic.swift +++ b/KCD/Basic.swift @@ -13,7 +13,6 @@ final class Basic: KCManagedObject { @NSManaged var active_flag: NSNumber? @NSManaged var comment: String? - @NSManaged var comment_id: NSNumber? @NSManaged var count_deck: Int @NSManaged var count_kdock: Int @NSManaged var count_ndock: Int @@ -34,11 +33,9 @@ final class Basic: KCManagedObject { @NSManaged var max_kagu: Int @NSManaged var max_slotitem: Int @NSManaged var medals: Int - @NSManaged var member_id: NSNumber? @NSManaged var ms_count: NSNumber? @NSManaged var ms_success: NSNumber? @NSManaged var nickname: String - @NSManaged var nickname_id: NSNumber? @NSManaged var playtime: Int @NSManaged var pt_challenged: NSNumber? @NSManaged var pt_challenged_win: NSNumber? diff --git a/KCD/BasicMapper.swift b/KCD/BasicMapper.swift index 087f8ab8..18c55fb4 100644 --- a/KCD/BasicMapper.swift +++ b/KCD/BasicMapper.swift @@ -18,7 +18,8 @@ final class BasicMapper: JSONMapper { self.apiResponse = apiResponse self.configuration = MappingConfiguration(entity: Basic.self, dataKeys: BasicMapper.dataKeys(apiResponse), - editorStore: ServerDataStore.oneTimeEditor()) + editorStore: ServerDataStore.oneTimeEditor(), + ignoreKeys: ["api_comment_id", "api_member_id", "api_nickname_id"]) } private class func dataKeys(_ apiResponse: APIResponse) -> [String] { diff --git a/KCD/Deck.swift b/KCD/Deck.swift index 2c31732c..28980565 100644 --- a/KCD/Deck.swift +++ b/KCD/Deck.swift @@ -11,15 +11,12 @@ import Cocoa // swiftlint:disable identifier_name final class Deck: KCManagedObject { - @NSManaged var flagship: NSNumber? @NSManaged var id: Int - @NSManaged var member_id: NSNumber? @NSManaged var mission_0: Int @NSManaged var mission_1: Int @NSManaged var mission_2: Int @NSManaged var mission_3: Int @NSManaged var name: String - @NSManaged var name_id: NSNumber? @NSManaged var ship_0: Int @NSManaged var ship_1: Int @NSManaged var ship_2: Int diff --git a/KCD/DeckMapper.swift b/KCD/DeckMapper.swift index b3fcf453..1cbb939c 100644 --- a/KCD/DeckMapper.swift +++ b/KCD/DeckMapper.swift @@ -18,7 +18,8 @@ final class DeckMapper: JSONMapper { self.apiResponse = apiResponse self.configuration = MappingConfiguration(entity: Deck.self, dataKeys: DeckMapper.dataKeys(apiResponse), - editorStore: ServerDataStore.oneTimeEditor()) + editorStore: ServerDataStore.oneTimeEditor(), + ignoreKeys: ["api_flagship", "api_member_id", "api_name_id"]) } private class func dataKeys(_ apiResponse: APIResponse) -> [String] { diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents index cd61ad19..93e7c182 100644 --- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents +++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents @@ -1,5 +1,5 @@ - + @@ -20,7 +20,6 @@ - @@ -40,11 +39,9 @@ - - @@ -60,15 +57,12 @@ - - - @@ -87,7 +81,6 @@ - @@ -229,7 +222,6 @@ - @@ -272,7 +264,6 @@ - @@ -361,21 +352,21 @@ - - - + + + - + - + diff --git a/KCD/KenzoDock.swift b/KCD/KenzoDock.swift index 6326c49e..ab561422 100644 --- a/KCD/KenzoDock.swift +++ b/KCD/KenzoDock.swift @@ -20,6 +20,5 @@ final class KenzoDock: KCManagedObject { @NSManaged var item3: Int @NSManaged var item4: Int @NSManaged var item5: Int - @NSManaged var member_id: NSNumber? @NSManaged var state: Int } diff --git a/KCD/KenzoDockMapper.swift b/KCD/KenzoDockMapper.swift index 7357eb2b..58349fcd 100644 --- a/KCD/KenzoDockMapper.swift +++ b/KCD/KenzoDockMapper.swift @@ -18,7 +18,8 @@ final class KenzoDockMapper: JSONMapper { self.apiResponse = apiResponse self.configuration = MappingConfiguration(entity: KenzoDock.self, dataKeys: KenzoDockMapper.dataKeys(apiResponse), - editorStore: ServerDataStore.oneTimeEditor()) + editorStore: ServerDataStore.oneTimeEditor(), + ignoreKeys: ["api_member_id"]) } private class func dataKeys(_ apiResponse: APIResponse) -> [String] { diff --git a/KCD/MasterSlotItem.swift b/KCD/MasterSlotItem.swift index 5248e940..a0b630ab 100644 --- a/KCD/MasterSlotItem.swift +++ b/KCD/MasterSlotItem.swift @@ -42,6 +42,5 @@ final class MasterSlotItem: KCManagedObject { @NSManaged var type_1: Int @NSManaged var type_2: Int @NSManaged var type_3: Int - @NSManaged var usebull: NSNumber? @NSManaged var slotItems: Set } diff --git a/KCD/MasterSlotItemMapper.swift b/KCD/MasterSlotItemMapper.swift index 5c04ad75..43f2d5b3 100644 --- a/KCD/MasterSlotItemMapper.swift +++ b/KCD/MasterSlotItemMapper.swift @@ -14,7 +14,7 @@ final class MasterSlotItemMapper: JSONMapper { let configuration = MappingConfiguration(entity: MasterSlotItem.self, dataKeys: ["api_data", "api_mst_slotitem"], editorStore: ServerDataStore.oneTimeEditor(), - ignoreKeys: ["api_version"]) + ignoreKeys: ["api_version", "api_usebull"]) required init(_ apiResponse: APIResponse) { diff --git a/KCD/NyukyoDock.swift b/KCD/NyukyoDock.swift index 4f842108..aab95db7 100644 --- a/KCD/NyukyoDock.swift +++ b/KCD/NyukyoDock.swift @@ -18,7 +18,6 @@ final class NyukyoDock: KCManagedObject { @NSManaged var item2: NSNumber? @NSManaged var item3: NSNumber? @NSManaged var item4: NSNumber? - @NSManaged var member_id: NSNumber? @NSManaged var ship_id: Int @NSManaged var state: Int } diff --git a/KCD/NyukyoDockMapper.swift b/KCD/NyukyoDockMapper.swift index 15c5f9d1..1ee4a0df 100644 --- a/KCD/NyukyoDockMapper.swift +++ b/KCD/NyukyoDockMapper.swift @@ -18,7 +18,8 @@ final class NyukyoDockMapper: JSONMapper { self.apiResponse = apiResponse self.configuration = MappingConfiguration(entity: NyukyoDock.self, dataKeys: NyukyoDockMapper.dataKeys(apiResponse), - editorStore: ServerDataStore.oneTimeEditor()) + editorStore: ServerDataStore.oneTimeEditor(), + ignoreKeys: ["api_member_id"]) } private class func dataKeys(_ apiResponse: APIResponse) -> [String] {