Fixed errors in last commit

antuniooh · antuniooh · commit 219efcbc61f4 · 2021-05-02T00:57:25.000-03:00
diff --git a/assets/public/list.html b/assets/public/list.html
@@ -81,7 +81,6 @@ <h1 class="h2">Your friends list</h1>
 <script src="https://code.jquery.com/jquery-3.5.0.js"></script>
 <script>
     function sendDelete(event, pokemonID) {
-    alert(pokemonID)
         event.preventDefault();
         console.log(String(pokemonID))
         let url = (pokemonID === "/") ? "/" : String("/?id=" + pokemonID)
diff --git a/databaseUser/HandlerDatabase.py b/databaseUser/HandlerDatabase.py
@@ -15,11 +15,12 @@ def insertPokemon(obj: UserObj):
         if database is None:
             return StatusCode.INTERNAL_SERVER_ERROR
 
+        obj.id = int(obj.id)
         pokemonID = obj.id
         HandlerImage.saveImg(obj)
 
         extensionImage = pathlib.Path(obj.image).suffix
-        urlImage = "/" + obj.id +  extensionImage
+        urlImage = "/" + str(obj.id) +  extensionImage
 
         pokemonData = {
             "name": obj.name,
@@ -52,7 +53,7 @@ def updatePokemonByID(pokemonID: str, pokemonData: UserObj):
         HandlerImage.saveImg(pokemonData)
 
         extensionImage = pathlib.Path(pokemonData.image).suffix
-        urlImage = "/" + pokemonData.id +  extensionImage
+        urlImage = "/" + str(pokemonData.id) +  extensionImage
 
         pokemonData.image = urlImage
         try:
@@ -85,6 +86,7 @@ def updatePokemonByID(pokemonID: str, pokemonData: UserObj):
 
     @staticmethod
     def deletePokemonByID(pokemonID: str):
+        #delete img
         database = HandlerDatabase.getData()
 
         if database is None:
@@ -95,7 +97,8 @@ def deletePokemonByID(pokemonID: str):
         isPokemonRegistered, pokemonIndex = HandlerDatabase.isPokemonRegistered(pokemonID)
         imageLink = ''
         if isPokemonRegistered:
-            imageLink = database["users"][pokemonIndex][pokemonID]['image']
+            print(pokemonID)
+            imageLink = database["users"][pokemonIndex][str(pokemonID)]['image']
             database["users"].pop(pokemonIndex)
             HandlerImage.deleteImg(pokemonID, imageLink)
         else:
@@ -109,6 +112,7 @@ def deletePokemonByID(pokemonID: str):
 
     @staticmethod
     def deleteAllPokemons():
+        #delete links
         database = HandlerDatabase.getData()
 
         if database is None:
@@ -122,7 +126,7 @@ def deleteAllPokemons():
         return StatusCode.INTERNAL_SERVER_ERROR
 
     @staticmethod
-    def isPokemonRegistered(pokemonID: str):
+    def isPokemonRegistered(pokemonID: int):
         database = HandlerDatabase.getData()
 
         if database is None:
@@ -131,7 +135,7 @@ def isPokemonRegistered(pokemonID: str):
         index: int
         element: dict
         for index, element in enumerate(database["users"]):
-            if pokemonID == list(element.keys())[0]:
+            if pokemonID == int(list(element.keys())[0]):
                 return True, index
 
         return False, None
diff --git a/handler/HandlerImage.py b/handler/HandlerImage.py
@@ -13,26 +13,25 @@
 class HandlerImage:
    
     @staticmethod
-    def saveImg(objUser):
+    def saveImg(objUser: UserObj):
         try:
             if(len(objUser.image) > 22):
-                #HandlerImage.deleteImg(objUser.id, "/" + objUser.id + pathlib.Path(objUser.image))
                 img_data = requests.get(objUser.image).content
-                fileImg = "databaseUser/" + objUser.id + pathlib.Path(objUser.image).suffix
+                fileName = str(objUser.id) + str((pathlib.Path(objUser.image).suffix))
 
+                fileImg = "databaseUser/" + fileName
                 with open(fileImg, 'wb') as handler:
                     handler.write(img_data)
         except:
             print("erro when save img")
 
     @staticmethod
     def deleteImg(objId, imageLink):
-        print("A")
-        #try:
-        #    GET.GET.deleteImageLinkInGetList(imageLink)
-        #    os.remove('databaseUser/' + objId + ".*")
-        #except:
-        #    print("erro when delete img")
+        try:
+            HandlerImage.deleteLinkImage(imageLink)
+            os.remove('databaseUser/' + str(objId) + ".*")
+        except:
+            print("erro when delete img")
 
     @staticmethod
     def addLinkImage(urlImage, extensionImage):
@@ -43,3 +42,12 @@ def addLinkImage(urlImage, extensionImage):
                 json.dump(GET.GET.imagesTable, f)
         except:
             print("new image link not save")
+
+    @staticmethod
+    def deleteLinkImage(urlImage):
+        GET.GET.deleteImageLinkInGetList(urlImage)
+        try:
+            with open('databaseUser/imagesLink.json', 'w') as f:
+                json.dump(GET.GET.imagesTable, f)
+        except:
+            print("new image link not save")
diff --git a/methods/GET.py b/methods/GET.py
@@ -47,7 +47,6 @@ def response(request: Request):
                 GET.imagesTable = json.load(f)
         except:
             print("erro in list of links")
-
         if request.URI.find('database') != -1 or request.URI.find('edit') != -1 or request.URI in GET.urlTable:
             response: Response = Response(status_code=StatusCode.OK, body="", header={})
             if request.URI.find('database') != -1:
@@ -102,4 +101,4 @@ def addImageLinkInGetList(newImg, extension):
     
     @staticmethod
     def deleteImageLinkInGetList(newImg):
-        del GET.imagesTable[newImg]
+        del GET.imagesTable[newImg]
