up

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

@@ -4,6 +4,7 @@ import io.vertx.config.ConfigRetriever;
 import io.vertx.config.ConfigRetrieverOptions;
 import io.vertx.config.ConfigStoreOptions;
 import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.json.JsonObject;
@@ -14,6 +15,7 @@ import io.vertx.ext.web.handler.StaticHandler;
 import io.vertx.ext.web.sstore.LocalSessionStore;
 import io.vertx.ext.web.sstore.SessionStore;
 
+import io.vertx.ext.web.sstore.redis.RedisSessionStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import su.xserver.iikocon.config.AppConfig;
@@ -21,6 +23,10 @@ import su.xserver.iikocon.service.DataBaseService;
 import su.xserver.iikocon.service.HealthCheckService;
 import su.xserver.iikocon.service.RedisService;
 
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
 public class MainVerticle extends AbstractVerticle {
 
   private final Logger log = LoggerFactory.getLogger("[MainVerticle]");
@@ -32,6 +38,7 @@ public class MainVerticle extends AbstractVerticle {
 
   private UserService userService;
   private RestaurantService restaurantService;
+  private SettingsService settingsService;
 
   @Override
   public void start(Promise<Void> startPromise) {
@@ -57,21 +64,21 @@ public class MainVerticle extends AbstractVerticle {
         // Инициализация сервисов
         userService = new UserService(db.getPool());
         restaurantService = new RestaurantService(db.getPool());
+        settingsService = new SettingsService(db.getPool());
 
         // Инициализация БД (создание таблицы users)
-        userService.initDatabase()
-          .onSuccess(v -> log.info("Database initialized successfully"))
-          .onFailure(err -> {
-            log.error("Failed to initialize database", err);
-            startPromise.fail(err);
-          });
-
-        restaurantService.initDatabase()
-          .onSuccess(v -> log.info("Database initialized successfully"))
-          .onFailure(err -> {
-            log.error("Failed to initialize database", err);
-            startPromise.fail(err);
-          });
+        userService.initDatabase().onFailure(err -> {
+          log.error("Failed to initialize database", err);
+          startPromise.fail(err);
+        });
+        restaurantService.initDatabase().onFailure(err -> {
+          log.error("Failed to initialize database", err);
+          startPromise.fail(err);
+        });
+        settingsService.initDatabase().onFailure(err -> {
+          log.error("Failed to initialize database", err);
+          startPromise.fail(err);
+        });
 
         Router router = initRouter();
 
@@ -90,7 +97,7 @@ public class MainVerticle extends AbstractVerticle {
       .setSessionCookieName("admin.session")
       .setCookieHttpOnlyFlag(true)
       .setCookieSecureFlag(false)
-      .setSessionTimeout(3600000); // 1 час
+      .setSessionTimeout(3600000);
 
     // Роутер
     Router router = Router.router(vertx);
@@ -144,6 +151,21 @@ public class MainVerticle extends AbstractVerticle {
 
     router.post("/api/logout").handler(authHandler::handleLogout);
 
+    router.post("/api/register").handler(rc -> {
+      JsonObject body = rc.body().asJsonObject();
+      String login = body.getString("login");
+      String email = body.getString("email");
+      String password = body.getString("password");
+      String ip = rc.request().remoteAddress().host();
+      if (login == null || email == null || password == null) {
+        rc.response().setStatusCode(400).end("Missing fields");
+        return;
+      }
+      userService.createUser(login, email, password, ip)
+        .onSuccess(v -> rc.response().setStatusCode(201).end(new JsonObject().put("success", true).encode()))
+        .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
+    });
+
     router.route("/api/admin/*").handler(authHandler::requireAuth);
 
     router.get("/api/admin/users").handler(rc -> userService.getAllUsers().onComplete(ar -> {
@@ -159,13 +181,14 @@ public class MainVerticle extends AbstractVerticle {
     router.post("/api/admin/users").handler(rc -> {
       JsonObject body = rc.body().asJsonObject();
       String login = body.getString("login");
+      String email = body.getString("email");
       String password = body.getString("password");
       String ip = rc.request().remoteAddress().host();
-      if (login == null || password == null) {
-        rc.response().setStatusCode(400).end("Missing login or password");
+      if (login == null || email == null || password == null) {
+        rc.response().setStatusCode(400).end("Missing login, email or password");
         return;
       }
-      userService.createUser(login, password, ip)
+      userService.createUser(login, email, password, ip, true)
         .onSuccess(v -> rc.response().setStatusCode(201).end())
         .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
     });
@@ -174,13 +197,14 @@ public class MainVerticle extends AbstractVerticle {
       int id = Integer.parseInt(rc.pathParam("id"));
       JsonObject body = rc.body().asJsonObject();
       String login = body.getString("login");
+      String email = body.getString("email");
       String password = body.getString("password");
       String ip = rc.request().remoteAddress().host();
-      if (login == null) {
-        rc.response().setStatusCode(400).end("Missing login");
+      if (login == null || email == null) {
+        rc.response().setStatusCode(400).end("Missing login or email");
         return;
       }
-      userService.updateUser(id, login, password, ip)
+      userService.updateUser(id, login, email, password, ip)
         .onSuccess(v -> rc.response().end())
         .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
     });
@@ -192,6 +216,14 @@ public class MainVerticle extends AbstractVerticle {
         .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
     });
 
+    router.put("/api/admin/users/:id/activate").handler(rc -> {
+      int id = Integer.parseInt(rc.pathParam("id"));
+      boolean active = Boolean.parseBoolean(rc.queryParam("active").get(0));
+      userService.setActive(id, active)
+        .onSuccess(v -> rc.response().end())
+        .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
+    });
+
     // Получение текущего пользователя
     router.get("/api/admin/me").handler(rc -> {
       Integer userId = rc.session().get("userId");
@@ -265,6 +297,29 @@ public class MainVerticle extends AbstractVerticle {
         .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
     });
 
+    // Получение всех настроек
+    router.get("/api/settings").handler(rc -> {
+      settingsService.getAll()
+        .onSuccess(settings -> rc.response().putHeader("Content-Type", "application/json").end(settings.encode()))
+        .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
+    });
+
+// Обновление настроек (админ)
+    router.put("/api/admin/settings").handler(rc -> {
+      JsonObject body = rc.body().asJsonObject();
+      List<Future<Void>> futures = new ArrayList<>(); // явно указываем тип Future<Void>
+      body.forEach(entry -> futures.add(settingsService.set(entry.getKey(), entry.getValue().toString())));
+      Future.all(futures)
+        .onSuccess(v -> rc.response().end())
+        .onFailure(err -> rc.response().setStatusCode(500).end(err.getMessage()));
+    });
+
+// Количество активных сессий (на основе Redis)
+    router.get("/api/admin/active-sessions").handler(rc -> {
+      // TODO: реализовать подсчёт активных сессий через Redis или другой механизм
+      rc.response().end(new JsonObject().put("count", 0).encode());
+    });
+
     return router;
   }