Renamed and upgraded

Author: Mika1212

pom.xml

@@ -103,11 +103,6 @@
 			<scope>test</scope>
 		</dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-
 		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-configuration-processor -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/ru/mika/vkpingpong/VkApi.java src/main/java/ru/mika/vkpingpong/api/VkApi.java

@@ -1,4 +1,4 @@
-package ru.mika.vkpingpong;
+package ru.mika.vkpingpong.api;
 
 import retrofit2.Call;
 import retrofit2.http.*;

src/main/java/ru/mika/vkpingpong/helper/VkClient.java src/main/java/ru/mika/vkpingpong/api/VkClient.java

@@ -1,4 +1,4 @@
-package ru.mika.vkpingpong.helper;
+package ru.mika.vkpingpong.api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,11 +21,11 @@ public VkClient(@Autowired SecretConfig secretConfig, @Autowired VkRepository vk
         this.vkRepository = vkRepository;
     }
 
-    public String createUri(CallbackAPIMessageDTO callbackDTO) {
+    public String processRequest(CallbackAPIMessageDTO callbackDTO) {
         Random rand = new Random();
         var message = callbackDTO.getObject().getMessage();
         long randomId = Long.parseLong(message.getDate()) * rand.nextInt(10000);
-        SendMessageRequest sendMessageRequest = SendMessageRequest.builder()
+        var sendMessageRequest = SendMessageRequest.builder()
                 .secret(secretConfig.getSecretKey())
                 .userId(message.getFromId())
                 .randomId(randomId)

src/main/java/ru/mika/vkpingpong/helper/VkRepository.java src/main/java/ru/mika/vkpingpong/api/VkRepository.java

@@ -1,11 +1,10 @@
-package ru.mika.vkpingpong.helper;
+package ru.mika.vkpingpong.api;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.stereotype.Component;
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
-import ru.mika.vkpingpong.VkApi;
 import ru.mika.vkpingpong.dto.request.SendMessageRequest;
 import ru.mika.vkpingpong.dto.response.SendMessageResponse;
 
@@ -26,14 +25,14 @@ public VkRepository() {
     }
 
     public SendMessageResponse send(SendMessageRequest request) {
-        ObjectMapper objectMapper = new ObjectMapper();
+        var objectMapper = new ObjectMapper();
         Map<String, Object> paramsMap = objectMapper.convertValue(request, new TypeReference<>() {});
-
         try {
             return vkApi.sendMessage(paramsMap).execute().body();
         } catch (Exception e) {
             e.printStackTrace();
         }
+
         return null;
-    };
+    }
 }

src/main/java/ru/mika/vkpingpong/controller/CallbackAPIController.java

@@ -8,9 +8,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import ru.mika.vkpingpong.dto.callback.CallbackAPIMessageDTO;
-import ru.mika.vkpingpong.helper.MessageHandlerService;
-
-import java.io.IOException;
+import ru.mika.vkpingpong.service.MessageHandlerService;
 
 /**
  * This class contains a controller responsible for handling responses from VK. It processes the incoming responses,
@@ -19,14 +17,14 @@
 @RestController
 @RequestMapping("/callback")
 public class CallbackAPIController {
-    private final MessageHandlerService callbackMessageHelper;
-    public CallbackAPIController(@Autowired MessageHandlerService callbackMessageHelper) {
-        this.callbackMessageHelper = callbackMessageHelper;
+    private final MessageHandlerService service;
+    public CallbackAPIController(@Autowired MessageHandlerService service) {
+        this.service = service;
     }
 
     @PostMapping("/message")
-    public ResponseEntity<String> handleMessageCallback(@RequestBody CallbackAPIMessageDTO callbackDTO) throws IOException {
-        return new ResponseEntity<>(callbackMessageHelper.messageHandler(callbackDTO), HttpStatus.OK);
+    public ResponseEntity<String> handleMessageCallback(@RequestBody CallbackAPIMessageDTO callbackDTO) {
+        return new ResponseEntity<>(service.handle(callbackDTO), HttpStatus.OK);
     }
 
 }

src/main/java/ru/mika/vkpingpong/dto/callback/CallbackAPIMessageDTO.java

@@ -11,6 +11,7 @@
 
 @Builder
 @Getter
+@Setter
 @AllArgsConstructor
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)

src/main/java/ru/mika/vkpingpong/helper/MessageHandlerService.java

@@ -1,4 +1,4 @@
-package ru.mika.vkpingpong.helper;
+package ru.mika.vkpingpong.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -10,14 +10,15 @@
  * configured in the VK settings.
  */
 @Component
-public class CallbackConfirmationHelper {
+public class CallbackConfirmationService implements MessageExecutorService {
     private final SecretConfig secretConfig;
 
-    public CallbackConfirmationHelper(@Autowired SecretConfig secretConfig) {
+    public CallbackConfirmationService(@Autowired SecretConfig secretConfig) {
         this.secretConfig = secretConfig;
     }
 
-    public String confirmationHandler(CallbackAPIMessageDTO callbackDTO) {
+    @Override
+    public String execute(CallbackAPIMessageDTO callbackDTO) {
         if (callbackDTO.getGroupId() == secretConfig.getGroupId())
             return secretConfig.getAcceptString();
         return null;

src/main/java/ru/mika/vkpingpong/helper/CallbackConfirmationHelper.java src/main/java/ru/mika/vkpingpong/service/CallbackConfirmationService.java

@@ -1,54 +1,50 @@
-package ru.mika.vkpingpong.helper;
+package ru.mika.vkpingpong.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import ru.mika.vkpingpong.dto.callback.CallbackAPIMessageDTO;
 import ru.mika.vkpingpong.config.SecretConfig;
 
-import java.io.IOException;
 import java.security.InvalidParameterException;
 
 /**
  * This class is responsible for handling incoming requests to the controller. It processes the requests by determining
  * the appropriate action based on the request type. If the request is for confirmation, the class will invoke the
  * confirmation handler. Alternatively, if the request is a message from the user, it will invoke the message handler.
  */
-
-
 @Component
-public class CallbackMessageHelper implements MessageHandlerService {
+public class CallbackMessageServiceFacade implements MessageHandlerService {
     private final SecretConfig secretConfig;
-    private final CallbackUserNewMessageHelper callbackUserNewMessageHelper;
-    private final CallbackConfirmationHelper callbackConfirmationHelper;
+    private final CallbackUserNewMessageService callbackUserNewMessageService;
+    private final CallbackConfirmationService callbackConfirmationService;
 
-    public CallbackMessageHelper(
+    public CallbackMessageServiceFacade(
             @Autowired SecretConfig secretConfig,
-            @Autowired CallbackUserNewMessageHelper callbackUserNewMessageHelper,
-            @Autowired CallbackConfirmationHelper callbackConfirmationHelper
+            @Autowired CallbackUserNewMessageService callbackUserNewMessageService,
+            @Autowired CallbackConfirmationService callbackConfirmationService
     )
     {
-        this.callbackConfirmationHelper = callbackConfirmationHelper;
-        this.callbackUserNewMessageHelper = callbackUserNewMessageHelper;
+        this.callbackConfirmationService = callbackConfirmationService;
+        this.callbackUserNewMessageService = callbackUserNewMessageService;
         this.secretConfig = secretConfig;
     }
 
-    public String messageHandler(CallbackAPIMessageDTO callbackDTO) throws IOException {
+    @Override
+    public String handle(CallbackAPIMessageDTO callbackDTO) {
         secretCheck(callbackDTO);
         switch (callbackDTO.getType()) {
             case message_new -> {
-                return callbackUserNewMessageHelper.messageHandlerUserMessage(callbackDTO);
+                return callbackUserNewMessageService.execute(callbackDTO);
             }
             case confirmation -> {
-                return callbackConfirmationHelper.confirmationHandler(callbackDTO);
+                return callbackConfirmationService.execute(callbackDTO);
             }
 
-            default -> {
-                throw new InvalidParameterException("Invalid message type");
-            }
+            default -> throw new InvalidParameterException("Invalid message type");
         }
     }
 
-    public void secretCheck(CallbackAPIMessageDTO callbackDTO) {
+    private void secretCheck(CallbackAPIMessageDTO callbackDTO) {
         if (!callbackDTO.getSecret().equals(secretConfig.getSecretKey())) {
             throw new InvalidParameterException("Invalid secret key");
         }

src/main/java/ru/mika/vkpingpong/helper/CallbackMessageHelper.java src/main/java/ru/mika/vkpingpong/service/CallbackMessageServiceFacade.java

@@ -1,25 +1,24 @@
-package ru.mika.vkpingpong.helper;
+package ru.mika.vkpingpong.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import ru.mika.vkpingpong.dto.callback.CallbackAPIMessageDTO;
-
-import java.io.IOException;
+import ru.mika.vkpingpong.api.VkClient;
 
 /**
  * This class is responsible for processing messages received from the user and generating appropriate response
  * from the bot.
  */
 @Component
-public class CallbackUserNewMessageHelper {
+public class CallbackUserNewMessageService implements MessageExecutorService{
     private final VkClient client;
 
-    public CallbackUserNewMessageHelper(@Autowired VkClient client) {
+    public CallbackUserNewMessageService(@Autowired VkClient client) {
         this.client = client;
     }
 
-    public String messageHandlerUserMessage(CallbackAPIMessageDTO callbackDTO) throws IOException {
-        return client.createUri(callbackDTO);
+    @Override
+    public String execute(CallbackAPIMessageDTO callbackDTO){
+        return client.processRequest(callbackDTO);
     }
-
 }

src/main/java/ru/mika/vkpingpong/helper/CallbackUserNewMessageHelper.java src/main/java/ru/mika/vkpingpong/service/CallbackUserNewMessageService.java

@@ -0,0 +1,9 @@
+package ru.mika.vkpingpong.service;
+
+import ru.mika.vkpingpong.dto.callback.CallbackAPIMessageDTO;
+
+public interface MessageExecutorService {
+
+    String execute(CallbackAPIMessageDTO callbackDTO);
+
+}

src/main/java/ru/mika/vkpingpong/service/MessageExecutorService.java

@@ -0,0 +1,8 @@
+package ru.mika.vkpingpong.service;
+
+import ru.mika.vkpingpong.dto.callback.CallbackAPIMessageDTO;
+
+public interface MessageHandlerService {
+
+    String handle(CallbackAPIMessageDTO callbackDTO);
+}