Backend 4

.github/workflows/build.yaml

@@ -6,7 +6,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: edu-self-hosted
+    container:
+      image: maven:3-eclipse-temurin-24
+    timeout-minutes: 10
     name: Build
     permissions:
       contents: read
@@ -37,7 +40,10 @@ jobs:
 
   linter:
     name: linter
-    runs-on: ubuntu-latest
+    runs-on: edu-self-hosted
+    container:
+      image: maven:3-eclipse-temurin-24
+    timeout-minutes: 10
     permissions:
       contents: read
       packages: write

README.md

@@ -2,6 +2,12 @@
 
 # Link Tracker
 
+----
+
+Чтобы бот заработал нужно в переменные среды загрузить TELEGRAM_TOKEN
+
+----
+
 <!-- этот файл можно и нужно менять -->
 
 Проект сделан в рамках курса Академия Бэкенда.

bot/pom.xml

@@ -6,6 +6,7 @@
         <groupId>backend.academy</groupId>
         <artifactId>root</artifactId>
         <version>${revision}</version>
+
     </parent>
 
     <artifactId>bot</artifactId>
@@ -43,11 +44,11 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <!-- Kafka -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.kafka</groupId>-->
-        <!--            <artifactId>spring-kafka</artifactId>-->
-        <!--        </dependency>-->
+        <!--        Kafka-->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
 
         <!-- Actuator -->
         <dependency>
@@ -87,6 +88,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -112,11 +114,55 @@
             <artifactId>kafka</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.kafka</groupId>-->
-        <!--            <artifactId>spring-kafka-test</artifactId>-->
-        <!--            <scope>test</scope>-->
-        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.16.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-spring-boot3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.github.resilience4j</groupId>
+            <artifactId>resilience4j-reactor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.9.20.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.bucket4j</groupId>
+            <artifactId>bucket4j-core</artifactId>
+            <version>8.7.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-contract-wiremock -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-contract-wiremock</artifactId>
+            <version>4.2.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -125,7 +171,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <!-- To build OCI image: https://docs.spring.io/spring-boot/maven-plugin/build-image.html -->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

bot/src/main/java/backend/academy/bot/BotApplication.java

@@ -1,11 +1,17 @@
 package backend.academy.bot;
 
+import backend.academy.bot.config.BotConfig;
+import backend.academy.bot.limit.RateLimitProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.retry.annotation.EnableRetry;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-@EnableConfigurationProperties({BotConfig.class})
+@EnableConfigurationProperties({BotConfig.class, RateLimitProperties.class})
+@EnableScheduling
+@EnableRetry
 public class BotApplication {
     public static void main(String[] args) {
         SpringApplication.run(BotApplication.class, args);

bot/src/main/java/backend/academy/bot/LinkTrackerBot.java

@@ -0,0 +1,31 @@
+package backend.academy.bot;
+
+import backend.academy.bot.listener.MessageListener;
+import backend.academy.bot.processor.UserMessageProcessor;
+import com.pengrad.telegrambot.TelegramBot;
+import jakarta.annotation.PostConstruct;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@RequiredArgsConstructor
+@Getter
+@Component
+public class LinkTrackerBot implements AutoCloseable {
+
+    private final TelegramBot telegramBot;
+    private final MessageListener messageListener;
+    private final UserMessageProcessor userMessageProcessor;
+
+    @PostConstruct
+    public void init() {
+        telegramBot.setUpdatesListener(messageListener);
+        // Регистрируем команды при запуске
+        userMessageProcessor.registerCommands();
+    }
+
+    @Override
+    public void close() {
+        telegramBot.shutdown();
+    }
+}

bot/src/main/java/backend/academy/bot/api/controller/UpdateController.java

@@ -0,0 +1,37 @@
+package backend.academy.bot.api.controller;
+
+import backend.academy.bot.api.dto.request.LinkUpdate;
+import backend.academy.bot.notification.NotificationService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@Slf4j
+@RestController
+public class UpdateController {
+
+    private final NotificationService notificationService;
+
+    @Operation(summary = "Отправить обновление")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Обновление обработано")})
+    @ResponseStatus(HttpStatus.OK)
+    @PostMapping("/updates")
+    public void update(@RequestBody @Valid LinkUpdate linkUpdate) {
+        log.info("Пришло обновление по ссылке");
+        notificationService.sendMessage(linkUpdate);
+    }
+
+    @PostMapping("/public")
+    public void update() {
+        log.info("Пришло обновление по ссылке");
+    }
+}

bot/src/main/java/backend/academy/bot/api/dto/kafka/BadLink.java

@@ -0,0 +1,3 @@
+package backend.academy.bot.api.dto.kafka;
+
+public record BadLink(Long id, String url) {}

bot/src/main/java/backend/academy/bot/api/dto/request/AddLinkRequest.java

@@ -0,0 +1,8 @@
+package backend.academy.bot.api.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import java.net.URI;
+import java.util.List;
+
+public record AddLinkRequest(
+        @NotNull(message = "URL не может быть пустым") URI link, List<String> tags, List<String> filters) {}

bot/src/main/java/backend/academy/bot/api/dto/request/LinkUpdate.java

@@ -0,0 +1,16 @@
+package backend.academy.bot.api.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import java.net.URI;
+import java.util.List;
+
+public record LinkUpdate(
+        @NotNull(message = "chatId не может быть null")
+                @Positive(message = "chatId может принимать только положительные значения")
+                Long id,
+        @NotNull(message = "URL не может быть null") URI url,
+        @NotNull(message = "description не может быть null") @NotBlank(message = "Описание не может быть пустым")
+                String description,
+        @NotNull(message = "Список ID чатов не может быть null") List<Long> tgChatIds) {}

bot/src/main/java/backend/academy/bot/api/dto/request/RemoveLinkRequest.java

@@ -0,0 +1,6 @@
+package backend.academy.bot.api.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import java.net.URI;
+
+public record RemoveLinkRequest(@NotNull(message = "URL не может быть пустым") URI link) {}

bot/src/main/java/backend/academy/bot/api/dto/request/filter/FilterRequest.java

@@ -0,0 +1,7 @@
+package backend.academy.bot.api.dto.request.filter;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record FilterRequest(
+        @NotBlank @Size(max = 50, message = "Длина фильтра не должна превышать 50 символов") String filter) {}

bot/src/main/java/backend/academy/bot/api/dto/request/tag/TagLinkRequest.java

@@ -0,0 +1,7 @@
+package backend.academy.bot.api.dto.request.tag;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record TagLinkRequest(
+        @NotBlank @Size(max = 50, message = "Длина тега не должна превышать 50 символов") String tag) {}

bot/src/main/java/backend/academy/bot/api/dto/request/tag/TagRemoveRequest.java

@@ -0,0 +1,10 @@
+package backend.academy.bot.api.dto.request.tag;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import java.net.URI;
+
+public record TagRemoveRequest(
+        @NotBlank @Size(max = 50, message = "Длина тега не должна превышать 50 символов") String tag,
+        @NotNull(message = "URL не может быть пустым") URI uri) {}

bot/src/main/java/backend/academy/bot/api/dto/response/ApiErrorResponse.java

@@ -0,0 +1,11 @@
+package backend.academy.bot.api.dto.response;
+
+import jakarta.validation.constraints.NotBlank;
+import java.util.List;
+
+public record ApiErrorResponse(
+        @NotBlank(message = "description не может быть пустым") String description,
+        @NotBlank(message = "code не может быть пустым") String code,
+        String exceptionName,
+        String exceptionMessage,
+        List<String> stacktrace) {}

bot/src/main/java/backend/academy/bot/api/dto/response/LinkResponse.java

@@ -0,0 +1,6 @@
+package backend.academy.bot.api.dto.response;
+
+import java.net.URI;
+import java.util.List;
+
+public record LinkResponse(Long id, URI url, List<String> tags, List<String> filters) {}

bot/src/main/java/backend/academy/bot/api/dto/response/ListLinksResponse.java

@@ -0,0 +1,5 @@
+package backend.academy.bot.api.dto.response;
+
+import java.util.List;
+
+public record ListLinksResponse(List<LinkResponse> links, Integer size) {}

bot/src/main/java/backend/academy/bot/api/dto/response/TagListResponse.java

@@ -0,0 +1,5 @@
+package backend.academy.bot.api.dto.response;
+
+import java.util.List;
+
+public record TagListResponse(List<String> tags) {}

bot/src/main/java/backend/academy/bot/api/dto/response/filter/FilterListResponse.java

@@ -0,0 +1,5 @@
+package backend.academy.bot.api.dto.response.filter;
+
+import java.util.List;
+
+public record FilterListResponse(List<FilterResponse> filterList) {}

bot/src/main/java/backend/academy/bot/api/dto/response/filter/FilterResponse.java

@@ -0,0 +1,7 @@
+package backend.academy.bot.api.dto.response.filter;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record FilterResponse(
+        Long id, @NotBlank @Size(max = 50, message = "Длина фильтра не должна превышать 50 символов") String filter) {}

bot/src/main/java/backend/academy/bot/api/exception/GlobalExceptionHandler.java

@@ -0,0 +1,49 @@
+package backend.academy.bot.api.exception;
+
+import backend.academy.bot.api.dto.response.ApiErrorResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import java.util.Arrays;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ApiResponses(value = {@ApiResponse(responseCode = "400", description = "Некорректные параметры запроса")})
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ApiErrorResponse handleValidationException(MethodArgumentNotValidException ex) {
+        log.error("GlobalExceptionHandler: ОШИБКА valid: {}", ex.getMessage());
+
+        return new ApiErrorResponse(
+                "Некорректные параметры запроса",
+                "VALIDATION_ERROR",
+                ex.getClass().getSimpleName(),
+                ex.getMessage(),
+                getStackTrace(ex));
+    }
+
+    @ApiResponses(value = {@ApiResponse(responseCode = "400", description = "Некорректные параметры запроса")})
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiErrorResponse handleSerializeException(HttpMessageNotReadableException ex) {
+        log.error("Ошибка десcериализации: {}", ex.getMessage());
+        List<String> stacktrace = getStackTrace(ex);
+        return new ApiErrorResponse(
+                "Некорректные параметры запроса", "BAD_REQUEST", ex.getClass().getName(), ex.getMessage(), stacktrace);
+    }
+
+    private List<String> getStackTrace(Exception ex) {
+        return Arrays.stream(ex.getStackTrace())
+                .map(StackTraceElement::toString)
+                .toList();
+    }
+}

bot/src/main/java/backend/academy/bot/api/exception/ResponseException.java

@@ -0,0 +1,7 @@
+package backend.academy.bot.api.exception;
+
+public class ResponseException extends RuntimeException {
+    public ResponseException(String message) {
+        super(message);
+    }
+}