добавление swagger и HATEOAS

notification-service/pom.xml

@@ -39,5 +39,17 @@
             <artifactId>spring-boot-starter-mail</artifactId>
             <version>3.4.6</version>
         </dependency>
+        <dependency>
+            <groupId>ru.project.iakov</groupId>
+            <artifactId>user-service</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>ru.project.iakov</groupId>
+            <artifactId>user-service</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

notification-service/src/main/java/ru/project/iakov/notificationservice/NotificationServiceApplication.java

@@ -2,8 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class NotificationServiceApplication {
 
 	public static void main(String[] args) {

notification-service/src/main/java/ru/project/iakov/notificationservice/controller/EmailController.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import ru.project.iakov.notificationservice.dto.EmailRequest;
 import ru.project.iakov.notificationservice.model.EventType;
@@ -12,6 +13,7 @@
 @RestController
 @RequestMapping("/api/v1/email")
 @RequiredArgsConstructor
+@Validated
 public class EmailController {
 
     private final EmailService emailService;

notification-service/src/main/java/ru/project/iakov/notificationservice/controller/NotificationController.java

@@ -0,0 +1,34 @@
+package ru.project.iakov.notificationservice.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ru.project.iakov.notificationservice.dto.EmailRequest;
+import ru.project.iakov.notificationservice.service.EmailService;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/kafka")
+@RequiredArgsConstructor
+public class NotificationController {
+
+    private final EmailService emailService;
+
+    @PostMapping("/send")
+    public ResponseEntity<String> sendEmail(@RequestBody EmailRequest request) {
+        try {
+            String body = switch (request.getEventType()) {
+                case CREATED -> "Здравствуйте! Ваш аккаунт был создан.";
+                case DELETED -> "Здравствуйте! Ваш аккаунт был удалён.";
+            };
+
+            emailService.sendEmail(request.getEmail(), request.getSubject(), body);
+            return ResponseEntity.ok("Письмо отправлено");
+        } catch (Exception e) {
+            return ResponseEntity.internalServerError()
+                    .body("Ошибка: " + e.getMessage());
+        }
+    }
+}

notification-service/src/main/java/ru/project/iakov/notificationservice/dto/UserEvent.java

@@ -11,5 +11,6 @@
 @Builder
 public class UserEvent {
     private String email;
+    private String subject;
     private EventType eventType;
 }

notification-service/src/main/java/ru/project/iakov/notificationservice/service/KafkaConsumerService.java

@@ -18,8 +18,7 @@ public class KafkaConsumerService {
     private final ObjectMapper objectMapper;
 
     @KafkaListener(topics = "user-events", groupId = "notification-group")
-    public void listen(ConsumerRecord<String, String> record) {
-        String message = record.value();
+    public void listen(String message) {
         log.info("Kafka message: {}", message);
         try {
             UserEvent event = objectMapper.readValue(message, UserEvent.class);

user-service/pom.xml

@@ -3,51 +3,73 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>ru.project.iakov</groupId>
     <artifactId>user-service</artifactId>
     <version>1.0-SNAPSHOT</version>
+
     <properties>
-        <maven.compiler.source>24</maven.compiler.source>
-        <maven.compiler.target>24</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.2.5</version>
+        <relativePath/>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>42.7.5</version>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.38</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>3.5.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>3.5.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>3.5.0</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
-            <version>3.3.6</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
-            <version>3.4.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

user-service/src/main/java/ru/project/iakov/homework2/controller/UserController.java

@@ -1,49 +1,70 @@
 package ru.project.iakov.homework2.controller;
 
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.hateoas.CollectionModel;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ru.project.iakov.homework2.dto.UserDto;
+import ru.project.iakov.homework2.model.UserModel;
+import ru.project.iakov.homework2.model.UserModelAssembler;
 import ru.project.iakov.homework2.service.UserService;
 
 import java.util.List;
 
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
+
 @RestController
 @RequestMapping("/users")
 public class UserController {
 
     private final UserService userService;
+    private final UserModelAssembler userModelAssembler;
 
     @Autowired
-    public UserController(UserService userService) {
+    public UserController(UserService userService, UserModelAssembler userModelAssembler) {
         this.userService = userService;
+        this.userModelAssembler = userModelAssembler;
     }
 
+    @Operation(summary = "Получить пользователя по ID")
     @GetMapping("/{id}")
-    public ResponseEntity<UserDto> getUserById(@PathVariable("id") Long id) {
-        UserDto userDto = userService.findById(id);
-        return ResponseEntity.ok(userDto);
+    public ResponseEntity<UserModel> getUserById(@PathVariable("id") Long id) {
+        UserDto dto = userService.findById(id);
+        return ResponseEntity.ok(userModelAssembler.toModel(dto));
     }
 
+    @Operation(summary = "Получить всех пользователей")
     @GetMapping
-    public ResponseEntity<List<UserDto>> getAllUsers() {
+    public ResponseEntity<CollectionModel<UserModel>> getAllUsers() {
         List<UserDto> users = userService.findAll();
-        return ResponseEntity.ok(users);
+        List<UserModel> models = users.stream()
+                .map(userModelAssembler::toModel)
+                .toList();
+
+        CollectionModel<UserModel> collectionModel = CollectionModel.of(models);
+        collectionModel.add(linkTo(methodOn(UserController.class).getAllUsers()).withSelfRel());
+
+        return ResponseEntity.ok(collectionModel);
     }
 
+    @Operation(summary = "Создать пользователя")
     @PostMapping
     public ResponseEntity<UserDto> createUser(@RequestBody UserDto userDto) {
         UserDto createdUser = userService.createUser(userDto);
         return ResponseEntity.status(HttpStatus.CREATED).body(createdUser);
     }
 
+    @Operation(summary = "Обновить данные пользователя")
     @PutMapping("/{id}")
     public ResponseEntity<UserDto> updateUser(@PathVariable("id") Long id, @RequestBody UserDto userDto) {
         UserDto updatedUser = userService.updateUser(id, userDto);
         return ResponseEntity.ok(updatedUser);
     }
 
+    @Operation(summary = "Удалить пользователя по ID")
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteUser(@PathVariable("id") Long id) {
         userService.deleteUser(id);

user-service/src/main/java/ru/project/iakov/homework2/model/UserModel.java

@@ -0,0 +1,16 @@
+package ru.project.iakov.homework2.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.hateoas.RepresentationModel;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class UserModel extends RepresentationModel<UserModel> {
+    private Long id;
+    private String name;
+    private String email;
+    private int age;
+}

user-service/src/main/java/ru/project/iakov/homework2/model/UserModelAssembler.java

@@ -0,0 +1,28 @@
+package ru.project.iakov.homework2.model;
+
+import org.springframework.hateoas.server.mvc.RepresentationModelAssemblerSupport;
+import org.springframework.stereotype.Component;
+import ru.project.iakov.homework2.controller.UserController;
+import ru.project.iakov.homework2.dto.UserDto;
+
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
+
+@Component
+public class UserModelAssembler extends RepresentationModelAssemblerSupport<UserDto, UserModel> {
+
+    public UserModelAssembler() {
+        super(UserController.class, UserModel.class);
+    }
+
+    @Override
+    public UserModel toModel(UserDto dto) {
+        UserModel model = new UserModel(dto.getId(), dto.getName(), dto.getEmail(), dto.getAge());
+
+        model.add(linkTo(methodOn(UserController.class).getUserById(dto.getId())).withSelfRel());
+        model.add(linkTo(methodOn(UserController.class).getAllUsers()).withRel("all-users"));
+        model.add(linkTo(methodOn(UserController.class).deleteUser(dto.getId())).withRel("delete"));
+
+        return model;
+    }
+}

user-service/src/main/java/ru/project/iakov/homework2/service/UserService.java

@@ -12,7 +12,6 @@
 import ru.project.iakov.homework2.model.EventType;
 import ru.project.iakov.homework2.repository.UserRepository;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;