Merge pull request #40 from Onlineberatung/develop

Update vi-saas with core
virtualidentityag · Aug 8, 2022 · aa875ff · aa875ff
2 parents f0b733d + e3ed65a
commit aa875ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/de/caritas/cob/agencyservice/api/admin/service/AgencyAdminService.java b/src/main/java/de/caritas/cob/agencyservice/api/admin/service/AgencyAdminService.java
@@ -177,6 +177,10 @@ private Agency mergeAgencies(Agency agency, UpdateAgencyDTO updateAgencyDTO) {
       List<AgencyTopic> agencyTopics = agencyTopicMergeService.getMergedTopics(agencyToUpdate,
           updateAgencyDTO.getTopicIds());
       agencyToUpdate.setAgencyTopics(agencyTopics);
+    } else {
+      // If the Topic feature is not enabled, Hibernate use an empty PersistentBag,
+      // and we have to consider this and pass it for merging.
+      agencyToUpdate.setAgencyTopics(agency.getAgencyTopics());
     }
     return agencyToUpdate;
   }

diff --git a/src/main/java/de/caritas/cob/agencyservice/api/repository/agency/Agency.java b/src/main/java/de/caritas/cob/agencyservice/api/repository/agency/Agency.java
@@ -126,6 +126,8 @@ public class Agency implements TenantAware {
 
   @Column(name = "is_offline", nullable = false)
   @Type(type = "org.hibernate.type.NumericBooleanType")
+  @SortableField
+  @Field
   private boolean offline;
 
   @Size(max = 500)