Merge pull request Onlineberatung#189 from Onlineberatung/OB-6830-dat…

…aprotection-datamodel fix migrations and tenant service type mapping
virtualidentityag · Nov 9, 2023 · cef438b · cef438b
2 parents c54db14 + 50fa7f8
commit cef438b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -491,6 +491,12 @@
               <modelPackage>
                 ${project.groupId}.${project.artifactId}.tenantservice.generated.web.model
               </modelPackage>
+              <typeMappings>
+                <typeMapping>OffsetDateTime=LocalDateTime</typeMapping>
+              </typeMappings>
+              <importMappings>
+                <importMapping>java.time.OffsetDateTime=java.time.LocalDateTime</importMapping>
+              </importMappings>
             </configuration>
           </execution>
           <execution>

diff --git a/src/main/resources/db/changelog/agencyservice-dev-master.xml b/src/main/resources/db/changelog/agencyservice-dev-master.xml
@@ -23,4 +23,5 @@
 	<include file="db/changelog/changeset/0014_drop_diocese/0014_changeSet.xml"/>
 	-->
 	<include file="db/changelog/changeset/0015_change_consultingtype_column_type/0015_changeSet.xml"/>
+	<include file="db/changelog/changeset/0016_add_data_protection_attributes/0016_changeSet.xml"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/agencyservice-local-master.xml b/src/main/resources/db/changelog/agencyservice-local-master.xml
@@ -22,4 +22,5 @@
   <!-- uncomment it once confirmed diocese has been migrated correctly to tenant by migration tool
   <include file="db/changelog/changeset/0014_drop_diocese/0014_changeSet.xml"/>-->
   <include file="db/changelog/changeset/0015_change_consultingtype_column_type/0015_changeSet.xml"/>
+  <include file="db/changelog/changeset/0016_add_data_protection_attributes/0016_changeSet.xml"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/agencyservice-prod-master.xml b/src/main/resources/db/changelog/agencyservice-prod-master.xml
@@ -19,4 +19,5 @@
 	<!-- uncomment it once confirmed diocese has been migrated correctly to tenant by migration tool
 	<include file="db/changelog/changeset/0014_drop_diocese/0014_changeSet.xml"/>-->
 	<include file="db/changelog/changeset/0015_change_consultingtype_column_type/0015_changeSet.xml"/>
+	<include file="db/changelog/changeset/0016_add_data_protection_attributes/0016_changeSet.xml"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/agencyservice-staging-master.xml b/src/main/resources/db/changelog/agencyservice-staging-master.xml
@@ -19,4 +19,5 @@
 	<!-- uncomment it once confirmed diocese has been migrated correctly to tenant by migration tool
 	<include file="db/changelog/changeset/0014_drop_diocese/0014_changeSet.xml"/>-->
 	<include file="db/changelog/changeset/0015_change_consultingtype_column_type/0015_changeSet.xml"/>
+	<include file="db/changelog/changeset/0016_add_data_protection_attributes/0016_changeSet.xml"/>
 </databaseChangeLog>
diff --git a/...og/changeset/0016_add_data_protection_attributes/addDataProtectionAttributes-rollback.sql b/...og/changeset/0016_add_data_protection_attributes/addDataProtectionAttributes-rollback.sql
@@ -1,2 +1,11 @@
 ALTER TABLE `agencyservice`.`agency`
-DROP COLUMN data_protection_officer_contact longtext;
+DROP COLUMN data_protection_responsible_entity;
+
+ALTER TABLE `agencyservice`.`agency`
+DROP COLUMN data_protection_officer_contact;
+
+ALTER TABLE `agencyservice`.`agency`
+DROP COLUMN data_protection_alternative_contact;
+
+ALTER TABLE `agencyservice`.`agency`
+DROP COLUMN data_protection_agency_contact;
diff --git a/...b/changelog/changeset/0016_add_data_protection_attributes/addDataProtectionAttributes.sql b/...b/changelog/changeset/0016_add_data_protection_attributes/addDataProtectionAttributes.sql
@@ -2,10 +2,10 @@ ALTER TABLE `agencyservice`.`agency`
 ADD COLUMN data_protection_responsible_entity varchar(100) NULL AFTER `counselling_relations`;
 
 ALTER TABLE `agencyservice`.`agency`
-ADD COLUMN data_protection_responsible_contact longtext NULL AFTER `data_protection_responsible_entity`;
+ADD COLUMN data_protection_alternative_contact longtext NULL AFTER `data_protection_responsible_entity`;
 
 ALTER TABLE `agencyservice`.`agency`
-ADD COLUMN data_protection_officer_contact longtext NULL AFTER `data_protection_responsible_contact`;
+ADD COLUMN data_protection_officer_contact longtext NULL AFTER `data_protection_alternative_contact`;
 
 ALTER TABLE `agencyservice`.`agency`
-ADD COLUMN data_protection_agency_contact longtext NULL AFTER `data_protection_officer_contact`;
+ADD COLUMN data_protection_agency_contact longtext NULL AFTER `data_protection_officer_contact`;