From 028b1e0c9416c7f9125064e43d372b292ab634b0 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Fri, 5 Apr 2024 14:13:30 +0300 Subject: [PATCH] description template new version tenant validation --- .../DescriptionTemplateServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java index bc7c086ba..7d7ec8230 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java @@ -66,11 +66,7 @@ import javax.xml.transform.TransformerException; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.time.Instant; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; @Service @@ -666,6 +662,8 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic if (!this.conventionService.hashValue(oldDescriptionTemplateEntity.getUpdatedAt()).equals(model.getHash())) throw new MyValidationException(this.errors.getHashConflict().getCode(), this.errors.getHashConflict().getMessage()); + if (!this.tenantScope.isSet() || !Objects.equals(oldDescriptionTemplateEntity.getTenantId(), this.tenantScope.getTenant())) throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage()); + List latestVersionDescriptionTemplates = this.queryFactory.query(DescriptionTemplateQuery.class) .versionStatuses(DescriptionTemplateVersionStatus.Current) .isActive(IsActive.Active)