diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardServiceImpl.java index dd699b754..2239d0ca8 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardServiceImpl.java @@ -4,6 +4,7 @@ import eu.eudat.authorization.AuthorizationFlags; import eu.eudat.authorization.OwnedResource; import eu.eudat.authorization.Permission; import eu.eudat.commons.enums.*; +import eu.eudat.commons.scope.tenant.TenantScope; import eu.eudat.commons.scope.user.UserScope; import eu.eudat.commons.types.dashborad.RecentActivityItemEntity; import eu.eudat.convention.ConventionService; @@ -41,7 +42,8 @@ public class DashboardServiceImpl implements DashboardService { private final BuilderFactory builderFactory; private final QueryFactory queryFactory; private final UserScope userScope; - private final DashboardServiceProperties config; + private final TenantScope tenantScope; + private final DashboardServiceProperties config; private final ElasticQueryHelperService elasticQueryHelperService; private final DashboardStatisticsCacheService dashboardStatisticsCacheService; @Autowired @@ -49,13 +51,15 @@ public class DashboardServiceImpl implements DashboardService { ConventionService conventionService, AuthorizationService authorizationService, BuilderFactory builderFactory, QueryFactory queryFactory, - UserScope userScope, + UserScope userScope, + TenantScope tenantScope, DashboardServiceProperties config, ElasticQueryHelperService elasticQueryHelperService, DashboardStatisticsCacheService dashboardStatisticsCacheService) { this.conventionService = conventionService; this.authorizationService = authorizationService; this.builderFactory = builderFactory; this.queryFactory = queryFactory; this.userScope = userScope; + this.tenantScope = tenantScope; this.config = config; this.elasticQueryHelperService = elasticQueryHelperService; this.dashboardStatisticsCacheService = dashboardStatisticsCacheService; @@ -138,7 +142,7 @@ public class DashboardServiceImpl implements DashboardService { public DashboardStatistics getMyDashboardStatistics() throws InvalidApplicationException { this.authorizationService.authorizeAtLeastOneForce(this.userScope.getUserIdSafe() != null ? List.of(new OwnedResource(this.userScope.getUserIdSafe())) : null); - DashboardStatisticsCacheService.DashboardStatisticsCacheValue cacheValue = this.dashboardStatisticsCacheService.lookup(this.dashboardStatisticsCacheService.buildKey(this.userScope.getUserId().toString().toLowerCase(Locale.ROOT))); + DashboardStatisticsCacheService.DashboardStatisticsCacheValue cacheValue = this.dashboardStatisticsCacheService.lookup(this.dashboardStatisticsCacheService.buildKey(this.dashboardStatisticsCacheService.generateUserTenantCacheKey(this.userScope.getUserId(), this.tenantScope.getTenantCode()))); if (cacheValue == null || cacheValue.getDashboardStatistics() == null) { DmpUserQuery dmpUserLookup = this.queryFactory.query(DmpUserQuery.class); dmpUserLookup.userIds(this.userScope.getUserId()); @@ -161,7 +165,7 @@ public class DashboardServiceImpl implements DashboardService { statistics.getReferenceTypeStatistics().add(referenceTypeStatistics); } } - cacheValue = new DashboardStatisticsCacheService.DashboardStatisticsCacheValue(this.userScope.getUserId()); + cacheValue = new DashboardStatisticsCacheService.DashboardStatisticsCacheValue(this.userScope.getUserId(), this.tenantScope.getTenantCode()); cacheValue.setPublic(false); cacheValue.setDashboardStatistics(statistics); this.dashboardStatisticsCacheService.put(cacheValue); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardStatisticsCacheService.java b/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardStatisticsCacheService.java index d700fb979..5dd739dd3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardStatisticsCacheService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dashborad/DashboardStatisticsCacheService.java @@ -1,5 +1,6 @@ package eu.eudat.service.dashborad; +import eu.eudat.commons.scope.user.UserScope; import eu.eudat.model.DashboardStatistics; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,12 +20,14 @@ public class DashboardStatisticsCacheService extends CacheService