Pull request #541: RED-4871: Bugfix, ignore deleted entities in dossier stats

Merge in RED/persistence-service from RED-4871 to master

* commit '6e8f95c62d44a26521b2d86bc448f1505ca857ff':
  RED-4871: Bugfix, ignore deleted entities in dossier stats
This commit is contained in:
Philipp Schramm 2022-09-28 14:37:03 +02:00
commit adbe2ba71d

View File

@ -1,15 +1,16 @@
package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository;
import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionarySummaryResponse;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionarySummaryResponse;
public interface TypeRepository extends JpaRepository<TypeEntity, String> {
@Query("select t from TypeEntity t where t.dossierTemplateId = :dossierTemplate and t.dossierId = :dossier and t.rank = :rank and t.softDeletedTime is null")
@ -40,7 +41,7 @@ public interface TypeRepository extends JpaRepository<TypeEntity, String> {
"from DossierTemplateEntity dt " +
"left join TypeEntity t on t.dossierTemplateId = dt.id " +
"left join DictionaryEntryEntity e on e.typeId = t.id " +
"where dt.id in :dossierTemplateIds and t.dossierId is null and (e.id is null or e.deleted = false) " +
"where t.softDeletedTime is null and dt.id in :dossierTemplateIds and t.dossierId is null and (e.id is null or e.deleted = false) " +
"group by dt.id, t.id, t.type, t.label ")
List<DictionarySummaryResponse> findDictionarySummaryList(Set<String> dossierTemplateIds);