Only deregister users, if IDP AttributeQuery status is good

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/RegistryDao.java

@@ -64,4 +64,7 @@ public interface RegistryDao extends BaseDao<RegistryEntity, Long> {
 	List<RegistryEntity> findByServiceAndNotStatus(ServiceEntity service,
 			RegistryStatus... status);
 
+	List<RegistryEntity> findByServiceAndStatusAndIDPGood(String serviceShortName, RegistryStatus status, Date date,
+			int limit);
+
 }

bwreg-jpa/src/main/java/edu/kit/scc/webreg/dao/jpa/JpaRegistryDao.java

@@ -31,6 +31,7 @@ import edu.kit.scc.webreg.dao.RegistryDao;
 import edu.kit.scc.webreg.entity.RegistryEntity;
 import edu.kit.scc.webreg.entity.RegistryEntity_;
 import edu.kit.scc.webreg.entity.RegistryStatus;
+import edu.kit.scc.webreg.entity.SamlIdpMetadataEntityStatus;
 import edu.kit.scc.webreg.entity.ServiceEntity;
 import edu.kit.scc.webreg.entity.ServiceEntity_;
 import edu.kit.scc.webreg.entity.UserEntity;
@@ -91,6 +92,17 @@ public class JpaRegistryDao extends JpaBaseDao<RegistryEntity, Long> implements
 				.setMaxResults(limit).getResultList();
 	}	
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<RegistryEntity> findByServiceAndStatusAndIDPGood(String serviceShortName, RegistryStatus status, Date date, int limit) {
+		return em.createQuery("select r from RegistryEntity r where r.service.shortName = :ssn and r.registryStatus = :status"
+				+ " and lastStatusChange < :is and r.user.idp.aqIdpStatus = :aqStatus order by lastStatusChange asc")
+				.setParameter("ssn", serviceShortName).setParameter("status", status)
+				.setParameter("is", date)
+				.setParameter("aqStatus", SamlIdpMetadataEntityStatus.GOOD)
+				.setMaxResults(limit).getResultList();
+	}	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<RegistryEntity> findRegistriesForDepro(String serviceShortName) {

bwreg-service/src/main/java/edu/kit/scc/webreg/job/DeregisterLostAccessRegistries.java

@@ -70,7 +70,7 @@ public class DeregisterLostAccessRegistries extends AbstractExecutableJob {
 			UserService userService = (UserService) ic.lookup("global/bwreg/bwreg-service/UserServiceImpl!edu.kit.scc.webreg.service.UserService");
 			KnowledgeSessionService knowledgeSessionService = (KnowledgeSessionService) ic.lookup("global/bwreg/bwreg-service/KnowledgeSessionServiceImpl!edu.kit.scc.webreg.drools.KnowledgeSessionService");
 			
-			List<RegistryEntity> registryList = registryService.findByServiceAndStatus(ssn, RegistryStatus.LOST_ACCESS, 
+			List<RegistryEntity> registryList = registryService.findByServiceAndStatusAndIDPGood(ssn, RegistryStatus.LOST_ACCESS, 
 					new Date(System.currentTimeMillis() - lastUpdate), limit);
 			
 			if (registryList.size() == 0)

bwreg-service/src/main/java/edu/kit/scc/webreg/service/RegistryService.java

@@ -61,4 +61,7 @@ public interface RegistryService extends BaseService<RegistryEntity, Long> {
 
 	List<RegistryEntity> findByServiceAndNotStatus(ServiceEntity service,
 			RegistryStatus... status);
+
+	List<RegistryEntity> findByServiceAndStatusAndIDPGood(String serviceShortName, RegistryStatus status, Date date,
+			int limit);
 }

bwreg-service/src/main/java/edu/kit/scc/webreg/service/impl/RegistryServiceImpl.java

@@ -49,6 +49,11 @@ public class RegistryServiceImpl extends BaseServiceImpl<RegistryEntity, Long> i
 		return dao.findByServiceAndStatus(serviceShortName, status, date, limit);
 	}
 
+	@Override
+	public List<RegistryEntity> findByServiceAndStatusAndIDPGood(String serviceShortName, RegistryStatus status, Date date, int limit) {
+		return dao.findByServiceAndStatusAndIDPGood(serviceShortName, status, date, limit);
+	}
+
 	@Override
 	public List<RegistryEntity> findRegistriesForDepro(String serviceShortName) { 
 		return dao.findRegistriesForDepro(serviceShortName);