Добавил кнопку слежения за температурой дисков

Merge pull request 'Применил паттерн Template' (#27 ) from feature/task-26-template into master
Reviewed-on: L_DelOff/ServerMonitorBot#27
2023-08-13 19:36:12 +03:00 · 2023-08-13 18:28:05 +03:00 · 2023-08-13 18:24:29 +03:00 · 2023-08-12 19:45:20 +03:00
17 changed files with 343 additions and 274 deletions
--- a/src/main/java/ru/ldeloff/servermonitorbot/controller/TelegramBotController.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/controller/TelegramBotController.java
@@ -4,167 +4,85 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
-import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
 import org.telegram.telegrambots.meta.api.objects.Update;
-import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
-import ru.ldeloff.servermonitorbot.model.Role;
 import ru.ldeloff.servermonitorbot.model.TelegramBot;
-import ru.ldeloff.servermonitorbot.model.User;
 import ru.ldeloff.servermonitorbot.repository.SshRepository;
-import ru.ldeloff.servermonitorbot.service.TelegramBotService;
-import ru.ldeloff.servermonitorbot.service.role.RoleService;
-import ru.ldeloff.servermonitorbot.service.user.UserService;
-import ru.ldeloff.servermonitorbot.utils.ui.TelegramBotKeyboard;
-import ru.ldeloff.servermonitorbot.utils.ui.uname.UnameChatButtonAggregate;
+import ru.ldeloff.servermonitorbot.service.command.FirstUseCommand;
+import ru.ldeloff.servermonitorbot.service.command.GetStatusSessions;
+import ru.ldeloff.servermonitorbot.service.command.SwitchToMainMenu;
+import ru.ldeloff.servermonitorbot.service.command.hddtemp.HddTempAggregateCommand;
+import ru.ldeloff.servermonitorbot.service.command.hddtemp.HddTempCommand;
+import ru.ldeloff.servermonitorbot.service.command.uname.UnameAggregateCommand;
+import ru.ldeloff.servermonitorbot.service.command.uname.UnameCommand;

@Service
@Slf4j
@RequiredArgsConstructor
 public class TelegramBotController extends TelegramLongPollingBot {
-
    final TelegramBot telegramBot;
    final SshRepository sshRepository;
-    final TelegramBotService telegramBotService;
-    final UserService userService;
-    final RoleService roleService;
+
+    final FirstUseCommand firstUseCommand;
+    final GetStatusSessions getStatusSessions;
+    final UnameAggregateCommand unameAggregateCommand;
+    final SwitchToMainMenu switchToMainMenu;
+    final UnameCommand unameCommand;
+    final HddTempAggregateCommand hddTempAggregateCommand;
+    final HddTempCommand hddTempCommand;

    @Override
    public void onUpdateReceived(Update update) {
-        Role role = getRole(update);
        if (update.hasMessage()) {
            if (update.getMessage().hasText()) {
                String messageText = update.getMessage().getText();
                switch (messageText) {
                    case "/start" -> {
-                        if (role.getId() < 3) {
-                            log.info("Получена команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). OK");
-                            telegramBotService.firstUse(update, this);
-                        } else {
-                            log.warn("Получена команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). Нет прав");
-                            telegramBotService.notAuthorization(update, this);
-                        }
+                        firstUseCommand.execute(update, this);
                    }
                    case "Статус" -> {
-                        if (role.getId() < 3) {
-                            log.info("Получена команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). OK");
-                            telegramBotService.getStatusSessions(update, this);
-                        } else {
-                            log.warn("Получена команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). Нет прав");
-                            telegramBotService.notAuthorization(update, this);
-                        }
+                        getStatusSessions.execute(update, this);
                    }
                    case "uname" -> {
-                        if (role.getId() < 3) {
-                            log.info("Получена команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). OK");
-                            telegramBotService.sendUnameAggregate(update, this);
-                        } else {
-                            log.warn("Получена команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). Нет прав");
-                            telegramBotService.notAuthorization(update, this);
+                        unameAggregateCommand.execute(update, this);
                    }
+                    case "HDD.temp" -> {
+                        hddTempAggregateCommand.execute(update, this);
                    }
                    default -> {
-                        if (role.getId() < 3) {
-                            log.warn("Неизвестная команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). ОК");
-                            telegramBotService.switchToMainMenu(update, this);
-                        } else {
-                            log.warn("Неизвестная команда '" + messageText
-                                    + "' от " + update.getMessage().getChat().getUserName()
-                                    + " (" + update.getMessage().getChat().getId() + "). Нет прав");
-                            telegramBotService.notAuthorization(update, this);
-                        }
+                        switchToMainMenu.execute(update, this);
                    }
                }
            }
        } else if (update.hasCallbackQuery()) {
-            String messageText = update.getCallbackQuery().getData();
-            String [] tags = messageText.split(":");
+            String [] tags = update.getCallbackQuery().getData().split(":");
            if (tags.length > 1) {
                switch (tags[0]) {
-                    case "uname":
-                        if (role.getId() < 3) {
-                            log.info("Получена команда '" + messageText
-                                    + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
-                                    + " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). ОК");
-                            telegramBotService.uname(update, this);
-                        } else {
-                            log.info("Получена команда '" + messageText
-                                    + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
-                                    + " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). Нет прав");
-                            telegramBotService.notAuthorization(update, this);
+                    case "uname" -> {
+                        unameCommand.execute(update, this);
                    }
-                        break;
-                    default:
-                        if (role.getId() < 3) {
-                            log.warn("Неизвестная команда '" + messageText
-                                    + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
-                                    + " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). ОК");
-                            telegramBotService.switchToMainMenu(update, this);
-                        } else {
-                            log.warn("Неизвестная команда '" + messageText
-                                    + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
-                                    + " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). Нет прав");
-                            telegramBotService.notAuthorization(update, this);
+                    case "HDD.temp" -> {
+                        hddTempCommand.execute(update, this);
+                    }
+                    default -> {
+                        switchToMainMenu.execute(update, this);
                    }
-                        break;
                }
            } else {
-                if (role.getId() < 3) {
-                    log.warn("Неверный формат команды '" + messageText
-                            + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
-                            + " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). ОК");
-                    telegramBotService.switchToMainMenu(update, this);
-                } else {
-                    log.warn("Неверный формат команды '" + messageText
-                            + "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
-                            + " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). Нет прав");
-                    telegramBotService.notAuthorization(update, this);
+                switchToMainMenu.execute(update, this);
            }
        }
    }
-    }
-
    @Override
    public String getBotUsername() {
        return telegramBot.getBotUsername();
    }
-
    @Override
    public String getBotToken() {
        return telegramBot.getBotToken();
    }
-
    @Override
    public void onClosing() {
        super.onClosing();
        sshRepository.disconnectSessions();
    }
-
-    private Role getRole(Update update) {
-        Long id = null;
-        if (update.hasMessage()) {
-            id = update.getMessage().getChat().getId();            
-        } else if (update.hasCallbackQuery()) {
-            id = update.getCallbackQuery().getMessage().getChat().getId();
-        }
-        User user = userService.getByTelegramId(id);
-        if (user == null) {
-            return roleService.findRoleById(3L);
-        } else {
-            return user.getRole();
-        }
-    }
 }
--- a/src/main/java/ru/ldeloff/servermonitorbot/model/User.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/model/User.java
@@ -18,4 +18,7 @@ public class User {
    @ManyToOne
    @JoinColumn(name = "role_id")
    private Role role;
+
+    @Transient
+    private String login;
 }
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotService.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotService.java
@@ -1,14 +0,0 @@
-package ru.ldeloff.servermonitorbot.service;
-
-import org.telegram.telegrambots.meta.api.objects.Update;
-import ru.ldeloff.servermonitorbot.controller.TelegramBotController;
-
-public interface TelegramBotService {
-
-    void switchToMainMenu(Update update, TelegramBotController bot);
-    void getStatusSessions(Update update, TelegramBotController bot);
-    void sendUnameAggregate(Update update, TelegramBotController bot);
-    void uname(Update update, TelegramBotController bot);
-    void firstUse(Update update, TelegramBotController bot);
-    void notAuthorization(Update update, TelegramBotController bot);
-}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotServiceImpl.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotServiceImpl.java
@@ -1,91 +0,0 @@
-package ru.ldeloff.servermonitorbot.service;
-
-import lombok.RequiredArgsConstructor;
-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 org.telegram.telegrambots.meta.exceptions.TelegramApiException;
-import ru.ldeloff.servermonitorbot.controller.TelegramBotController;
-import ru.ldeloff.servermonitorbot.repository.SshRepository;
-import ru.ldeloff.servermonitorbot.service.ssh.SshService;
-import ru.ldeloff.servermonitorbot.service.uname.UnameService;
-import ru.ldeloff.servermonitorbot.utils.ui.TelegramBotKeyboard;
-import ru.ldeloff.servermonitorbot.utils.ui.uname.UnameChatButtonAggregate;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class TelegramBotServiceImpl implements TelegramBotService {
-    final TelegramBotKeyboard telegramBotKeyboard;
-    final UnameChatButtonAggregate unameChatButtonAggregate;
-    final UnameService unameService;
-    final SshService sshService;
-
-    @Override
-    public void firstUse(Update update, TelegramBotController bot) {
-        SendMessage message = new SendMessage();
-        long chatId = 0L;
-        chatId = update.getMessage().getChatId();
-        message.setText("Добро пожаловать " + update.getMessage().getChat().getUserName() + "!");
-        message.setChatId(chatId);
-        sendMessage(telegramBotKeyboard.uiForm(message), bot);
-    }
-
-    @Override
-    public void notAuthorization(Update update, TelegramBotController bot) {
-        long id = 0L;
-        String login = null;
-        long chatId = 0L;
-        if (update.hasMessage()) {
-            id = update.getMessage().getChat().getId();
-            login = update.getMessage().getChat().getUserName();
-            chatId = update.getMessage().getChatId();
-        } else if (update.hasCallbackQuery()) {
-            id = update.getCallbackQuery().getMessage().getChat().getId();
-            login = update.getCallbackQuery().getMessage().getChat().getUserName();
-            chatId = update.getCallbackQuery().getMessage().getChatId();
-        }
-        SendMessage message = new SendMessage();
-        message.setText("У пользователя " + login
-                + " (" + id + ") недостаточно прав для выполнения этой команды");
-        message.setChatId(chatId);
-        sendMessage(message, bot);
-    }
-
-    @Override
-    public void switchToMainMenu(Update update, TelegramBotController bot) {
-        SendMessage message = new SendMessage();
-        long chatId = 0L;
-        try {
-            chatId = update.getMessage().getChatId();
-        } catch (Exception e) {
-            chatId = update.getCallbackQuery().getMessage().getChatId();
-        }
-        message.setText("Неверная команда и или формат. Попробуем сначала.");
-        message.setChatId(chatId);
-        sendMessage(telegramBotKeyboard.uiForm(message), bot);
-    }
-    @Override
-    public void getStatusSessions(Update update, TelegramBotController bot) {
-        sendMessage(sshService.getStatusSessions(update), bot);
-    }
-    @Override
-    public void sendUnameAggregate(Update update, TelegramBotController bot) {
-        sendMessage(unameService.sendUnameAggregate(update), bot);
-    }
-
-    @Override
-    public void uname(Update update, TelegramBotController bot) {
-        sendMessage(unameService.uname(update), bot);
-    }
-
-    private void sendMessage(SendMessage message, TelegramBotController bot) {
-        try {
-            bot.execute(message);
-        } catch (TelegramApiException e) {
-            e.printStackTrace();
-            log.warn(e.getMessage());
-        }
-    }
-}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/CommandTemplate.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/CommandTemplate.java
@@ -0,0 +1,87 @@
+package ru.ldeloff.servermonitorbot.service.command;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import ru.ldeloff.servermonitorbot.controller.TelegramBotController;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+
+@Data
+@Slf4j
+@RequiredArgsConstructor
+public abstract class CommandTemplate {
+    final UserService userService;
+    final RoleService roleService;
+    long expectedRole = 2L;
+    public abstract SendMessage actionForAuth(User user, SendMessage message);
+
+    public SendMessage actionForNotAuth(User user, SendMessage message) {
+        message.setText("У пользователя " + user.getLogin() + " (" + user.getTelegramId()
+                + ") недостаточно прав для выполнения этой команды");
+        return message;
+    }
+    public void execute(Update update, TelegramBotController bot) {
+        User user = getUser(update);
+        String message = getMessage(update);
+        SendMessage answer = new SendMessage();
+        answer.setChatId(user.getTelegramId());
+        answer.setText(message);
+        if (user.getRole().getId() <= expectedRole) {
+            logSuccess(user, message);
+            sendMessage(actionForAuth(user, answer), bot);
+        } else {
+            logNotAuth(user, message);
+            sendMessage(actionForNotAuth(user, answer), bot);
+        }
+    }
+    protected void logSuccess(User user, String message) {
+        log.info("Получена команда '" + message + "' от " + user.getLogin()
+                + " (" + user.getTelegramId() + "). OK");
+    }
+    protected void logNotAuth(User user, String message) {
+        log.warn("Получена команда '" + message + "' от " + user.getLogin()
+                + " (" + user.getTelegramId() + "). Нет прав");
+    }
+    private User getUser(Update update) {
+        long id = -1L;
+        String login = null;
+        if (update.hasMessage()) {
+            id = update.getMessage().getChat().getId();
+            login = update.getMessage().getChat().getUserName();
+        } else if (update.hasCallbackQuery()) {
+            id = update.getCallbackQuery().getMessage().getChat().getId();
+            login = update.getCallbackQuery().getMessage().getChat().getUserName();
+        }
+        User user = userService.getByTelegramId(id);
+        if (user == null) {
+            user = new User();
+            user.setTelegramId(id);
+            user.setRole(roleService.findRoleById(3L));
+        }
+        user.setLogin(login);
+        return user;
+    }
+
+    private String getMessage(Update update) {
+        if (update.hasMessage()) {
+            return update.getMessage().getText();
+        } else if (update.hasCallbackQuery()) {
+            return update.getCallbackQuery().getData();
+        }
+        return "";
+    }
+
+    private void sendMessage(SendMessage message, TelegramBotController bot) {
+        try {
+            bot.execute(message);
+        } catch (TelegramApiException e) {
+            e.printStackTrace();
+            log.warn(e.getMessage());
+        }
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/FirstUseCommand.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/FirstUseCommand.java
@@ -0,0 +1,23 @@
+package ru.ldeloff.servermonitorbot.service.command;
+
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+import ru.ldeloff.servermonitorbot.utils.ui.TelegramBotKeyboard;
+
+@Service
+public class FirstUseCommand extends CommandTemplate {
+    final TelegramBotKeyboard telegramBotKeyboard;
+
+    public FirstUseCommand(UserService userService, RoleService roleService, TelegramBotKeyboard telegramBotKeyboard) {
+        super(userService, roleService);
+        this.telegramBotKeyboard = telegramBotKeyboard;
+    }
+    @Override
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        message.setText("Добро пожаловать " + user.getLogin() + "!");
+        return telegramBotKeyboard.uiForm(message);
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/GetStatusSessions.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/GetStatusSessions.java
@@ -0,0 +1,23 @@
+package ru.ldeloff.servermonitorbot.service.command;
+
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.ssh.SshService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+
+@Service
+public class GetStatusSessions extends CommandTemplate {
+    final SshService sshService;
+
+    public GetStatusSessions(UserService userService, RoleService roleService, SshService sshService) {
+        super(userService, roleService);
+        this.sshService = sshService;
+    }
+
+    @Override
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        return sshService.getStatusSessions(message);
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/SwitchToMainMenu.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/SwitchToMainMenu.java
@@ -0,0 +1,35 @@
+package ru.ldeloff.servermonitorbot.service.command;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+import ru.ldeloff.servermonitorbot.utils.ui.TelegramBotKeyboard;
+
+@Service
+@Slf4j
+public class SwitchToMainMenu extends CommandTemplate {
+    final TelegramBotKeyboard telegramBotKeyboard;
+
+    public SwitchToMainMenu(UserService userService, RoleService roleService, TelegramBotKeyboard telegramBotKeyboard) {
+        super(userService, roleService);
+        this.telegramBotKeyboard = telegramBotKeyboard;
+    }
+    @Override
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        message.setText("Неверная команда. Попробуем сначала.");
+        return telegramBotKeyboard.uiForm(message);
+    }
+    @Override
+    public void logSuccess(User user, String message) {
+        log.warn("Получена несуществующая команда '" + message + "' от " + user.getLogin()
+                + " (" + user.getTelegramId() + "). OK");
+    }
+    @Override
+    public void logNotAuth(User user, String message) {
+        log.warn("Получена несуществующая команда '" + message + "' от " + user.getLogin()
+                + " (" + user.getTelegramId() + "). Нет прав");
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/hddtemp/HddTempAggregateCommand.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/hddtemp/HddTempAggregateCommand.java
@@ -0,0 +1,24 @@
+package ru.ldeloff.servermonitorbot.service.command.hddtemp;
+
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.command.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+import ru.ldeloff.servermonitorbot.utils.ui.uname.ServerListButtons;
+
+@Service
+public class HddTempAggregateCommand extends CommandTemplate {
+    final ServerListButtons serverListButtons;
+
+    public HddTempAggregateCommand(UserService userService, RoleService roleService, ServerListButtons serverListButtons) {
+        super(userService, roleService);
+        this.serverListButtons = serverListButtons;
+    }
+
+    @Override
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        return serverListButtons.uiForm(message);
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/hddtemp/HddTempCommand.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/hddtemp/HddTempCommand.java
@@ -0,0 +1,64 @@
+package ru.ldeloff.servermonitorbot.service.command.hddtemp;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.model.Command;
+import ru.ldeloff.servermonitorbot.model.SshServer;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.command.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.ssh.SshService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+import ru.ldeloff.servermonitorbot.utils.SshServerUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class HddTempCommand extends CommandTemplate {
+    final SshService sshService;
+    public HddTempCommand(UserService userService, RoleService roleService, SshService sshService) {
+        super(userService, roleService);
+        this.sshService = sshService;
+    }
+
+    @Override
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        String [] tags = Arrays.stream(message.getText().split(":"))
+                .map(String::trim)
+                .toArray(String[]::new);
+
+        if (tags[1].equals("all")) {
+            message.setText(hddTempAllHost());
+        } else {
+            message.setText(Objects.requireNonNull(hddTempSpecificHost(tags[1])));
+        }
+        return message;
+    }
+
+    private String hddTempAllHost() {
+        List<SshServer> servers = SshServerUtils.filterGoodServers(sshService.getSshServers());
+        StringBuilder response = new StringBuilder();
+        servers.forEach(server -> response.append(hddTempSpecificHost(server.getName())).append("\n"));
+        return response.toString();
+    }
+
+    private String hddTempSpecificHost(String serverName) {
+        Optional<SshServer> server = sshService.getSshServers()
+                .stream()
+                .filter(x -> x.getName().equals(serverName))
+                .findFirst();
+        if (server.isPresent()) {
+            Command result = sshService.execute(new Command("hddtemp /dev/sd*", 500, server.get()));
+            return server.get().getName() + ": \n" +
+                    (Objects.isNull(result.getResponse()) ? "ошибка при выполнении команды" : result.getResponse());
+        } else {
+            log.error("Ошибка при выполнении команды 'hddtemp'. Искомый сервер (" + serverName + ") не найден");
+            return null;
+        }
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/uname/UnameAggregateCommand.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/uname/UnameAggregateCommand.java
@@ -0,0 +1,24 @@
+package ru.ldeloff.servermonitorbot.service.command.uname;
+
+import org.springframework.stereotype.Service;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import ru.ldeloff.servermonitorbot.model.User;
+import ru.ldeloff.servermonitorbot.service.command.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
+import ru.ldeloff.servermonitorbot.utils.ui.uname.ServerListButtons;
+
+@Service
+public class UnameAggregateCommand extends CommandTemplate {
+    final ServerListButtons serverListButtons;
+
+    public UnameAggregateCommand(UserService userService, RoleService roleService, ServerListButtons serverListButtons) {
+        super(userService, roleService);
+        this.serverListButtons = serverListButtons;
+    }
+
+    @Override
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        return serverListButtons.uiForm(message);
+    }
+}
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/command/uname/UnameCommand.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/command/uname/UnameCommand.java
@@ -1,15 +1,16 @@
-package ru.ldeloff.servermonitorbot.service.uname;
+package ru.ldeloff.servermonitorbot.service.command.uname;

-import lombok.RequiredArgsConstructor;
 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.model.User;
+import ru.ldeloff.servermonitorbot.service.command.CommandTemplate;
+import ru.ldeloff.servermonitorbot.service.role.RoleService;
 import ru.ldeloff.servermonitorbot.service.ssh.SshService;
+import ru.ldeloff.servermonitorbot.service.user.UserService;
 import ru.ldeloff.servermonitorbot.utils.SshServerUtils;
-import ru.ldeloff.servermonitorbot.utils.ui.uname.UnameChatButtonAggregate;

 import java.util.Arrays;
 import java.util.List;
@@ -17,45 +18,31 @@ import java.util.Objects;
 import java.util.Optional;

@Service
-@RequiredArgsConstructor
@Slf4j
-public class UnameServiceImpl implements UnameService {
+public class UnameCommand extends CommandTemplate {
    final SshService sshService;
-    final UnameChatButtonAggregate unameChatButtonAggregate;
-    @Override
-    public SendMessage sendUnameAggregate(Update update) {
-        SendMessage message = new SendMessage();
-        long chatId = update.getMessage().getChatId();
-        message.setChatId(chatId);
-        return unameChatButtonAggregate.uiForm(message);
+    public UnameCommand(UserService userService, RoleService roleService, SshService sshService) {
+        super(userService, roleService);
+        this.sshService = sshService;
    }
    @Override
-    public SendMessage uname(Update update) {
-        String messageText = update.getCallbackQuery().getData();
-
-        String [] tags = Arrays.stream(messageText.split(":"))
+    public SendMessage actionForAuth(User user, SendMessage message) {
+        String [] tags = Arrays.stream(message.getText().split(":"))
                .map(String::trim)
                .toArray(String[]::new);

-        String result;
        if (tags[1].equals("all")) {
-            result = unameAllHost();
+            message.setText(unameAllHost());
        } else {
-            result = unameSpecificHost(tags[1]);
+            message.setText(Objects.requireNonNull(unameSpecificHost(tags[1])));
        }
-        SendMessage message = new SendMessage();
-        long chatId = update.getCallbackQuery().getMessage().getChatId();
-        message.setChatId(chatId);
-        message.setText(result);
        return message;
    }

    private String unameAllHost() {
        List<SshServer> servers = SshServerUtils.filterGoodServers(sshService.getSshServers());
        StringBuilder response = new StringBuilder();
-       servers.forEach(server -> {
-           response.append(unameSpecificHost(server.getName())).append("\n");
-       });
+        servers.forEach(server -> response.append(unameSpecificHost(server.getName())).append("\n"));
        return response.toString();
    }

--- a/src/main/java/ru/ldeloff/servermonitorbot/service/ssh/SshService.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/ssh/SshService.java
@@ -2,14 +2,14 @@ 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;

 public interface SshService {
-    SendMessage getStatusSessions(Update update);
+    SendMessage getStatusSessions(SendMessage update);
+
    List<SshServer> getSshServers();
    Command execute(Command command);
    List<Command> execute(List<Command> commands);
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/ssh/SshServiceImpl.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/ssh/SshServiceImpl.java
@@ -7,7 +7,6 @@ import lombok.RequiredArgsConstructor;
 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;
@@ -22,11 +21,8 @@ import java.util.List;
 public class SshServiceImpl implements SshService {
    final SshRepository sshRepository;
    @Override
-    public SendMessage getStatusSessions(Update update) {
-        SendMessage message = new SendMessage();
-        long chatId = update.getMessage().getChatId();
+    public SendMessage getStatusSessions(SendMessage message) {
        message.setText(sshRepository.getStatusSessions());
-        message.setChatId(chatId);
        return message;
    }
    @Override
--- a/src/main/java/ru/ldeloff/servermonitorbot/service/uname/UnameService.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/service/uname/UnameService.java
@@ -1,10 +0,0 @@
-package ru.ldeloff.servermonitorbot.service.uname;
-
-import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import org.telegram.telegrambots.meta.api.objects.Update;
-
-public interface UnameService {
-    SendMessage sendUnameAggregate(Update update);
-
-    SendMessage uname(Update update);
-}
--- a/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 public class TelegramBotKeyboard implements UiFormer {
    private final String STATUS = "Статус";
    private final String UNAME = "uname";
+    private final String HDD_TEMP = "HDD.temp";

    @Override
    public SendMessage uiForm(SendMessage message) {
@@ -27,6 +28,7 @@ public class TelegramBotKeyboard implements UiFormer {

        keyboardRow.add(new KeyboardButton(STATUS));
        keyboardRow.add(new KeyboardButton(UNAME));
+        keyboardRow.add(new KeyboardButton(HDD_TEMP));

        replyKeyboardMarkup.setKeyboard(keyboardRows);
        message.setReplyMarkup(replyKeyboardMarkup);
--- a/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/uname/UnameChatButtonAggregate.java
+++ b/src/main/java/ru/ldeloff/servermonitorbot/utils/ui/uname/UnameChatButtonAggregate.java
@@ -1,12 +1,10 @@
 package ru.ldeloff.servermonitorbot.utils.ui.uname;

 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
 import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
 import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton;
-import ru.ldeloff.servermonitorbot.repository.SshRepository;
 import ru.ldeloff.servermonitorbot.service.ssh.SshService;
 import ru.ldeloff.servermonitorbot.utils.ui.UiFormer;

@@ -16,7 +14,7 @@ import java.util.Objects;

@Component
@RequiredArgsConstructor
-public class UnameChatButtonAggregate implements UiFormer {
+public class ServerListButtons implements UiFormer {

    private final SshService sshService;

@@ -32,7 +30,7 @@ public class UnameChatButtonAggregate implements UiFormer {
                    List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
                    InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
                    inlineKeyboardButton.setText(sshServer.getName());
-                    inlineKeyboardButton.setCallbackData("uname: " + sshServer.getName());
+                    inlineKeyboardButton.setCallbackData(message.getText() + ": " + sshServer.getName());
                    keyboardRow.add(inlineKeyboardButton);
                    keyboard.add(keyboardRow);
                }
@@ -43,14 +41,14 @@ public class UnameChatButtonAggregate implements UiFormer {
            List<InlineKeyboardButton> keyboardRow = new ArrayList<>();
            InlineKeyboardButton inlineKeyboardButton = new InlineKeyboardButton();
            inlineKeyboardButton.setText("Все сервера");
-            inlineKeyboardButton.setCallbackData("uname: all");
+            inlineKeyboardButton.setCallbackData(message.getText() + ": all");
            keyboardRow.add(inlineKeyboardButton);
            keyboard.add(keyboardRow);
        }

        inlineKeyboardMarkup.setKeyboard(keyboard);
        message.setReplyMarkup(inlineKeyboardMarkup);
-        message.setText("Выполнить uname для");
+        message.setText("Выполнить " + message.getText() + " для");

        return message;
    }
Author	SHA1	Message	Date
L_DelOff	d0be1f0a62	Добавил кнопку слежения за температурой дисков	2023-08-13 19:36:12 +03:00
L_DelOff	e75c496ea8	Merge pull request 'Применил паттерн Template' (#27 ) from feature/task-26-template into master Reviewed-on: L_DelOff/ServerMonitorBot#27	2023-08-13 18:28:05 +03:00
L_DelOff	32147b0e52	Применил паттерн Template	2023-08-13 18:24:29 +03:00
L_DelOff	99d06bb3bc	Merge pull request 'feature/task-6-security' (#24 ) from feature/task-6-security into master Reviewed-on: L_DelOff/ServerMonitorBot#24	2023-08-12 19:45:20 +03:00