db schema changes

admin-ch · Jun 2, 2021 · 9b4803e · 9b4803e
1 parent 89b8ba1
commit 9b4803e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 41 deletions.
diff --git a/...vidcertificate-backend-verifier-data/src/main/resources/db/migration/pgsql/V0_1__init.sql b/...vidcertificate-backend-verifier-data/src/main/resources/db/migration/pgsql/V0_1__init.sql
@@ -11,9 +11,7 @@ CREATE TABLE t_country_specific_certificate_authority
     certificate_raw  text NOT NULL,
     imported_at     timestamp with time zone NOT NULL DEFAULT now(),
     origin          character varying(10) NOT NULL,
-    common_name     character varying(255) NOT NULL,
-    issuer_name     character varying(255) NOT NULL,
-    principal_name  character varying(255) NOT NULL,
+    subject_principal_name  character varying(255) NOT NULL,
     CONSTRAINT PK_t_country_specific_certificate_authority PRIMARY KEY ( pk_csca_id ),
     CONSTRAINT csca_unique_key_id UNIQUE ( key_id )
 );
@@ -28,12 +26,12 @@ CREATE TABLE t_document_signer_certificate
     origin                  character varying(10) NOT NULL,
     use                     character varying(10) NOT NULL,
     alg                     character varying(10) NOT NULL,
-    n                       character varying(1000) NOT NULL,
-    e                       character varying(255) NOT NULL,
-    subject_public_key_info character varying(1500) NOT NULL,
-    crv                     character varying(10) NOT NULL,
-    x                       character varying(255) NOT NULL,
-    y                       character varying(255) NOT NULL,
+    n                       character varying(1000),
+    e                       character varying(255),
+    subject_public_key_info character varying(1500),
+    crv                     character varying(10),
+    x                       character varying(255),
+    y                       character varying(255),
     CONSTRAINT PK_t_document_signer_certificate PRIMARY KEY ( pk_dsc_id ),
     CONSTRAINT dsc_unique_key_id UNIQUE ( key_id ),
     CONSTRAINT FK_45 FOREIGN KEY ( fk_csca_id ) REFERENCES t_country_specific_certificate_authority ( pk_csca_id )

diff --git a/...ficate-backend-verifier-data/src/main/resources/db/migration/pgsql_cluster/V0_1__init.sql b/...ficate-backend-verifier-data/src/main/resources/db/migration/pgsql_cluster/V0_1__init.sql
@@ -11,9 +11,7 @@ CREATE TABLE t_country_specific_certificate_authority
     certificate_raw  text NOT NULL,
     imported_at     timestamp with time zone NOT NULL DEFAULT now(),
     origin          character varying(10) NOT NULL,
-    common_name     character varying(255) NOT NULL,
-    issuer_name     character varying(255) NOT NULL,
-    principal_name  character varying(255) NOT NULL,
+    subject_principal_name  character varying(255) NOT NULL,
     CONSTRAINT PK_t_country_specific_certificate_authority PRIMARY KEY ( pk_csca_id ),
     CONSTRAINT csca_unique_key_id UNIQUE ( key_id )
 );
@@ -28,12 +26,12 @@ CREATE TABLE t_document_signer_certificate
     origin                  character varying(10) NOT NULL,
     use                     character varying(10) NOT NULL,
     alg                     character varying(10) NOT NULL,
-    n                       character varying(1000) NOT NULL,
-    e                       character varying(255) NOT NULL,
-    subject_public_key_info character varying(1500) NOT NULL,
-    crv                     character varying(10) NOT NULL,
-    x                       character varying(255) NOT NULL,
-    y                       character varying(255) NOT NULL,
+    n                       character varying(1000),
+    e                       character varying(255),
+    subject_public_key_info character varying(1500),
+    crv                     character varying(10),
+    x                       character varying(255),
+    y                       character varying(255),
     CONSTRAINT PK_t_document_signer_certificate PRIMARY KEY ( pk_dsc_id ),
     CONSTRAINT dsc_unique_key_id UNIQUE ( key_id ),
     CONSTRAINT FK_45 FOREIGN KEY ( fk_csca_id ) REFERENCES t_country_specific_certificate_authority ( pk_csca_id )

diff --git a/...el/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/model/cert/db/DbCsca.java b/...el/src/main/java/ch/admin/bag/covidcertificate/backend/verifier/model/cert/db/DbCsca.java
@@ -18,9 +18,7 @@ public class DbCsca {
     private String certificateRaw;
     private LocalDateTime importedAt;
     private String origin;
-    private String commonName;
-    private String issuerName;
-    private String principalName;
+    private String subjectPrincipalName;
 
     public Long getId() {
         return id;
@@ -62,27 +60,11 @@ public void setOrigin(String origin) {
         this.origin = origin;
     }
 
-    public String getCommonName() {
-        return commonName;
+    public String getSubjectPrincipalName() {
+        return subjectPrincipalName;
     }
 
-    public void setCommonName(String commonName) {
-        this.commonName = commonName;
-    }
-
-    public String getIssuerName() {
-        return issuerName;
-    }
-
-    public void setIssuerName(String issuerName) {
-        this.issuerName = issuerName;
-    }
-
-    public String getPrincipalName() {
-        return principalName;
-    }
-
-    public void setPrincipalName(String principalName) {
-        this.principalName = principalName;
+    public void setSubjectPrincipalName(String subjectPrincipalName) {
+        this.subjectPrincipalName = subjectPrincipalName;
     }
 }