Feature/45 inquiries

src/main/java/ru/veselov/companybot/bot/util/BotUtils.java

@@ -12,6 +12,7 @@ public class BotUtils {
     public static final String CUSTOM_EMOJI = "custom_emoji";
 
     public static final String BASE_DIVISION = "COMMON";
+    public static final String BASE_DIVISION_DESC = "Общ. вопросы";
 
     /**
      * Check if current bot state is available for calling handler from context

src/main/java/ru/veselov/companybot/controller/DivisionController.java

@@ -29,7 +29,7 @@
 import java.util.UUID;
 
 @RestController
-@RequestMapping("/api/v1/division")
+@RequestMapping("/api/v1/divisions")
 @RequiredArgsConstructor
 @Validated
 @Tag(name = "Division, Отдел, Департамент", description = "Управление отделами")
@@ -62,7 +62,7 @@ public DivisionModel addDivision(
                     content = {@Content(array = @ArraySchema(schema = @Schema(implementation = DivisionModel.class)),
                             mediaType = MediaType.APPLICATION_JSON_VALUE)})
     })
-    @GetMapping("/all")
+    @GetMapping
     public List<DivisionModel> getDivisions() {
         return divisionService.findAll();
     }

src/main/java/ru/veselov/companybot/controller/InquiryController.java

@@ -0,0 +1,42 @@
+package ru.veselov.companybot.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.veselov.companybot.dto.InquiryResponseDTO;
+import ru.veselov.companybot.service.InquiryService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/inquiries")
+@RequiredArgsConstructor
+@Validated
+@Tag(name = "Полученные ботом запросы от клиентов", description = "Просмотр запросов")
+public class InquiryController {
+
+    private final InquiryService inquiryService;
+
+    @Operation(summary = "Добавить новый отдел",
+            description = "Принимает название и описание отдела")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "201", description = "Отдел создан",
+                    content = {@Content(array = @ArraySchema(schema = @Schema(implementation = InquiryResponseDTO.class)),
+                            mediaType = MediaType.APPLICATION_JSON_VALUE)})
+    })
+    @GetMapping
+    public List<InquiryResponseDTO> getAll() {
+        return inquiryService.findAll();
+    }
+
+}

src/main/java/ru/veselov/companybot/dto/ContactResponseDto.java

@@ -0,0 +1,24 @@
+package ru.veselov.companybot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+/**
+ * DTO for {@link ru.veselov.companybot.entity.ContactEntity}
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ContactResponseDto implements Serializable {
+
+    private UUID contactId;
+
+    private String phone;
+
+    private String email;
+
+}

src/main/java/ru/veselov/companybot/dto/CustomerResponseDTO.java

@@ -0,0 +1,28 @@
+package ru.veselov.companybot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * DTO for {@link ru.veselov.companybot.entity.CustomerEntity}
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomerResponseDTO implements Serializable {
+
+    private Long id;
+
+    private String firstName;
+
+    private String lastName;
+
+    private String userName;
+
+    private Set<ContactResponseDto> contacts;
+
+}

src/main/java/ru/veselov/companybot/dto/InquiryResponseDTO.java

@@ -0,0 +1,30 @@
+package ru.veselov.companybot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import ru.veselov.companybot.model.DivisionModel;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Set;
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class InquiryResponseDTO implements Serializable {
+
+    private UUID inquiryId;
+
+    private LocalDateTime date;
+
+    private DivisionModel division;
+
+    private Set<MessageResponseDTO> messages;
+
+    private CustomerResponseDTO customer;
+
+}

src/main/java/ru/veselov/companybot/dto/MessageResponseDTO.java

@@ -0,0 +1,22 @@
+package ru.veselov.companybot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * DTO for {@link org.telegram.telegrambots.meta.api.objects.Message}
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MessageResponseDTO implements Serializable {
+
+    private Integer messageId;
+
+    private String text;
+
+}

src/main/java/ru/veselov/companybot/entity/ContactEntity.java

@@ -9,6 +9,7 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Email;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -24,6 +25,7 @@
 @Getter
 @Setter
 @NoArgsConstructor
+@AllArgsConstructor
 public class ContactEntity {
 
     @Id

src/main/java/ru/veselov/companybot/entity/CustomerEntity.java

@@ -44,7 +44,7 @@ public class CustomerEntity {
     private Set<ContactEntity> contacts = new HashSet<>();
 
     //mappedBy - to this object we bind list
-    @OneToMany(mappedBy = "customerEntity", orphanRemoval = true, cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "customer", orphanRemoval = true, cascade = CascadeType.ALL)
     private Set<InquiryEntity> inquiries = new HashSet<>();
 
 }

src/main/java/ru/veselov/companybot/entity/InquiryEntity.java

@@ -46,7 +46,7 @@ public class InquiryEntity {
 
     @ManyToOne
     @JoinColumn(name = "customer_id", referencedColumnName = "id")
-    private CustomerEntity customerEntity;
+    private CustomerEntity customer;
 
     public void addMessage(CustomerMessageEntity message) {
         messages.add(message);
@@ -59,12 +59,12 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         InquiryEntity inquiryEntity = (InquiryEntity) o;
         return date.equals(inquiryEntity.date) && division == inquiryEntity.division
-                && messages.equals(inquiryEntity.messages) && customerEntity.equals(inquiryEntity.customerEntity);
+                && messages.equals(inquiryEntity.messages) && customer.equals(inquiryEntity.customer);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(date, division, messages, customerEntity);
+        return Objects.hash(date, division, messages, customer);
     }
 
 }

src/main/java/ru/veselov/companybot/mapper/ContactMapper.java

@@ -1,7 +1,9 @@
 package ru.veselov.companybot.mapper;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
+import ru.veselov.companybot.dto.ContactResponseDto;
 import ru.veselov.companybot.entity.ContactEntity;
 import ru.veselov.companybot.model.ContactModel;
 
@@ -12,4 +14,9 @@ public interface ContactMapper {
 
     ContactEntity toEntity(ContactModel contactModel);
 
+    @Mapping(target = "contactId", source = "contactId")
+    @Mapping(target = "phone", source = "phone")
+    @Mapping(target = "email", source = "email")
+    ContactResponseDto toContactDTO(ContactEntity contact);
+
 }

src/main/java/ru/veselov/companybot/mapper/CustomerMapper.java

@@ -1,13 +1,21 @@
 package ru.veselov.companybot.mapper;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 import org.telegram.telegrambots.meta.api.objects.User;
+import ru.veselov.companybot.dto.CustomerResponseDTO;
 import ru.veselov.companybot.entity.CustomerEntity;
 
-@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = ContactMapper.class)
 public interface CustomerMapper {
 
     CustomerEntity toEntity(User user);
 
+    @Mapping(target = "id", source = "id")
+    @Mapping(target = "firstName", source = "firstName")
+    @Mapping(target = "lastName", source = "lastName")
+    @Mapping(target = "userName", source = "userName")
+    CustomerResponseDTO toCustomerDTO(CustomerEntity customerEntity);
+
 }

src/main/java/ru/veselov/companybot/mapper/InquiryMapper.java

@@ -0,0 +1,18 @@
+package ru.veselov.companybot.mapper;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import ru.veselov.companybot.dto.InquiryResponseDTO;
+import ru.veselov.companybot.entity.InquiryEntity;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE,
+        uses = {CustomerMapper.class, MessageMapper.class})
+public interface InquiryMapper {
+
+    InquiryResponseDTO entityToDTO(InquiryEntity inquiryEntity);
+
+    List<InquiryResponseDTO> entitiesToDTOS(List<InquiryEntity> entities);
+
+}

src/main/java/ru/veselov/companybot/mapper/MessageMapper.java

@@ -0,0 +1,20 @@
+package ru.veselov.companybot.mapper;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import ru.veselov.companybot.dto.MessageResponseDTO;
+import ru.veselov.companybot.entity.CustomerMessageEntity;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface MessageMapper {
+
+    @Mapping(target = "messageId", source = "messageId")
+    @Mapping(target = "text", source = "message.text")
+    MessageResponseDTO toMessageDTO(CustomerMessageEntity messageEntity);
+
+    List<MessageResponseDTO> toListOfMessageDTO(List<CustomerMessageEntity> entityList);
+
+}

src/main/java/ru/veselov/companybot/model/DivisionModel.java

@@ -8,6 +8,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -17,7 +18,8 @@
 @EqualsAndHashCode(exclude = {"inquiries"})
 @AllArgsConstructor
 @Builder
-public class DivisionModel {
+public class DivisionModel implements Serializable {
+
     @Schema(description = "Id of division", example = "3b4cb719-3489-445d-bb01-ef7958aca896")
     private UUID divisionId;
 

src/main/java/ru/veselov/companybot/service/InquiryService.java

@@ -1,18 +1,14 @@
 package ru.veselov.companybot.service;
 
-import ru.veselov.companybot.entity.InquiryEntity;
+import ru.veselov.companybot.dto.InquiryResponseDTO;
 import ru.veselov.companybot.model.InquiryModel;
 
 import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
 
 public interface InquiryService {
 
-    InquiryEntity save(InquiryModel inquiry);
+    InquiryResponseDTO save(InquiryModel inquiry);
 
-    Optional<InquiryEntity> findWithMessages(UUID id);
-
-    List<InquiryEntity> findAll();
+    List<InquiryResponseDTO> findAll();
 
 }