feat(user): archive users

fix gravitee-io/issues#1986
gravitee-io · Mar 29, 2019 · 89e4696 · 89e4696
1 parent dbb43ee
commit 89e4696
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -32,8 +32,8 @@
 	<name>Gravitee.io APIM - Repository - Redis</name>
 
 	<properties>
-		<gravitee-repository.version>1.20.1</gravitee-repository.version>
-		<gravitee-repository-test.version>1.20.2</gravitee-repository-test.version>
+		<gravitee-repository.version>1.20.2-SNAPSHOT</gravitee-repository.version>
+		<gravitee-repository-test.version>1.20.3-SNAPSHOT</gravitee-repository-test.version>
 		<jedis.version>2.9.0</jedis.version>
 		<spring-data-redis.version>1.8.14.RELEASE</spring-data-redis.version>
 		<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>

diff --git a/src/main/java/io/gravitee/repository/redis/management/RedisUserRepository.java b/src/main/java/io/gravitee/repository/redis/management/RedisUserRepository.java
@@ -19,7 +19,9 @@
 import io.gravitee.repository.exceptions.TechnicalException;
 import io.gravitee.repository.management.api.UserRepository;
 import io.gravitee.repository.management.api.search.Pageable;
+import io.gravitee.repository.management.api.search.UserCriteria;
 import io.gravitee.repository.management.model.User;
+import io.gravitee.repository.management.model.UserStatus;
 import io.gravitee.repository.redis.management.internal.UserRedisRepository;
 import io.gravitee.repository.redis.management.model.RedisUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,8 +91,8 @@ public Set<User> findByIds(List<String> ids) throws TechnicalException {
     }
 
     @Override
-    public Page<User> search(Pageable pageable) throws TechnicalException {
-        Page<RedisUser> redisUserPage = userRedisRepository.search(pageable);
+    public Page<User> search(UserCriteria criteria, Pageable pageable) throws TechnicalException {
+        Page<RedisUser> redisUserPage = userRedisRepository.search(criteria, pageable);
         return new Page<>(
                 redisUserPage.getContent()
                         .stream()
@@ -118,6 +120,11 @@ private User convert(RedisUser redisUser) {
         user.setPicture(redisUser.getPicture());
         user.setSource(redisUser.getSource());
         user.setSourceId(redisUser.getSourceId());
+        if (redisUser.getStatus() == null) {
+            user.setStatus(UserStatus.ACTIVE);
+        } else {
+            user.setStatus(UserStatus.valueOf(redisUser.getStatus()));
+        }
 
         if (redisUser.getLastConnectionAt() != 0) {
             user.setLastConnectionAt(new Date(redisUser.getLastConnectionAt()));
@@ -139,6 +146,9 @@ private RedisUser convert(User user) {
         redisUser.setPicture(user.getPicture());
         redisUser.setSource(user.getSource());
         redisUser.setSourceId(user.getSourceId());
+        if (user.getStatus() != null) {
+            redisUser.setStatus(user.getStatus().name());
+        }
 
         if (user.getLastConnectionAt() != null) {
             redisUser.setLastConnectionAt(user.getLastConnectionAt().getTime());

diff --git a/src/main/java/io/gravitee/repository/redis/management/internal/UserRedisRepository.java b/src/main/java/io/gravitee/repository/redis/management/internal/UserRedisRepository.java
@@ -17,13 +17,15 @@
 
 import io.gravitee.common.data.domain.Page;
 import io.gravitee.repository.management.api.search.Pageable;
+import io.gravitee.repository.management.api.search.UserCriteria;
 import io.gravitee.repository.redis.management.model.RedisUser;
 
 import java.util.List;
 import java.util.Set;
 
 /**
  * @author David BRASSELY (david.brassely at graviteesource.com)
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com)
  * @author GraviteeSource Team
  */
 public interface UserRedisRepository {
@@ -38,7 +40,7 @@ public interface UserRedisRepository {
 
     RedisUser saveOrUpdate(RedisUser user);
 
-    Page<RedisUser> search(Pageable pageable);
+    Page<RedisUser> search(UserCriteria criteria, Pageable pageable);
 
     void delete(String user);
 }
diff --git a/...n/java/io/gravitee/repository/redis/management/internal/impl/UserRedisRepositoryImpl.java b/...n/java/io/gravitee/repository/redis/management/internal/impl/UserRedisRepositoryImpl.java
@@ -17,6 +17,8 @@
 
 import io.gravitee.common.data.domain.Page;
 import io.gravitee.repository.management.api.search.Pageable;
+import io.gravitee.repository.management.api.search.UserCriteria;
+import io.gravitee.repository.management.model.UserStatus;
 import io.gravitee.repository.redis.management.internal.UserRedisRepository;
 import io.gravitee.repository.redis.management.model.RedisUser;
 import org.springframework.stereotype.Component;
@@ -74,7 +76,7 @@ public Set<RedisUser> findAll() {
     }
 
     @Override
-    public Page<RedisUser> search(Pageable pageable) {
+    public Page<RedisUser> search(UserCriteria criteria, Pageable pageable) {
         Set<Object> keys = redisTemplate
                 .opsForHash()
                 .keys(REDIS_KEY);
@@ -88,10 +90,28 @@ public Page<RedisUser> search(Pageable pageable) {
                 .opsForHash()
                 .multiGet(REDIS_KEY, subKeys);
 
-        return new Page<>(
-                usersObject.stream()
-                        .map(u -> convert(u, RedisUser.class))
-                        .collect(Collectors.toList()),
+        List<RedisUser> redisUsers = usersObject.stream()
+                .map(u -> convert(u, RedisUser.class))
+                .collect(Collectors.toList());
+
+        if(criteria != null) {
+            if (criteria.getStatuses() != null && criteria.getStatuses().length > 0) {
+                List<String> statuses = Arrays.stream(criteria.getStatuses())
+                        .map(UserStatus::name)
+                        .collect(Collectors.toList());
+                redisUsers = redisUsers.stream()
+                        .filter(u -> statuses.contains(u.getStatus()))
+                        .collect(Collectors.toList());
+            }
+
+            if (criteria.hasNoStatus()) {
+                redisUsers = redisUsers.stream()
+                        .filter(u -> u.getStatus() == null)
+                        .collect(Collectors.toList());
+            }
+        }
+
+        return new Page<>(redisUsers,
                 pageable.pageNumber(),
                 subKeys.size(),
                 keys.size());

diff --git a/src/main/java/io/gravitee/repository/redis/management/model/RedisUser.java b/src/main/java/io/gravitee/repository/redis/management/model/RedisUser.java
@@ -15,10 +15,9 @@
  */
 package io.gravitee.repository.redis.management.model;
 
-import java.util.Objects;
-
 /**
- * @author David BRASSELY (brasseld at gmail.com)
+ * @author David BRASSELY (david.brassely at graviteesource.com)
+ * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com)
  * @author GraviteeSource Team
  */
 public class RedisUser {
@@ -35,6 +34,7 @@ public class RedisUser {
     private String source;
     private String sourceId;
     private long lastConnectionAt;
+    private String status;
 
     public String getId() {
         return id;
@@ -132,6 +132,14 @@ public void setLastConnectionAt(long lastConnectionAt) {
         this.lastConnectionAt = lastConnectionAt;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;