From 300ebc1e867e40ba691ae9c6d54a364ac4d299d3 Mon Sep 17 00:00:00 2001
From: Felix Dittrich <31076102+f11h@users.noreply.github.com>
Date: Tue, 29 Mar 2022 15:43:24 +0200
Subject: [PATCH] Add UUID and Domain to TrustedIssuer (#178)

---
 .../dgc/gateway/entity/TrustedIssuerEntity.java | 14 +++++++++++++-
 .../gateway/restapi/dto/TrustedIssuerDto.java   |  5 ++++-
 src/main/resources/db/changelog.xml             |  1 +
 .../add-uuid-and-domain-for-trusted-issuer.xml  | 17 +++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/db/changelog/add-uuid-and-domain-for-trusted-issuer.xml

diff --git a/src/main/java/eu/europa/ec/dgc/gateway/entity/TrustedIssuerEntity.java b/src/main/java/eu/europa/ec/dgc/gateway/entity/TrustedIssuerEntity.java
index ca4fbb09..bc2b909a 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/entity/TrustedIssuerEntity.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/entity/TrustedIssuerEntity.java
@@ -99,7 +99,19 @@ public class TrustedIssuerEntity {
      * Signature of the TrustAnchor.
      */
     @Column(name = "signature", nullable = false, length = 6000)
-    String signature;
+    private String signature;
+
+    /**
+     * UUID of the TrustedIssuer.
+     */
+    @Column(name = "uuid", nullable = false, length = 36)
+    private String uuid;
+
+    /**
+     * Domain the TrustedIssuer is assigned to (currently only "DCC").
+     */
+    @Column(name = "domain", nullable = false, length = 10)
+    private String domain;
 
     public enum UrlType {
         HTTP,
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/dto/TrustedIssuerDto.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/dto/TrustedIssuerDto.java
index 0b0efd73..43118c47 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/restapi/dto/TrustedIssuerDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/restapi/dto/TrustedIssuerDto.java
@@ -49,7 +49,7 @@ public class TrustedIssuerDto {
     private String keyStorageType;
 
     @Schema(example = "o53CbAa77LyIMFc5Gz+B2Jc275Gdg/SdLayw7gx0GrTcinR95zfTLr8nNHgJMYlX3rD8Y11zB/Osyt0 ..."
-            + " W+VIrYRGSEmgjGy2EwzvA5nVhsaA+/udnmbyQw9LjAOQ==")
+        + " W+VIrYRGSEmgjGy2EwzvA5nVhsaA+/udnmbyQw9LjAOQ==")
     private String signature;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
@@ -58,6 +58,9 @@ public class TrustedIssuerDto {
     @Schema(example = "Example Service")
     private String name;
 
+    @Schema(example = "DCC")
+    private String domain;
+
     @Schema(example = "e4d04ee1-2bfe-4e8c-ab82-0d2b1d223712")
     private String uuid;
 
diff --git a/src/main/resources/db/changelog.xml b/src/main/resources/db/changelog.xml
index 3d1b6f1b..3b4c70e8 100644
--- a/src/main/resources/db/changelog.xml
+++ b/src/main/resources/db/changelog.xml
@@ -17,4 +17,5 @@
     <include file="db/changelog/add-certificate-roles-table-pk.xml"/>
     <include file="db/changelog/add-trusted-issuer-table.xml"/>
     <include file="db/changelog/alter-signer-information-for-deletion.xml"/>
+    <include file="db/changelog/add-uuid-and-domain-for-trusted-issuer.xml"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/add-uuid-and-domain-for-trusted-issuer.xml b/src/main/resources/db/changelog/add-uuid-and-domain-for-trusted-issuer.xml
new file mode 100644
index 00000000..f4ff8da3
--- /dev/null
+++ b/src/main/resources/db/changelog/add-uuid-and-domain-for-trusted-issuer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd"
+        objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
+    <changeSet id="add-uuid-and-domain-for-trusted-issuer" author="f11h">
+        <addColumn tableName="trusted_issuer">
+            <column name="uuid" type="VARCHAR(36)">
+                <constraints unique="true"/>
+            </column>
+            <column defaultValue="DCC" name="domain" type="VARCHAR(10)"/>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>