feat: fix remove character

xramos · Apr 8, 2024 · 2c7e144 · 2c7e144
1 parent d9078eb
commit 2c7e144
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 45 deletions.
diff --git a/MyComics/MyComics/Database/DBManager.swift b/MyComics/MyComics/Database/DBManager.swift
@@ -36,6 +36,7 @@ extension DBManager: Persistence {
 
             let dbCharacter = DBCharacter(context: coreDataStack.managedContext)
             dbCharacter.id = Int32(character.id)
+            dbCharacter.characterId = Int32(character.id)
             dbCharacter.name = character.name
             dbCharacter.realName = character.realName
             dbCharacter.aliases = character.aliases
@@ -62,7 +63,8 @@ extension DBManager: Persistence {
         let characterId = Int32(character.id)
 
         let fetchRequest = NSFetchRequest<DBCharacter>(entityName: "DBCharacter")
-        fetchRequest.predicate = NSPredicate(format: "id==\(characterId)")
+        fetchRequest.predicate = NSPredicate(format: "characterId==\(characterId)")
+
         do {
 
             let dbCharacters = try coreDataStack.managedContext.fetch(fetchRequest)
@@ -79,25 +81,21 @@ extension DBManager: Persistence {
         }
     }
 
-    func existCharacter(character: Character) -> Bool {
+    func getCharacter(id: Int) -> Character? {
 
-        let characterId = Int32(character.id)
+        let characters = getCharacters()
 
-        let fetchRequest = NSFetchRequest<DBCharacter>(entityName: "DBCharacter")
-        fetchRequest.predicate = NSPredicate(format: "id==\(characterId)")
-
-        do {
-
-            let dbCharacters = try coreDataStack.managedContext.fetch(fetchRequest)
+        for character in characters where character.id == id {
 
-            return dbCharacters.first != nil
-
-        } catch let error as NSError {
-
-            print("Could not fetch for delete. \(error), \(error.userInfo)")
-
-            return false
+            return character
         }
+
+        return nil
+    }
+
+    func existCharacter(character: Character) -> Bool {
+
+        return getCharacter(id: character.id) != nil
     }
 
     func getCharacters() -> [Character] {
@@ -122,32 +120,4 @@ extension DBManager: Persistence {
 
         return characters
     }
-
-    func getCharacter(id: Int) -> Character? {
-
-        let characterId = Int32(id)
-
-        let fetchRequest = NSFetchRequest<DBCharacter>(entityName: "DBCharacter")
-        fetchRequest.predicate = NSPredicate(format: "id==\(characterId)")
-
-        do {
-
-            let dbCharacters = try coreDataStack.managedContext.fetch(fetchRequest)
-
-            if let dbCharacter = dbCharacters.first {
-
-                return dbCharacter.convertToEntity()
-
-            } else {
-
-                return nil
-            }
-
-        } catch let error as NSError {
-
-            print("Could not fetch character id. \(error), \(error.userInfo)")
-
-            return nil
-        }
-    }
 }
diff --git a/MyComics/MyComics/Database/Model.xcdatamodeld/Model.xcdatamodel/contents b/MyComics/MyComics/Database/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -3,6 +3,7 @@
     <entity name="DBCharacter" representedClassName="DBCharacter" syncable="YES" codeGenerationType="class">
         <attribute name="aliases" optional="YES" attributeType="String"/>
         <attribute name="birth" optional="YES" attributeType="String"/>
+        <attribute name="characterId" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="deck" optional="YES" attributeType="String"/>
         <attribute name="gender" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="id" transient="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>

diff --git a/MyComics/MyComics/Entitites/DBEntities/DBCharacter.swift b/MyComics/MyComics/Entitites/DBEntities/DBCharacter.swift
@@ -20,7 +20,7 @@ extension DBCharacter {
             pows = dbPowers.map({ $0.convertToEntity()})
         }
 
-        return Character(id: Int(id),
+        return Character(id: Int(characterId),
                          name: name ?? "",
                          realName: realName ?? "",
                          aliases: aliases ?? "",