Closes #167: disable users

docs-core/src/main/java/com/sismics/docs/core/dao/jpa/UserDao.java

@@ -10,6 +10,7 @@ import com.sismics.docs.core.util.jpa.QueryParam;
 import com.sismics.docs.core.util.jpa.QueryUtil;
 import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.util.context.ThreadLocalContext;
+import org.joda.time.DateTime;
 import org.mindrot.jbcrypt.BCrypt;
 
 import javax.persistence.EntityManager;
@@ -37,7 +38,7 @@ public class UserDao {
         q.setParameter("username", username);
         try {
             User user = (User) q.getSingleResult();
-            if (!BCrypt.checkpw(password, user.getPassword())) {
+            if (!BCrypt.checkpw(password, user.getPassword()) || user.getDisableDate() != null) {
                 return null;
             }
             return user;
@@ -98,7 +99,8 @@ public class UserDao {
         userFromDb.setStorageQuota(user.getStorageQuota());
         userFromDb.setStorageCurrent(user.getStorageCurrent());
         userFromDb.setTotpKey(user.getTotpKey());
-        
+        userFromDb.setDisableDate(user.getDisableDate());
+
         // Create audit log
         AuditLogUtil.create(userFromDb, AuditLogType.UPDATE, userId);
         
@@ -246,7 +248,7 @@ public class UserDao {
         Map<String, Object> parameterMap = new HashMap<>();
         List<String> criteriaList = new ArrayList<>();
         
-        StringBuilder sb = new StringBuilder("select u.USE_ID_C as c0, u.USE_USERNAME_C as c1, u.USE_EMAIL_C as c2, u.USE_CREATEDATE_D as c3, u.USE_STORAGECURRENT_N as c4, u.USE_STORAGEQUOTA_N as c5, u.USE_TOTPKEY_C as c6");
+        StringBuilder sb = new StringBuilder("select u.USE_ID_C as c0, u.USE_USERNAME_C as c1, u.USE_EMAIL_C as c2, u.USE_CREATEDATE_D as c3, u.USE_STORAGECURRENT_N as c4, u.USE_STORAGEQUOTA_N as c5, u.USE_TOTPKEY_C as c6, u.USE_DISABLEDATE_D as c7");
         sb.append(" from T_USER u ");
         
         // Add search criterias
@@ -283,7 +285,10 @@ public class UserDao {
             userDto.setCreateTimestamp(((Timestamp) o[i++]).getTime());
             userDto.setStorageCurrent(((Number) o[i++]).longValue());
             userDto.setStorageQuota(((Number) o[i++]).longValue());
-            userDto.setTotpKey((String) o[i]);
+            userDto.setTotpKey((String) o[i++]);
+            if (o[i] != null) {
+                userDto.setDisableTimestamp(((Timestamp) o[i]).getTime());
+            }
             userDtoList.add(userDto);
         }
         return userDtoList;
@@ -299,4 +304,16 @@ public class UserDao {
         Query query = em.createNativeQuery("select sum(u.USE_STORAGECURRENT_N) from T_USER u where u.USE_DELETEDATE_D is null");
         return ((Number) query.getSingleResult()).longValue();
     }
+
+    /**
+     * Returns the number of active users.
+     *
+     * @return Number of active users
+     */
+    public long getActiveUserCount() {
+        EntityManager em = ThreadLocalContext.get().getEntityManager();
+        Query query = em.createNativeQuery("select count(u.USE_ID_C) from T_USER u where u.USE_DELETEDATE_D is null and (u.USE_DISABLEDATE_D is null or u.USE_DISABLEDATE_D > :date)");
+        query.setParameter("date", DateTime.now().minusMonths(1).toDate());
+        return ((Number) query.getSingleResult()).longValue();
+    }
 }

docs-core/src/main/java/com/sismics/docs/core/dao/jpa/dto/UserDto.java

@@ -26,6 +26,11 @@ public class UserDto {
      */
     private Long createTimestamp;
 
+    /**
+     * Disable date of this user.
+     */
+    private Long disableTimestamp;
+
     /**
      * Storage quota.
      */
@@ -72,7 +77,16 @@ public class UserDto {
     public void setCreateTimestamp(Long createTimestamp) {
         this.createTimestamp = createTimestamp;
     }
-    
+
+    public Long getDisableTimestamp() {
+        return disableTimestamp;
+    }
+
+    public UserDto setDisableTimestamp(Long disableTimestamp) {
+        this.disableTimestamp = disableTimestamp;
+        return this;
+    }
+
     public Long getStorageQuota() {
         return storageQuota;
     }

docs-core/src/main/java/com/sismics/docs/core/model/jpa/User.java

@@ -1,13 +1,12 @@
 package com.sismics.docs.core.model.jpa;
 
-import java.util.Date;
+import com.google.common.base.MoreObjects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-
-import com.google.common.base.MoreObjects;
+import java.util.Date;
 
 /**
  * User entity.
@@ -84,6 +83,12 @@ public class User implements Loggable {
     @Column(name = "USE_DELETEDATE_D")
     private Date deleteDate;
     
+    /**
+     * Disable date.
+     */
+    @Column(name = "USE_DISABLEDATE_D")
+    private Date disableDate;
+
     public String getId() {
         return id;
     }
@@ -147,7 +152,16 @@ public class User implements Loggable {
         this.deleteDate = deleteDate;
         return this;
     }
-    
+
+    public Date getDisableDate() {
+        return disableDate;
+    }
+
+    public User setDisableDate(Date disableDate) {
+        this.disableDate = disableDate;
+        return this;
+    }
+
     public String getPrivateKey() {
         return privateKey;
     }

docs-core/src/main/resources/config.properties

@@ -1 +1 @@
-db.version=13
+db.version=14

docs-core/src/main/resources/db/update/dbupdate-014-0.sql

@@ -0,0 +1,2 @@
+alter table T_USER add column USE_DISABLEDATE_D datetime;
+update T_CONFIG set CFG_VALUE_C = '14' where CFG_ID_C = 'DB_VERSION';