Добавил сущности role и user

Reviewed-on: L_DelOff/ServerMonitorBot#5

pom.xml

@@ -47,8 +47,18 @@
             <artifactId>jsch</artifactId>
             <version>0.1.55</version>
         </dependency>
-
+        <dependency>
-
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/ru/ldeloff/servermonitorbot/controller/TelegramBotController.java

@@ -20,8 +20,6 @@ public class TelegramBotController extends TelegramLongPollingBot {
 
     final TelegramBot telegramBot;
     final SshRepository sshRepository;
-    final TelegramBotKeyboard telegramBotKeyboard;
-    final UnameChatButtonAggregate unameChatButtonAggregate;
     final TelegramBotService telegramBotService;
 
     @Override
@@ -31,19 +29,23 @@ public class TelegramBotController extends TelegramLongPollingBot {
                 String messageText = update.getMessage().getText();
                 switch (messageText) {
                     case "/start" -> {
-                        log.info("Получена команда /start");
+                        log.info("Получена команда '" + messageText
+                                + "' от " + update.getMessage().getChat().getUserName());
                         telegramBotService.firstUse(update, this);
                     }
                     case "Статус" -> {
-                        log.info("Получена команда 'Статус'");
+                        log.info("Получена команда '" + messageText
+                                + "' от " + update.getMessage().getChat().getUserName());
                         telegramBotService.getStatusSessions(update, this);
                     }
                     case "uname" -> {
-                        log.info("Получена команда 'uname'");
+                        log.info("Получена команда '" + messageText
+                                + "' от " + update.getMessage().getChat().getUserName());
                         telegramBotService.sendUnameAggregate(update, this);
                     }
                     default -> {
-                        log.warn("Неизвестная команда:" + messageText);
+                        log.warn("Неизвестная команда '" + messageText
+                                + "' от " + update.getMessage().getChat().getUserName());
                         telegramBotService.switchToMainMenu(update, this);
                     }
                 }
@@ -54,16 +56,19 @@ public class TelegramBotController extends TelegramLongPollingBot {
             if (tags.length > 1) {
                 switch (tags[0]) {
                     case "uname":
-                        log.info("Получена команда '" + messageText + "'");
+                        log.info("Получена команда '" + messageText
+                                + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName());
                         telegramBotService.uname(update, this);
                         break;
                     default:
-                        log.warn("Неизвестная команда:" + messageText);
+                        log.warn("Неизвестная команда '" + messageText
+                                + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName());
                         telegramBotService.switchToMainMenu(update, this);
                         break;
                 }
             } else {
-                    log.warn("Неверный формат команды:" + messageText);
+                    log.warn("Неверный формат команды '" + messageText
+                            + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName());
                     telegramBotService.switchToMainMenu(update, this);
             }
         }

src/main/java/ru/ldeloff/servermonitorbot/model/Command.java

@@ -0,0 +1,25 @@
+package ru.ldeloff.servermonitorbot.model;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Command {
+    @NotNull
+    private String command;
+    @NotNull
+    @Min(100)
+    private int timeout;
+    @NotNull
+    private SshServer sshServer;
+    private String response;
+
+    public Command(String command, int timeout, SshServer sshServer) {
+        this.command = command;
+        this.timeout = timeout;
+        this.sshServer = sshServer;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/model/Role.java

@@ -0,0 +1,17 @@
+package ru.ldeloff.servermonitorbot.model;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "roles")
+public class Role {
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(name = "role")
+    private String role;
+}

src/main/java/ru/ldeloff/servermonitorbot/model/User.java

@@ -0,0 +1,21 @@
+package ru.ldeloff.servermonitorbot.model;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "users")
+public class User {
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "login")
+    private Long login;
+
+    @ManyToOne
+    @JoinColumn(name = "id_role")
+    private Role role;
+}

src/main/java/ru/ldeloff/servermonitorbot/repository/SshRepositoryImpl.java

@@ -12,6 +12,7 @@ import ru.ldeloff.servermonitorbot.model.SshServer;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Repository
@@ -65,7 +66,7 @@ public class SshRepositoryImpl implements SshRepository {
         sshServers.forEach(server -> {
             text.append(server.getName())
                     .append(": ")
-                    .append(server.getSession().isConnected() ? "OK" : "отключён")
+                    .append(checkStatusServer(server))
                     .append("\n");
         });
         return String.valueOf(text);
@@ -75,4 +76,13 @@ public class SshRepositoryImpl implements SshRepository {
     public List<SshServer> getSshServers() {
         return sshServers;
     }
+
+    private String checkStatusServer(SshServer server) {
+        if (Objects.isNull(server.getSession())) {
+            return "нет соединения";
+        } else {
+            return server.getSession().isConnected() ? "OK" : "отключён";
+        }
+    }
+
 }

src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotServiceImpl.java

@@ -27,7 +27,7 @@ public class TelegramBotServiceImpl implements TelegramBotService {
         SendMessage message = new SendMessage();
         long chatId = 0L;
         chatId = update.getMessage().getChatId();
-        message.setText("Добро пожалвать " + update.getMessage().getChat().getUserName() + "!");
+        message.setText("Добро пожаловать " + update.getMessage().getChat().getUserName() + "!");
         message.setChatId(chatId);
         sendMessage(telegramBotKeyboard.uiForm(message), bot);
     }

src/main/java/ru/ldeloff/servermonitorbot/service/ssh/SshService.java

@@ -3,6 +3,7 @@ package ru.ldeloff.servermonitorbot.service.ssh;
 
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
 import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.ldeloff.servermonitorbot.model.Command;
 import ru.ldeloff.servermonitorbot.model.SshServer;
 
 import java.util.List;
@@ -10,7 +11,6 @@ import java.util.List;
 public interface SshService {
     SendMessage getStatusSessions(Update update);
     List<SshServer> getSshServers();
-
+    Command execute(Command command);
-    String execute(String s, SshServer sshServer);
+    List<Command> execute(List<Command> commands);
-    String execute(String s, SshServer sshServer, int timeout);
 }

src/main/java/ru/ldeloff/servermonitorbot/service/ssh/SshServiceImpl.java

@@ -8,10 +8,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
 import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.ldeloff.servermonitorbot.model.Command;
 import ru.ldeloff.servermonitorbot.model.SshServer;
 import ru.ldeloff.servermonitorbot.repository.SshRepository;
 
 import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -33,34 +35,44 @@ public class SshServiceImpl implements  SshService {
     }
 
     @Override
-    public String execute(String s, SshServer sshServer) {
+    public Command execute(Command command) {
-        return  execute(s, sshServer, 100);
+        List<Command> commands = new ArrayList<>();
+        commands.add(command);
+        return execute(commands).get(0);
     }
 
     @Override
-    public String execute(String s, SshServer sshServer, int timeout) {
+    public List<Command> execute(List<Command> commands) {
-        Session session = sshServer.getSession();
+        Session session = commands.get(0).getSshServer().getSession(); // подразумевается, что в листе с командами сервер один и тот же
         ChannelExec channel = null;
         try {
             channel = (ChannelExec) session.openChannel("exec");
-            channel.setCommand(s);
+            ChannelExec finalChannel = channel;
-            ByteArrayOutputStream responseStream = new ByteArrayOutputStream();
-            channel.setOutputStream(responseStream);
-            channel.connect();
 
-            while (channel.isConnected()) {
+            commands.forEach(command -> {
-                Thread.sleep(timeout);
+                try {
-            }
+                    finalChannel.setCommand(command.getCommand());
-
+                    ByteArrayOutputStream responseStream = new ByteArrayOutputStream();
-            String responseString = new String(responseStream.toByteArray());
+                    finalChannel.setOutputStream(responseStream);
-            return responseString;
+                    finalChannel.connect();
-        } catch (JSchException | InterruptedException e) {
+                    while (finalChannel.isConnected()) {
-            log.error(e.getMessage());
+                        Thread.sleep(command.getTimeout());
-            return null;
+                    }
+                    String responseString = new String(responseStream.toByteArray());
+                    command.setResponse(responseString);
+                } catch (JSchException | InterruptedException e) {
+                    log.warn(e.getMessage());
+                    throw new RuntimeException(e);
+                }
+            });
+        } catch (JSchException e) {
+            log.warn(e.getMessage());
+            throw new RuntimeException(e);
         } finally {
             if (channel != null) {
                 channel.disconnect();
             }
         }
+        return commands;
     }
 }

src/main/java/ru/ldeloff/servermonitorbot/service/uname/UnameServiceImpl.java

@@ -5,8 +5,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
 import org.telegram.telegrambots.meta.api.objects.Update;
+import ru.ldeloff.servermonitorbot.model.Command;
 import ru.ldeloff.servermonitorbot.model.SshServer;
 import ru.ldeloff.servermonitorbot.service.ssh.SshService;
+import ru.ldeloff.servermonitorbot.utils.SshServerUtils;
 import ru.ldeloff.servermonitorbot.utils.ui.uname.UnameChatButtonAggregate;
 
 import java.util.Arrays;
@@ -49,7 +51,7 @@ public class UnameServiceImpl implements UnameService {
     }
 
     private String unameAllHost() {
-       List<SshServer> servers = sshService.getSshServers();
+       List<SshServer> servers = SshServerUtils.filterGoodServers(sshService.getSshServers());
        StringBuilder response = new StringBuilder();
        servers.forEach(server -> {
            response.append(unameSpecificHost(server.getName())).append("\n");
@@ -63,9 +65,9 @@ public class UnameServiceImpl implements UnameService {
                 .filter(x -> x.getName().equals(serverName))
                 .findFirst();
         if (server.isPresent()) {
-            String result = sshService.execute("uname -a", server.get());
+            Command result = sshService.execute(new Command("uname -a", 100, server.get()));
-            return server.get().getName() + ": " + (Objects.isNull(result) ? "ошибка при выполнении команды" : result);
+            return server.get().getName() + ": " +
-
+                    (Objects.isNull(result.getResponse()) ? "ошибка при выполнении команды" : result.getResponse());
         } else {
             log.error("Ошибка при выполнении команды 'uname'. Искомый сервер (" + serverName + ") не найден");
             return null;

src/main/java/ru/ldeloff/servermonitorbot/utils/SshServerUtils.java

@@ -0,0 +1,17 @@
+package ru.ldeloff.servermonitorbot.utils;
+
+import ru.ldeloff.servermonitorbot.model.SshServer;
+
+import java.util.List;
+import java.util.Objects;
+
+public class SshServerUtils {
+    public static List<SshServer> filterGoodServers(List<SshServer> sshServers) {
+        List<SshServer> goodSshServers = sshServers.stream()
+                .filter(Objects::nonNull)
+                .filter(server -> Objects.nonNull(server.getSession()))
+                .filter(server -> server.getSession().isConnected())
+                .toList();
+        return goodSshServers;
+    }
+}

src/main/java/ru/ldeloff/servermonitorbot/utils/ui/uname/UnameChatButtonAggregate.java

@@ -12,6 +12,7 @@ import ru.ldeloff.servermonitorbot.utils.ui.UiFormer;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Component
 @RequiredArgsConstructor
@@ -26,15 +27,19 @@ public class UnameChatButtonAggregate implements UiFormer {
         InlineKeyboardMarkup inlineKeyboardMarkup = new InlineKeyboardMarkup();
 
         sshService.getSshServers().forEach(sshServer -> {
-            List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
+            if (Objects.nonNull(sshServer.getSession())) {
-            InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
+                if (sshServer.getSession().isConnected()) {
-            inlineKeyboardButton.setText(sshServer.getName());
+                    List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
-            inlineKeyboardButton.setCallbackData("uname: " + sshServer.getName());
+                    InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
-            keyboardRow.add(inlineKeyboardButton);
+                    inlineKeyboardButton.setText(sshServer.getName());
-            keyboard.add(keyboardRow);
+                    inlineKeyboardButton.setCallbackData("uname: " + sshServer.getName());
+                    keyboardRow.add(inlineKeyboardButton);
+                    keyboard.add(keyboardRow);
+                }
+            }
         });
 
-        if (sshService.getSshServers().size() > 1) {
+        if (keyboard.size() > 1) {
             List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
             InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
             inlineKeyboardButton.setText("Все сервера");

src/main/resources/application.yml

@@ -1,3 +1,21 @@
+spring:
+  application:
+    name: ServerMonitorBot
+  datasource:
+    url: jdbc:postgresql://localhost:5432/servermonitorbot
+    username: servermonitorbot
+    password: servermonitorbot
+  jpa:
+    hibernate:
+      ddl-auto: none
+  liquibase:
+    enabled: true
+    change-log: classpath:db/scripts/changelog-master.xml
+    url: jdbc:postgresql://localhost:5432/servermonitorbot
+    user: servermonitorbot
+    password: servermonitorbot
+    liquibase-schema: "liquibase"
+    default-schema: "servermonitorbot"
 bot:
   name: "ServerMonitorBot"
   token: "token"

src/main/resources/db/scripts/changelog-master.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <include file="release_0_0_1/changelog.xml" relativeToChangelogFile="true"/>
+
+
+</databaseChangeLog>

src/main/resources/db/scripts/release_0_0_1/changelog.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <include file="scripts/01_create_table_users.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/02_create_table_roles.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/03_add_FK_users_to_roles.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/04_add_roles.sql" relativeToChangelogFile="true"/>
+
+</databaseChangeLog>

src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql

@@ -0,0 +1,17 @@
+--liquibase formatted sql
+
+--changeset L_DelOff:create_table_users rollbackSplitStatements:true
+--comment: Создание таблицы пользователей
+CREATE TABLE users
+(
+    id       integer        PRIMARY KEY,
+    login    VARCHAR(128),
+    id_role  integer
+);
+
+COMMENT ON TABLE users IS 'Пользователи';
+COMMENT ON COLUMN users.id IS 'Идентификатор пользователя';
+COMMENT ON COLUMN users.login IS 'Логин пользователя';
+COMMENT ON COLUMN users.id_role IS 'Ссылка на роль пользователя';
+
+--rollback DROP TABLE users;

src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql

@@ -0,0 +1,15 @@
+--liquibase formatted sql
+
+--changeset L_DelOff:create_table_roles rollbackSplitStatements:true
+--comment: Создание таблицы ролей
+CREATE TABLE roles
+(
+    id       integer        PRIMARY KEY,
+    role    VARCHAR(128)
+);
+
+COMMENT ON TABLE roles IS 'Пользователи';
+COMMENT ON COLUMN roles.id IS 'Идентификатор пользователя';
+COMMENT ON COLUMN roles.role IS 'Логин пользователя';
+
+--rollback DROP TABLE roles;

src/main/resources/db/scripts/release_0_0_1/scripts/03_add_FK_users_to_roles.sql

@@ -0,0 +1,2 @@
+ALTER TABLE users
+ADD COLUMN role_id INT NOT NULL REFERENCES roles(id);

src/main/resources/db/scripts/release_0_0_1/scripts/04_add_roles.sql

@@ -0,0 +1,2 @@
+INSERT INTO roles (id, role) VALUES (1, 'ADMIN');
+INSERT INTO roles (id, role) VALUES (2, 'USER');