Revize 0e7c3096

Re #8590 - Implemented all fields of subject into DB

src/model/certificate.py

@@ -3 +3 @@
 
 
 class Certificate:
+
     def __init__(self,
                  certificate_id: int,
-                 common_name: str,
                  valid_from: str,
                  valid_to: str,
                  pem_data: str,
-                 private_key_id: int,
                  type_id: int,
                  parent_id: int,
+                 private_key_id: int,
                  usages: Dict[int, bool],
-                 revocation_date: str = "",
-                 revocation_reason: str = ""):
+                 common_name: str,
+                 country_code: str = None,
+                 locality: str = None,
+                 province: str = None,
+                 organization: str = None,
+                 organizational_unit: str = None,
+                 email_address: str = None,
+                 revocation_date: str = None,
+                 revocation_reason: str = None):
         self.certificate_id: int = certificate_id
-        self.common_name: str = common_name
         self.valid_from: str = valid_from
         self.valid_to: str = valid_to
         self.pem_data: str = pem_data
-        self.revocation_date = revocation_date
-        self.revocation_reason = revocation_reason
-        self.private_key_id: int = private_key_id
         self.type_id: int = type_id
         self.parent_id: int = parent_id
+        self.private_key_id: int = private_key_id
+        self.common_name: str = common_name
+        self.country_code: str = country_code
+        self.locality: str = locality
+        self.province: str = province
+        self.organization: str = organization
+        self.organizational_unit: str = organizational_unit
+        self.email_address: str = email_address
+        self.revocation_date: str = revocation_date
+        self.revocation_reason: str = revocation_reason
         self.usages: Dict[int, bool] = DICT_USAGES.copy()
 
-        if revocation_date is None:
-            self.revocation_date = ""
+        #if revocation_date is None:
+        #    self.revocation_date = ""
 
-        if revocation_reason is None:
-            self.revocation_reason = ""
+        #if revocation_reason is None:
+        #    self.revocation_reason = ""
 
         for usage_id, usage_value in usages.items():
             self.usages[usage_id] = usage_value