Skip to content
Snippets Groups Projects
Commit ef84e2b1 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch '209-remove-app-details' into 'develop'

add unsubscribe to delete app logic

See merge request !18
parents d579d448 ad177aa7
No related branches found
No related tags found
1 merge request!18add unsubscribe to delete app logic
Pipeline #88583 passed
......@@ -29,6 +29,7 @@ import net.geant.nmaas.portal.persistent.entity.Role;
import net.geant.nmaas.portal.persistent.entity.User;
import net.geant.nmaas.portal.persistent.repositories.RatingRepository;
import net.geant.nmaas.portal.service.ApplicationInstanceService;
import net.geant.nmaas.portal.service.ApplicationSubscriptionService;
import net.geant.nmaas.portal.service.impl.ApplicationServiceImpl;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.http.HttpStatus;
......@@ -86,6 +87,8 @@ public class ApplicationController extends AppBaseController {
private final AppInstanceController appInstanceController;
private final ApplicationSubscriptionService applicationSubscriptionService;
/*
* Application Base Part
*/
......@@ -166,6 +169,7 @@ public class ApplicationController extends AppBaseController {
throw new ProcessingException("Can't delete " + base.getName() + " application base since version " + app.getVersion() + " is not deleted");
}
}
applicationSubscriptionService.unsubscribeAll(base);
appBaseService.deleteAppBase(base);
}
......
......@@ -33,6 +33,8 @@ public interface ApplicationSubscriptionService {
void unsubscribe(ApplicationSubscription appSub);
void unsubscribe(Long applicationId, Long domainId);
void unsubscribe(ApplicationBase application, Domain domain);
void unsubscribeAll(ApplicationBase applicationBase);
List<ApplicationBase> getSubscribedApplications();
List<ApplicationBase> getSubscribedApplications(Long domainId);
......
......@@ -203,6 +203,12 @@ public class ApplicationSubscriptionServiceImpl implements ApplicationSubscripti
unsubscribe(appSub);
}
@Override
public void unsubscribeAll(ApplicationBase applicationBase) {
List<ApplicationSubscription> subList = getSubscriptionsBy(null, applicationBase);
subList.forEach(this::unsubscribe);
}
@Override
public List<ApplicationBase> getSubscribedApplications() {
return getSubscribedApplications(null);
......
......@@ -534,7 +534,10 @@ public class DomainServiceImpl implements DomainService {
@Override
public void removeAppBaseFromAllDomains(ApplicationBase base) {
getDomains().forEach(domain -> removeFromDomain(base, domain));
getDomains().forEach(domain -> {
removeFromDomain(base, domain);
});
}
private void removeFromDomain(ApplicationBase base, Domain domain) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment