New Registry Status DEPROVISIONED

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

@@ -90,10 +90,10 @@ public class JpaRegistryDao extends JpaBaseDao<RegistryEntity, Long> implements
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<RegistryEntity> findRegistriesForDepro(String serviceShortName) {
-		return em.createQuery("select r from RegistryEntity r where r.service.shortName = :ssn and r.registryStatus = :status and "
+		return em.createQuery("select r from RegistryEntity r where r.service.shortName = :ssn and r.registryStatus = :status and r.registryStatus != :statusNot and "
 				+ "r.agreedTime = (select max(r1.agreedTime) from RegistryEntity r1 where r1.user = r.user) and not exists "
 				+ "(select r2 from RegistryEntity r2 where r2.user = r.user and r2.agreedTime > r.agreedTime)")
-				.setParameter("ssn", serviceShortName).setParameter("status", RegistryStatus.DELETED)
+				.setParameter("ssn", serviceShortName).setParameter("status", RegistryStatus.DELETED).setParameter("statusNot", RegistryStatus.DEPROVISIONED)
 				.getResultList();
 	}	
 	

bwreg-jpa/src/main/java/edu/kit/scc/webreg/entity/RegistryStatus.java

@@ -17,6 +17,7 @@ public enum RegistryStatus {
 	PENDING,
 	CREATED,
 	DELETED,
+	DEPROVISIONED,
 	INVALID,
 	ON_HOLD,
 	LOST_ACCESS