From 749d12a30ff216e8a4e773c1236be246df755a71 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 28 Jul 2021 13:59:10 -0700
Subject: [PATCH] NOJIRA

changed dangercontroller behavior
---
 .../admin/ui/controller/DangerController.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java
index 15416b8b6..c62f8b772 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/DangerController.java
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException;
+import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository;
 import edu.internet2.tier.shibboleth.admin.ui.repository.FilterRepository;
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
@@ -21,6 +22,9 @@ public class DangerController {
     @Autowired
     private EntityDescriptorService entityDescriptorService;
     
+    @Autowired
+    private EntityDescriptorRepository edRepo;
+    
     @Autowired
     private FilterRepository filterRepository;
     
@@ -33,11 +37,11 @@ public class DangerController {
     @Transactional
     @GetMapping
     public ResponseEntity<?> wipeOut() throws ForbiddenException {
-        entityDescriptorService.getAllRepresentationsBasedOnUserAccess().forEach(edr -> {
+        edRepo.findAll().forEach(ed -> {
             try {
-                edr.setServiceEnabled(false);
-                edr = entityDescriptorService.update(edr);
-                entityDescriptorService.delete(edr.getId());
+                ed.setServiceEnabled(false);
+                edRepo.save(ed);
+                entityDescriptorService.delete(ed.getResourceId());
             }
             catch (Throwable e) {
             }