From ce39ad083b637f48622904fbc5053bbf4450fde3 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:31:20 +0200
Subject: [PATCH] update domains group app adding
---
.../service/impl/ApplicationStatePerDomainServiceImpl.java | 7 +++++++
.../impl/ApplicationStatePerDomainServiceImplTest.java | 5 ++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImpl.java b/src/main/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImpl.java
index 297af2ebc..c11f3b1d6 100644
--- a/src/main/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImpl.java
+++ b/src/main/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImpl.java
@@ -9,6 +9,7 @@ import net.geant.nmaas.portal.persistent.entity.ApplicationBase;
import net.geant.nmaas.portal.persistent.entity.ApplicationStatePerDomain;
import net.geant.nmaas.portal.persistent.entity.Domain;
import net.geant.nmaas.portal.persistent.repositories.ApplicationBaseRepository;
+import net.geant.nmaas.portal.persistent.repositories.DomainGroupRepository;
import net.geant.nmaas.portal.persistent.repositories.DomainRepository;
import net.geant.nmaas.portal.service.ApplicationStatePerDomainService;
import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ public class ApplicationStatePerDomainServiceImpl implements ApplicationStatePer
private final DomainRepository domainRepository;
private final ApplicationBaseRepository applicationBaseRepository;
+ private final DomainGroupRepository domainGroupRepository;
@Override
public List<ApplicationStatePerDomain> generateListOfDefaultApplicationStatesPerDomain() {
@@ -44,6 +46,11 @@ public class ApplicationStatePerDomainServiceImpl implements ApplicationStatePer
appState.setPvStorageSizeLimit(ApplicationStatePerDomainServiceImpl.DEFAULT_PV_STORAGE_SIZE_LIMIT);
List<Domain> allDomains = domainRepository.findAll();
allDomains.forEach(domain -> domain.addApplicationState(appState));
+ //update domains groups - set app to false by default
+ appState.setEnabled(false);
+ domainGroupRepository.findAll().forEach(d -> {
+ d.getApplicationStatePerDomain().add(appState);
+ });
return domainRepository.saveAll(allDomains);
}
diff --git a/src/test/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImplTest.java b/src/test/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImplTest.java
index 2203f1e38..0bfe44f77 100644
--- a/src/test/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImplTest.java
+++ b/src/test/java/net/geant/nmaas/portal/service/impl/ApplicationStatePerDomainServiceImplTest.java
@@ -5,6 +5,7 @@ import net.geant.nmaas.portal.persistent.entity.ApplicationBase;
import net.geant.nmaas.portal.persistent.entity.ApplicationStatePerDomain;
import net.geant.nmaas.portal.persistent.entity.Domain;
import net.geant.nmaas.portal.persistent.repositories.ApplicationBaseRepository;
+import net.geant.nmaas.portal.persistent.repositories.DomainGroupRepository;
import net.geant.nmaas.portal.persistent.repositories.DomainRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -28,6 +29,8 @@ public class ApplicationStatePerDomainServiceImplTest {
private final DomainRepository domains = mock(DomainRepository.class);
private final ApplicationBaseRepository applications = mock(ApplicationBaseRepository.class);
+ private final DomainGroupRepository domainGroupRepository = mock(DomainGroupRepository.class);
+
private ApplicationStatePerDomainServiceImpl appState;
private final Domain domain1 = mock(Domain.class);
@@ -35,7 +38,7 @@ public class ApplicationStatePerDomainServiceImplTest {
@BeforeEach
void setup() {
- appState = new ApplicationStatePerDomainServiceImpl(domains, applications);
+ appState = new ApplicationStatePerDomainServiceImpl(domains, applications, domainGroupRepository);
}
@Test
--
GitLab