up

src/main/java/su/xserver/iikocon/UserService.java

@@ -21,16 +21,17 @@ public class UserService {
 
   public Future<Void> initDatabase() {
     String createTable = """
-      CREATE TABLE IF NOT EXISTS users (
-        id INT AUTO_INCREMENT PRIMARY KEY,
-        login VARCHAR(255) UNIQUE NOT NULL,
-        password VARCHAR(255) NOT NULL,
-        created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-        updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-        ip VARCHAR(45)
-      )
-      """;
-
+        CREATE TABLE IF NOT EXISTS users (
+          id INT AUTO_INCREMENT PRIMARY KEY,
+          login VARCHAR(255) UNIQUE NOT NULL,
+          email VARCHAR(255) UNIQUE NOT NULL,
+          password VARCHAR(255) NOT NULL,
+          active BOOLEAN DEFAULT FALSE,
+          ip VARCHAR(45),
+          created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+          updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+        )
+        """;
     return pool.query(createTable).execute().mapEmpty();
   }
 
@@ -40,20 +41,38 @@ public class UserService {
       .map(rows -> rows.iterator().next().getLong("cnt"));
   }
 
-  public Future<Void> createUser(String login, String password, String ip) {
+  public Future<Void> createUser(String login, String email, String password, String ip, boolean active) {
     String hash = BCrypt.hashpw(password, BCrypt.gensalt());
-
-    Map<String, Object> params = new HashMap<>();
-    params.put("login", login);
-    params.put("password", hash);
-    params.put("ip", ip);
-
+    Map<String, Object> params = Map.of(
+      "login", login,
+      "email", email,
+      "password", hash,
+      "ip", ip,
+      "active", active
+    );
     return SqlTemplate.forUpdate(pool,
-        "INSERT INTO users (login, password, ip) VALUES (#{login}, #{password}, #{ip})")
+        "INSERT INTO users (login, email, password, ip, active) VALUES (#{login}, #{email}, #{password}, #{ip}, #{active})")
       .execute(params)
       .mapEmpty();
   }
 
+  // Существующий метод оставляем, но он будет создавать неактивного пользователя (active = false)
+  public Future<Void> createUser(String login, String email, String password, String ip) {
+    return createUser(login, email, password, ip, false);
+  }
+
+  public Future<Void> setActive(int id, boolean active) {
+    return SqlTemplate.forUpdate(pool, "UPDATE users SET active = #{active} WHERE id = #{id}")
+      .execute(Map.of("id", id, "active", active)).mapEmpty();
+  }
+
+  public Future<JsonObject> findByEmail(String email) {
+    return SqlTemplate.forQuery(pool, "SELECT id, login, email, password, active, ip, created, updated FROM users WHERE email = #{email}")
+      .mapTo(this::toJson)
+      .execute(Map.of("email", email))
+      .map(rows -> rows.iterator().hasNext() ? rows.iterator().next() : null);
+  }
+
   public Future<JsonObject> findByLogin(String login) {
     return SqlTemplate.forQuery(pool,
         "SELECT id, login, password, created, updated, ip FROM users WHERE login = #{login}")
@@ -71,42 +90,30 @@ public class UserService {
   }
 
   public Future<JsonArray> getAllUsers() {
-    return pool.query("SELECT id, login, created, updated, ip FROM users ORDER BY id")
+    return pool.query("SELECT id, login, email, active, ip, created, updated FROM users ORDER BY id")
       .execute()
       .map(rows -> {
         JsonArray array = new JsonArray();
-        for (Row row : rows) {
-          array.add(new JsonObject()
-            .put("id", row.getInteger("id"))
-            .put("login", row.getString("login"))
-            .put("created", row.getLocalDateTime("created") != null ?
-              row.getLocalDateTime("created").toString() : null)
-            .put("updated", row.getLocalDateTime("updated") != null ?
-              row.getLocalDateTime("updated").toString() : null)
-            .put("ip", row.getString("ip")));
-        }
+        rows.forEach(row -> array.add(toJson(row)));
         return array;
       });
   }
 
-  public Future<Void> updateUser(int id, String login, String password, String ip) {
+  public Future<Void> updateUser(int id, String login, String email, String password, String ip) {
     Map<String, Object> params = new HashMap<>();
     params.put("id", id);
     params.put("login", login);
+    params.put("email", email);
     params.put("ip", ip);
-
     String sql;
     if (password != null && !password.isEmpty()) {
       String hash = BCrypt.hashpw(password, BCrypt.gensalt());
       params.put("password", hash);
-      sql = "UPDATE users SET login = #{login}, password = #{password}, ip = #{ip} WHERE id = #{id}";
+      sql = "UPDATE users SET login = #{login}, email = #{email}, password = #{password}, ip = #{ip} WHERE id = #{id}";
     } else {
-      sql = "UPDATE users SET login = #{login}, ip = #{ip} WHERE id = #{id}";
+      sql = "UPDATE users SET login = #{login}, email = #{email}, ip = #{ip} WHERE id = #{id}";
     }
-
-    return SqlTemplate.forUpdate(pool, sql)
-      .execute(params)
-      .mapEmpty();
+    return SqlTemplate.forUpdate(pool, sql).execute(params).mapEmpty();
   }
 
   public Future<Void> deleteUser(int id) {
@@ -122,4 +129,15 @@ public class UserService {
       return false;
     }
   }
+
+  private JsonObject toJson(Row row) {
+    return new JsonObject()
+      .put("id", row.getInteger("id"))
+      .put("login", row.getString("login"))
+      .put("email", row.getString("email"))
+      .put("active", row.getBoolean("active"))
+      .put("ip", row.getString("ip"))
+      .put("created", row.getLocalDateTime("created") != null ? row.getLocalDateTime("created").toString() : null)
+      .put("updated", row.getLocalDateTime("updated") != null ? row.getLocalDateTime("updated").toString() : null);
+  }
 }