Revize 805077f5

Re #8471 - Error correction after review

src/dao/certificate_repository.py

@@ -18 +18 @@
         self.connection = connection
         self.cursor = cursor
 
-    def create(self, certificate: Certificate) -> bool:
+    def create(self, certificate: Certificate):
         """
         Creates a certificate.
         For root certificate (CA) the parent certificate id is modified to the same id (id == parent_id).
@@ -65 +65 @@
                         self.connection.commit()
         except Error as e:
             print(e)
-            return False
+            return None
 
-        return True
+        return last_id
 
-    def read(self, certificate_id: int) -> Certificate:
+    def read(self, certificate_id: int):
         """
         Reads (selects) a certificate.
 
@@ -107 +107 @@
             print(e)
             return None
 
-        return certificate
+        if len(certificate_row) > 0:
+            return certificate
+        else:
+            return None
 
     def update(self, certificate_id: int, certificate: Certificate) -> bool:
         """
@@ -137 +140 @@
                       certificate.pem_data,
                       certificate.private_key_id,
                       certificate.type_id,
-                      certificate.parent_id]
+                      certificate.parent_id,
+                      certificate_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
 

src/dao/private_key_repository.py

@@ -17 +17 @@
         self.connection = connection
         self.cursor = cursor
 
-    def create(self, private_key: PrivateKey) -> bool:
+    def create(self, private_key: PrivateKey):
         """
         Creates a private key.
 
@@ -34 +34 @@
             values = [private_key.private_key,
                       private_key.password]
             self.cursor.execute(sql, values)
+            last_id = self.cursor.lastrowid
             self.connection.commit()
-
         except Error as e:
             print(e)
-            return False
+            return None
 
-        return True
+        return last_id
 
     def read(self, private_key_id: int):
         """
@@ -65 +65 @@
             print(e)
             return None
 
-        return private_key
+        if len(private_key_row) > 0:
+            return private_key
+        else:
+            return None
 
     def update(self, private_key_id: int, private_key: PrivateKey) -> bool:
         """
@@ -83 +86 @@
                    f"{COL_PASSWORD} = ? "
                    f"WHERE {COL_ID} = ?")
             values = [private_key.private_key,
-                      private_key.password]
+                      private_key.password,
+                      private_key_id]
             self.cursor.execute(sql, values)
             self.connection.commit()
         except Error as e:

src/db_objects/private_key.py

@@ -1 +1 @@
 class PrivateKey:
     def __init__(self,
+                 private_key_id: int,
                  private_key: str,
                  password: str):
+        self.private_key = private_key_id
         self.private_key = private_key
         self.password = password