Refit registration for new RegistryStatus DEPROVISIONED

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

@@ -54,7 +54,7 @@ public interface RegistryDao extends BaseDao<RegistryEntity, Long> {
 			RegistryStatus status, Date date, int limit);
 
 	List<RegistryEntity> findByServiceAndUserAndNotStatus(ServiceEntity service,
-			UserEntity user, RegistryStatus status);
+			UserEntity user, RegistryStatus... status);
 
 	List<RegistryEntity> findByUserAndNotStatus(UserEntity user,
 			RegistryStatus status);

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

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package edu.kit.scc.webreg.dao.jpa;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -195,14 +196,18 @@ public class JpaRegistryDao extends JpaBaseDao<RegistryEntity, Long> implements
 	}	
 	
 	@Override
-	public List<RegistryEntity> findByServiceAndUserAndNotStatus(ServiceEntity service, UserEntity user, RegistryStatus status) {
+	public List<RegistryEntity> findByServiceAndUserAndNotStatus(ServiceEntity service, UserEntity user, RegistryStatus... status) {
 		CriteriaBuilder builder = em.getCriteriaBuilder();
 		CriteriaQuery<RegistryEntity> criteria = builder.createQuery(RegistryEntity.class);
 		Root<RegistryEntity> root = criteria.from(RegistryEntity.class);
-		criteria.where(builder.and(
-				builder.equal(root.get("service"), service),
-				builder.equal(root.get("user"), user),
-				builder.notEqual(root.get("registryStatus"), status)));
+		
+		List<Predicate> predList = new ArrayList<Predicate>();
+		predList.add(builder.equal(root.get("service"), service));
+		predList.add(builder.equal(root.get("user"), user));
+		for (RegistryStatus s : status)
+			predList.add(builder.notEqual(root.get("registryStatus"), s));
+		
+		criteria.where(builder.and(predList.toArray(new Predicate[]{})));
 		criteria.select(root);
 
 		return em.createQuery(criteria).getResultList();

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

@@ -52,7 +52,7 @@ public interface RegistryService extends BaseService<RegistryEntity, Long> {
 			RegistryStatus status, Date date, int limit);
 
 	List<RegistryEntity> findByServiceAndUserAndNotStatus(ServiceEntity service,
-			UserEntity user, RegistryStatus status);
+			UserEntity user, RegistryStatus... status);
 
 	List<RegistryEntity> findByUserAndNotStatus(UserEntity user,
 			RegistryStatus status);

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

@@ -83,7 +83,7 @@ public class RegistryServiceImpl extends BaseServiceImpl<RegistryEntity, Long> i
 	}
 	
 	@Override
-	public List<RegistryEntity> findByServiceAndUserAndNotStatus(ServiceEntity service, UserEntity user, RegistryStatus status) {
+	public List<RegistryEntity> findByServiceAndUserAndNotStatus(ServiceEntity service, UserEntity user, RegistryStatus... status) {
 		return dao.findByServiceAndUserAndNotStatus(service, user, status);
 	}
 	

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/RegisterServiceBean.java

@@ -103,7 +103,8 @@ public class RegisterServiceBean implements Serializable {
     		
 			service = serviceService.findWithPolicies(id);
 			
-			List<RegistryEntity> r = registryService.findByServiceAndUserAndNotStatus(service, user, RegistryStatus.DELETED);
+			List<RegistryEntity> r = registryService.findByServiceAndUserAndNotStatus(service, user, 
+					RegistryStatus.DELETED, RegistryStatus.DEPROVISIONED);
 			if (r.size() != 0) {
 				errorState = true;
 	    		messageGenerator.addResolvedErrorMessage("errorState", "error", "already_registered", true);