Revize bb4a9d1f

Re #8702 - Updated Certificate constructors in compliance with the recent database updates.

src/dao/certificate_repository.py

@@ -272 +272 @@
             values += list(target_usages)
 
             sql = (
-                f"SELECT a.{COL_ID}, {COL_COMMON_NAME}, {COL_VALID_FROM}, {COL_VALID_TO}, {COL_PEM_DATA}, "
-                f"{COL_REVOCATION_DATE}, {COL_REVOCATION_REASON}, {COL_PRIVATE_KEY_ID}, {COL_TYPE_ID}, {COL_PARENT_ID} "
+                f"SELECT * "
                 f"FROM {TAB_CERTIFICATES} a "
                 f"WHERE (a.{COL_DELETION_DATE} IS NULL OR a.{COL_DELETION_DATE} = '') "
                 f"AND a.{COL_TYPE_ID} IN ({','.join('?' * len(target_types))}) "
@@ -306 +305 @@
                 for usage_row in usage_rows:
                     usage_dict[usage_row[0]] = True
 
-                certificates.append(Certificate(certificate_row[0],
-                                                certificate_row[1],
-                                                certificate_row[2],
-                                                certificate_row[3],
-                                                certificate_row[4],
-                                                certificate_row[7],
-                                                certificate_row[8],
-                                                certificate_row[9],
+                certificates.append(Certificate(certificate_row[0],  # ID
+                                                certificate_row[1],  # valid from
+                                                certificate_row[2],  # valid to
+                                                certificate_row[3],  # pem data
+                                                certificate_row[14],  # type ID
+                                                certificate_row[15],  # parent ID
+                                                certificate_row[16],  # private key ID
                                                 usage_dict,
-                                                certificate_row[5],
-                                                certificate_row[6]))
+                                                certificate_row[4],  # common name
+                                                certificate_row[5],  # country code
+                                                certificate_row[6],  # locality
+                                                certificate_row[7],  # province
+                                                certificate_row[8],  # organization
+                                                certificate_row[9],  # organizational unit
+                                                certificate_row[10],  # email address
+                                                certificate_row[11],  # revocation date
+                                                certificate_row[12]))  # revocation reason
         except IntegrityError:
             Logger.error(INTEGRITY_ERROR_MSG)
             raise DatabaseException(INTEGRITY_ERROR_MSG)
@@ -726 +731 @@
             values += list(target_usages)
 
             sql = (
-                f"SELECT a.{COL_ID}, {COL_COMMON_NAME}, {COL_VALID_FROM}, {COL_VALID_TO}, {COL_PEM_DATA}, "
-                f"{COL_REVOCATION_DATE}, {COL_REVOCATION_REASON}, {COL_PRIVATE_KEY_ID}, {COL_TYPE_ID}, {COL_PARENT_ID} "
+                f"SELECT * "
                 f"FROM {TAB_CERTIFICATES} a "
                 f"WHERE (a.{COL_DELETION_DATE} IS NULL OR a.{COL_DELETION_DATE} = '') "
                 f"AND a.{COL_PARENT_ID} = ? AND a.{COL_ID} != ? "
@@ -761 +765 @@
                 for usage_row in usage_rows:
                     usage_dict[usage_row[2]] = True
 
-                certificates.append(Certificate(certificate_row[0],
-                                                certificate_row[1],
-                                                certificate_row[2],
-                                                certificate_row[3],
-                                                certificate_row[4],
-                                                certificate_row[7],
-                                                certificate_row[8],
-                                                certificate_row[9],
+                certificates.append(Certificate(certificate_row[0],  # ID
+                                                certificate_row[1],  # valid from
+                                                certificate_row[2],  # valid to
+                                                certificate_row[3],  # pem data
+                                                certificate_row[14],  # type ID
+                                                certificate_row[15],  # parent ID
+                                                certificate_row[16],  # private key ID
                                                 usage_dict,
-                                                certificate_row[5],
-                                                certificate_row[6]))
+                                                certificate_row[4],  # common name
+                                                certificate_row[5],  # country code
+                                                certificate_row[6],  # locality
+                                                certificate_row[7],  # province
+                                                certificate_row[8],  # organization
+                                                certificate_row[9],  # organizational unit
+                                                certificate_row[10],  # email address
+                                                certificate_row[11],  # revocation date
+                                                certificate_row[12]))  # revocation reason
         except IntegrityError:
             Logger.error(INTEGRITY_ERROR_MSG)
             raise DatabaseException(INTEGRITY_ERROR_MSG)