Skip to content
Snippets Groups Projects
Commit ce39ad08 authored by kbeyro's avatar kbeyro
Browse files

update domains group app adding

parent ae539b43
Branches
Tags
3 merge requests!65Resolve "Prevent users from adding an existing SSH key",!601.6.5 fix processing bulk,!28update domains group app adding
Pipeline #89253 passed
......@@ -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);
}
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment