From 3e4316a6276537e8ff65143c5f59b81eb174a0d5 Mon Sep 17 00:00:00 2001
From: sgiannopoulos <sgiannopoulos@cite.gr>
Date: Tue, 16 Apr 2024 13:17:06 +0300
Subject: [PATCH] fix tenant scope

---
 .../eudat/commons/scope/tenant/TenantScope.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScope.java b/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScope.java
index 1a6b104c6..cee6cc1e4 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScope.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScope.java
@@ -67,6 +67,13 @@ public class TenantScope {
         this.tenant.set(tenant);
         this.tenantCode.set(tenantCode);
 
+        entityManager
+                .unwrap(Session.class)
+                .disableFilter(TenantScopedBaseEntity.TENANT_FILTER);
+
+        entityManager
+                .unwrap(Session.class)
+                .disableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
         if (this.tenant.get() != null || this.isDefaultTenant()) {
             if(!this.isDefaultTenant()) {
                 entityManager
@@ -84,6 +91,15 @@ public class TenantScope {
     public void removeTempTenant(EntityManager entityManager) {
         this.tenant.set(this.initialTenant.get());
         this.tenantCode.set(this.initialTenantCode.get());
+
+
+        entityManager
+                .unwrap(Session.class)
+                .disableFilter(TenantScopedBaseEntity.TENANT_FILTER);
+
+        entityManager
+                .unwrap(Session.class)
+                .disableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
         if (this.initialTenant.get() != null || this.isDefaultTenant()) {
             if(!this.isDefaultTenant()) {
                 entityManager