visitorOpt = visitorsRepository.findById(chat.getId());
- if (visitorOpt.isPresent()) {
- Visitor visitor = visitorOpt.get();
- visitor.setCode(code);
- visitorsRepository.save(visitor);
- String responseCode = chat.getId() + ":" + code;
- responseCode = Base64.getEncoder().encodeToString(responseCode.getBytes());
-
- String message = "Скопируйте код: " + responseCode + " или "
- + "перейдите по ссылке";
- return List.of(sendMessage(chat.getId(), message));
- }
- String errorMessage = "Не удалось найти вас в системе. Попробуйте выполнить команду /start";
- return List.of(sendMessage(chat.getId(), errorMessage));
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java b/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java
deleted file mode 100644
index 2fb0a1c..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/command/impl/StartCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package ru.kayashov.bar.bot.domain.command.impl;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import ru.kayashov.bar.bot.annotation.CommandData;
-import ru.kayashov.bar.bot.domain.command.api.Command;
-import ru.kayashov.bar.bot.domain.methods.AbstractMethod;
-import ru.kayashov.bar.bot.domain.model.AbstractChat;
-import ru.kayashov.bar.bot.domain.model.AbstractUpdate;
-import ru.kayashov.bar.model.entity.Visitor;
-import ru.kayashov.bar.repository.VisitorsRepository;
-
-import java.util.List;
-import java.util.Optional;
-
-import static ru.kayashov.bar.bot.domain.keyboards.reply.ReplyKeyboardMarker.getMainMenu;
-import static ru.kayashov.bar.bot.domain.utils.MethodUtils.sendKeyboardMessage;
-
-/**
- * Команда обработки запроса меню
- *
- * Реализация {@link }
- */
-@Component
-@CommandData(name = "/start")
-@RequiredArgsConstructor
-public class StartCommand implements Command {
-
- private final VisitorsRepository visitorsRepository;
-
- @Override
- public List execute(AbstractUpdate abstractUpdate) {
- AbstractChat chat = abstractUpdate.getMessage().getChat();
-
- Optional visitorOpt = visitorsRepository.findById(chat.getId());
- String message;
- Visitor visitor;
- if (visitorOpt.isPresent()) {
- visitor = visitorOpt.get();
- message = "С возвращением ";
- } else {
- message = "Спасибо за регистрацию ";
- visitor = new Visitor();
- visitor.setId(chat.getId());
- visitor.setName(chat.getFirstName());
- visitor.setLastName(chat.getLastName());
- visitor = visitorsRepository.save(visitor);
- }
- message = message + visitor.getName().strip() +
- (visitor.getLastName() != null ? (" " + visitor.getLastName().strip() + "!") : "!");
-
-
- return List.of(sendKeyboardMessage(chat.getId(), message, getMainMenu()));
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/command/impl/UnknownCommand.java b/src/main/java/ru/kayashov/bar/bot/domain/command/impl/UnknownCommand.java
deleted file mode 100644
index 2130921..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/command/impl/UnknownCommand.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package ru.kayashov.bar.bot.domain.command.impl;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import ru.kayashov.bar.bot.annotation.CommandData;
-import ru.kayashov.bar.bot.domain.command.api.Command;
-import ru.kayashov.bar.bot.domain.methods.AbstractMethod;
-import ru.kayashov.bar.bot.domain.model.AbstractUpdate;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Обработка неизвестных команд
- *
- * Реализация {@link Command}
- */
-@Component
-@CommandData(name = "unknownCommand")
-@RequiredArgsConstructor
-public class UnknownCommand implements Command {
-
- @Override
- public List execute(AbstractUpdate abstractUpdate) {
- return Collections.emptyList();
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/keyboards/inline/InlineKeyboardMarker.java b/src/main/java/ru/kayashov/bar/bot/domain/keyboards/inline/InlineKeyboardMarker.java
deleted file mode 100644
index b7256ce..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/keyboards/inline/InlineKeyboardMarker.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package ru.kayashov.bar.bot.domain.keyboards.inline;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboard;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboardButton;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Класс методов для создания инлайн клавиатур
- */
-@Component
-@RequiredArgsConstructor
-public class InlineKeyboardMarker {
-
- /**
- * Преобразование списка кнопок в блок основных кнопок
- *
- * @param sizeRow опциональный размер строки
- * @param abstractKeyboardButtons список кнопок для блока
- * @return блок основных кнопок
- */
- public List> getMainButtons(Integer sizeRow, List abstractKeyboardButtons) {
-// int rowSize = PaginationUtil.getRowSize(sizeRow);
- int rowSize = sizeRow;
- int rowCountInPage = getRowCount(abstractKeyboardButtons.size(), rowSize);
- List> buttons = new ArrayList<>();
-
- for (int row = 0; row < rowCountInPage; row++) {
- List rowButtons = new ArrayList<>(rowSize);
- for (int i = 0; i < rowSize; i++) {
- int index = (row * rowSize) + i;
- if (index >= abstractKeyboardButtons.size()) {
- break;
- }
- rowButtons.add(abstractKeyboardButtons.get(index));
- }
- buttons.add(rowButtons);
- }
-
- return buttons;
- }
-
-
- /**
- * Запрос количества строк для основных кнопок
- *
- * @param elementsOnPage элементов на странице или общее количество
- * @param rowSize количество элементов в строке
- * @return число строк основных кнопок
- */
- private int getRowCount(int elementsOnPage, int rowSize) {
- return elementsOnPage / rowSize + (elementsOnPage % rowSize == 0 ? 0 : 1);
- }
-
- /**
- * Метод создания кнопок пагинации
- *
- * @return ряд кнопок для пагинации
- */
- public List getPaginationButtons(int index, int total) {
- List buttons = new ArrayList<>();
-
- String pageName = "⏪";
- String callback = index != 0 ? "Cocktail:get:" + (index - 1) : "null";
- buttons.add(getButtonForPage(callback, pageName));
-
- buttons.add(AbstractKeyboardButton.builder().text(index + 1 + "/" + total).callbackData("null").build());
-
- pageName = "⏩";
- callback = index < total - 1 ? "Cocktail:get:" + (index + 1) : "null";
- buttons.add(getButtonForPage(callback, pageName));
-
- return buttons;
- }
-
- /**
- * Метод создания кнопки
- *
- * @param callBack данные, возвращаемые на сервер
- * @param text текст, видимый пользователю
- * @return кнопка для вставки в текст
- */
- public AbstractKeyboardButton getButtonForPage(String callBack, String text) {
- return AbstractKeyboardButton.builder()
- .text(text)
- .callbackData(callBack)
- .build();
- }
-
- public static class builder {
- private final List> buttons = new ArrayList<>();
- private List> mainButtons;
- private List pagination;
- private List back;
- private List hideButton;
- private List stop;
-
- public builder() {
- }
-
- public builder buttons(List> buttons) {
- this.mainButtons = buttons;
- return this;
- }
-
- public builder pagination(List buttons) {
- this.pagination = buttons;
- return this;
- }
-
- public builder backButton(AbstractKeyboardButton button) {
- if (button != null)
- this.back = List.of(button);
- return this;
- }
-
- public builder hidden(boolean isActive) {
- if (isActive) {
- AbstractKeyboardButton button = AbstractKeyboardButton.builder()
- .text("Скрыть")
- .callbackData("hide:")
- .build();
- this.hideButton = List.of(button);
- }
- return this;
- }
-
- public builder stopList(boolean isActive, Long cocktailId) {
- if (isActive) {
- AbstractKeyboardButton button = AbstractKeyboardButton.builder()
- .text("Стоп-лист")
- .callbackData("Cocktail:stop:" + cocktailId)
- .build();
- this.stop = List.of(button);
- }
- return this;
- }
-
- public AbstractKeyboard build() {
- if (mainButtons != null)
- buttons.addAll(mainButtons);
- if (pagination != null)
- buttons.add(pagination);
- if (back != null)
- buttons.add(back);
- if (hideButton != null)
- buttons.add(hideButton);
- if (stop != null)
- buttons.add(stop);
-
- return AbstractKeyboard.builder().keyboard(buttons).build();
- }
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java b/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java
deleted file mode 100644
index e8c0d87..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/keyboards/reply/ReplyKeyboardMarker.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package ru.kayashov.bar.bot.domain.keyboards.reply;
-
-import lombok.experimental.UtilityClass;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboard;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboardButton;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@UtilityClass
-public class ReplyKeyboardMarker {
-
- public static AbstractKeyboard getMainMenu() {
- String[] menu;
- String mainMenu = "\uD83D\uDD11 Вход";
- menu = new String[]{mainMenu/*, "ℹ️ Ингредиенты", "✅ Взять заказ", "💵 Что докупить?"*/};
-
- List> keyboard = getKeyboardRows(menu);
-
- return AbstractKeyboard.builder()
- .keyboard(keyboard)
- .inputFieldPlaceholder("Меню")
- .resizeKeyboard(true)
- .selective(true)
- .oneTimeKeyboard(false)
- .build();
- }
-
- private static List> getKeyboardRows(String... buttons) {
- return Arrays
- .stream(buttons)
- .map(x -> List.of(new AbstractKeyboardButton(x)))
- .collect(Collectors.toList());
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractDeleteMessage.java b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractDeleteMessage.java
deleted file mode 100644
index c435f67..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractDeleteMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.kayashov.bar.bot.domain.methods;
-
-import lombok.Builder;
-import lombok.Getter;
-import ru.kayashov.bar.bot.domain.Bot;
-
-@Getter
-public class AbstractDeleteMessage extends AbstractMethod {
-
- Integer messageId;
-
- @Builder
- public AbstractDeleteMessage(Long chatId, Integer messageId) {
- super(chatId);
- this.messageId = messageId;
- }
-
- @Override
- public void execute(Bot nBot) {
- nBot.deleteMessage(this);
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java
deleted file mode 100644
index 7fada6b..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractInlineKeyboard.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package ru.kayashov.bar.bot.domain.methods;
-
-import lombok.Builder;
-import lombok.Getter;
-import ru.kayashov.bar.bot.domain.Bot;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboard;
-
-@Getter
-public class AbstractInlineKeyboard extends AbstractMethod {
-
- private final String message;
- private final AbstractKeyboard keyboard;
-
- @Builder
- public AbstractInlineKeyboard(Long chatId, String message, AbstractKeyboard keyboard) {
- super(chatId);
- this.message = message;
- this.keyboard = keyboard;
- }
-
- @Override
- public void execute(Bot nBot) {
- nBot.sendInlineKeyboard(this);
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractMethod.java b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractMethod.java
deleted file mode 100644
index 6f2d1f4..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractMethod.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ru.kayashov.bar.bot.domain.methods;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import ru.kayashov.bar.bot.domain.Bot;
-
-@Getter
-@AllArgsConstructor
-public abstract class AbstractMethod {
- private Long chatId;
-
- public abstract void execute(Bot nBot);
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractSendKeyboardMessage.java b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractSendKeyboardMessage.java
deleted file mode 100644
index e35cfc5..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractSendKeyboardMessage.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package ru.kayashov.bar.bot.domain.methods;
-
-import lombok.Builder;
-import lombok.Getter;
-import ru.kayashov.bar.bot.domain.Bot;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboard;
-
-@Getter
-public class AbstractSendKeyboardMessage extends AbstractMethod {
- String message;
- AbstractKeyboard keyboard;
- @Builder
- public AbstractSendKeyboardMessage(Long chatId, String message, AbstractKeyboard keyboard) {
- super(chatId);
- this.keyboard = keyboard;
- this.message = message;
- }
-
- @Override
- public void execute(Bot nBot) {
- nBot.sendKeyboardMessage(this);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractSendMessage.java b/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractSendMessage.java
deleted file mode 100644
index 1fc0ecf..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/methods/AbstractSendMessage.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ru.kayashov.bar.bot.domain.methods;
-
-import lombok.Builder;
-import lombok.Getter;
-import ru.kayashov.bar.bot.domain.Bot;
-
-@Getter
-public class AbstractSendMessage extends AbstractMethod {
- String message;
- @Builder
- public AbstractSendMessage(Long chatId, String message) {
- super(chatId);
- this.message = message;
- }
-
- public void execute(Bot bot) {
- bot.sendMessage(this);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractCallbackQuery.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractCallbackQuery.java
deleted file mode 100644
index 639550c..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractCallbackQuery.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package ru.kayashov.bar.bot.domain.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class AbstractCallbackQuery {
- private AbstractMessage message;
- private String data;
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractChat.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractChat.java
deleted file mode 100644
index 87eb481..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractChat.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ru.kayashov.bar.bot.domain.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class AbstractChat {
- private Long id;
- private String firstName;
- private String lastName;
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractKeyboard.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractKeyboard.java
deleted file mode 100644
index 267bcb0..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractKeyboard.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ru.kayashov.bar.bot.domain.model;
-
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@Builder
-public class AbstractKeyboard {
- private List> keyboard;
- private String inputFieldPlaceholder;
- private Boolean resizeKeyboard;
- private Boolean selective;
- private Boolean oneTimeKeyboard;
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractKeyboardButton.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractKeyboardButton.java
deleted file mode 100644
index 0b9379d..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractKeyboardButton.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ru.kayashov.bar.bot.domain.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class AbstractKeyboardButton {
- private String text;
- private String callbackData;
-
- public AbstractKeyboardButton(String text) {
- this.text = text;
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractMessage.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractMessage.java
deleted file mode 100644
index c82065f..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractMessage.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ru.kayashov.bar.bot.domain.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class AbstractMessage {
- private Long chatId;
- private Integer messageId;
- private String message;
- private AbstractChat chat;
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java b/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java
deleted file mode 100644
index f0c56d3..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/model/AbstractUpdate.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ru.kayashov.bar.bot.domain.model;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class AbstractUpdate {
- private AbstractCallbackQuery callbackQuery;
- private AbstractMessage message;
-
-}
diff --git a/src/main/java/ru/kayashov/bar/bot/domain/utils/MethodUtils.java b/src/main/java/ru/kayashov/bar/bot/domain/utils/MethodUtils.java
deleted file mode 100644
index 9783d17..0000000
--- a/src/main/java/ru/kayashov/bar/bot/domain/utils/MethodUtils.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package ru.kayashov.bar.bot.domain.utils;
-
-import ru.kayashov.bar.bot.domain.methods.AbstractDeleteMessage;
-import ru.kayashov.bar.bot.domain.methods.AbstractInlineKeyboard;
-import ru.kayashov.bar.bot.domain.methods.AbstractSendKeyboardMessage;
-import ru.kayashov.bar.bot.domain.methods.AbstractSendMessage;
-import ru.kayashov.bar.bot.domain.model.AbstractKeyboard;
-
-public class MethodUtils {
-
- public static AbstractDeleteMessage deleteMessage(Long chatId, Integer messageId) {
- return AbstractDeleteMessage.builder()
- .messageId(messageId)
- .chatId(chatId)
- .build();
- }
-
- public static AbstractSendMessage sendMessage(Long chatId, String message) {
- return AbstractSendMessage.builder()
- .message(message)
- .chatId(chatId)
- .build();
- }
-
- public static AbstractSendKeyboardMessage sendKeyboardMessage(Long chatId, String message, AbstractKeyboard keyboard) {
- return AbstractSendKeyboardMessage.builder()
- .keyboard(keyboard)
- .message(message)
- .chatId(chatId)
- .build();
- }
-
- public static AbstractInlineKeyboard sendInlineKeyboard(Long chatId, String message, AbstractKeyboard keyboard) {
- return AbstractInlineKeyboard.builder()
- .keyboard(keyboard)
- .message(message)
- .chatId(chatId)
- .build();
- }
-}
diff --git a/src/main/java/ru/kayashov/bar/config/KafkaConfig.java b/src/main/java/ru/kayashov/bar/config/KafkaConfig.java
new file mode 100644
index 0000000..4d06a56
--- /dev/null
+++ b/src/main/java/ru/kayashov/bar/config/KafkaConfig.java
@@ -0,0 +1,39 @@
+package ru.kayashov.bar.config;
+
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.core.DefaultKafkaProducerFactory;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
+import ru.kayashov.bar.model.AbstractSendMessage;
+import ru.kayashov.bar.service.AbstractMessageSerializer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class KafkaConfig {
+
+ @Value("${spring.kafka.bootstrap-servers}")
+ private String bootstrapServers;
+
+ @Bean
+ public ProducerFactory producerFactory() {
+ Map configProps = new HashMap<>();
+ configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+ configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+ configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, AbstractMessageSerializer.class);
+ configProps.put(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, 31457280);
+ return new DefaultKafkaProducerFactory<>(configProps);
+ }
+
+ @Bean
+ public KafkaTemplate kafkaTemplate(ProducerFactory factory) {
+ KafkaTemplate broker = new KafkaTemplate<>(factory);
+ broker.flush();
+ return broker;
+ }
+}
diff --git a/src/main/java/ru/kayashov/bar/controller/OrderController.java b/src/main/java/ru/kayashov/bar/controller/OrderController.java
index 48100b4..06b9a9d 100644
--- a/src/main/java/ru/kayashov/bar/controller/OrderController.java
+++ b/src/main/java/ru/kayashov/bar/controller/OrderController.java
@@ -2,6 +2,7 @@ package ru.kayashov.bar.controller;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -11,13 +12,13 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import ru.kayashov.bar.bot.domain.Bot;
-import ru.kayashov.bar.bot.domain.methods.AbstractSendMessage;
import ru.kayashov.bar.controller.dto.OrderResponseDto;
+import ru.kayashov.bar.model.AbstractSendMessage;
import ru.kayashov.bar.model.entity.BarEntity;
import ru.kayashov.bar.model.entity.BarResident;
import ru.kayashov.bar.model.entity.SessionEntity;
import ru.kayashov.bar.model.entity.Visitor;
+import ru.kayashov.bar.service.KafkaSender;
import ru.kayashov.bar.service.OrderService;
import ru.kayashov.bar.service.VisitorService;
@@ -32,28 +33,31 @@ import java.util.concurrent.ExecutorService;
@RequiredArgsConstructor
public class OrderController {
+ @Value("${kafka-topic}")
+ private String topic;
+
private final ExecutorService executor;
private final OrderService orderService;
- private final Bot bot;
+ private final KafkaSender kafkaSender;
private final VisitorService visitorService;
@PostMapping
public void pay(@RequestParam Long cocktail) {
Long id = ((Visitor) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getId();
List messages = orderService.createOrder(id, cocktail);
- executor.submit(() -> messages.forEach(bot::sendMessage));
+ executor.submit(() -> messages.forEach(m -> kafkaSender.send(topic, m)));
}
@DeleteMapping
public void cancelOrder(@RequestParam Long id) {
AbstractSendMessage message = orderService.updateOrder(false, id);
- executor.submit(() -> bot.sendMessage(message));
+ executor.submit(() -> kafkaSender.send(topic, message));
}
@PutMapping
public void doneOrder(@RequestParam Long id) {
AbstractSendMessage message = orderService.updateOrder(true, id);
- executor.submit(() -> bot.sendMessage(message));
+ executor.submit(() -> kafkaSender.send(topic, message));
}
@GetMapping
diff --git a/src/main/java/ru/kayashov/bar/model/AbstractSendMessage.java b/src/main/java/ru/kayashov/bar/model/AbstractSendMessage.java
new file mode 100644
index 0000000..e498031
--- /dev/null
+++ b/src/main/java/ru/kayashov/bar/model/AbstractSendMessage.java
@@ -0,0 +1,11 @@
+package ru.kayashov.bar.model;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class AbstractSendMessage {
+ private Long chatId;
+ private String message;
+}
\ No newline at end of file
diff --git a/src/main/java/ru/kayashov/bar/service/AbstractMessageSerializer.java b/src/main/java/ru/kayashov/bar/service/AbstractMessageSerializer.java
new file mode 100644
index 0000000..c602dc3
--- /dev/null
+++ b/src/main/java/ru/kayashov/bar/service/AbstractMessageSerializer.java
@@ -0,0 +1,42 @@
+package ru.kayashov.bar.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.serialization.Serializer;
+import ru.kayashov.bar.model.AbstractSendMessage;
+
+import java.util.Map;
+
+@Slf4j
+public class AbstractMessageSerializer implements Serializer {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Override
+ public void configure(Map configs, boolean isKey) {
+ }
+
+ @Override
+ public byte[] serialize(String topic, AbstractSendMessage data) {
+ try {
+ if (data == null){
+ log.warn("Отсутствует объект для отправки сообщения");
+ return null;
+ }
+ return objectMapper.writeValueAsBytes(data);
+ } catch (Exception e) {
+ throw new SerializationException("Ошибка сериализации объекта");
+ }
+ }
+
+ @Override
+ public byte[] serialize(String topic, Headers headers, AbstractSendMessage data) {
+ return Serializer.super.serialize(topic, headers, data);
+ }
+
+ @Override
+ public void close() {
+ }
+}
diff --git a/src/main/java/ru/kayashov/bar/service/KafkaSender.java b/src/main/java/ru/kayashov/bar/service/KafkaSender.java
new file mode 100644
index 0000000..0decc24
--- /dev/null
+++ b/src/main/java/ru/kayashov/bar/service/KafkaSender.java
@@ -0,0 +1,28 @@
+package ru.kayashov.bar.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Component;
+import ru.kayashov.bar.model.AbstractSendMessage;
+
+import java.util.Arrays;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class KafkaSender {
+
+ private final KafkaTemplate kafkaTemplate;
+
+ public String send(String topic, AbstractSendMessage message) {
+ try {
+ kafkaTemplate.send(topic, message);
+ log.info("отправлено сообщение в топик {}, сообщение {}", topic, message.getMessage());
+ return null;
+ } catch (Exception e) {
+ log.error(e.getMessage(), Arrays.toString(e.getStackTrace()));
+ return e.getMessage();
+ }
+ }
+}
diff --git a/src/main/java/ru/kayashov/bar/service/OrderService.java b/src/main/java/ru/kayashov/bar/service/OrderService.java
index f067e53..53b5f52 100644
--- a/src/main/java/ru/kayashov/bar/service/OrderService.java
+++ b/src/main/java/ru/kayashov/bar/service/OrderService.java
@@ -2,7 +2,7 @@ package ru.kayashov.bar.service;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import ru.kayashov.bar.bot.domain.methods.AbstractSendMessage;
+import ru.kayashov.bar.model.AbstractSendMessage;
import ru.kayashov.bar.model.entity.BarEntity;
import ru.kayashov.bar.model.entity.BarResident;
import ru.kayashov.bar.model.entity.CocktailEntity;
@@ -11,7 +11,6 @@ import ru.kayashov.bar.model.entity.SessionEntity;
import ru.kayashov.bar.model.entity.Visitor;
import ru.kayashov.bar.repository.CocktailRepository;
import ru.kayashov.bar.repository.OrdersRepository;
-import ru.kayashov.bar.repository.VisitorsRepository;
import java.time.LocalDateTime;
import java.util.List;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 80b8f1e..5f08c7d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,6 @@
spring.application.name=myBar
+spring.kafka.bootstrap-servers=192.168.1.100:29092
+kafka-topic=my-bar-bot-message
cocktail.photo.path=${COCKTAIL_PHOTO_PATH:/mnt/sdb1/my-bar-front/build/assets/cocktails}