Added docker

Author: Mika1212

Dockerfile

@@ -0,0 +1,6 @@
+FROM eclipse-temurin:17-noble
+WORKDIR demo
+
+COPY target/*.jar vk-ping-pong.jar
+COPY target/classes/application.properties application.properties
+ENTRYPOINT ["java", "-jar", "vk-ping-pong.jar"]

docker-compose.yaml

@@ -0,0 +1,8 @@
+services:
+  vk-ping-pong:
+    image: vk-ping-pong:latest
+    build:
+      dockerfile: Dockerfile
+    restart: on-failure
+    ports:
+      - "8080:8080"

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

@@ -5,6 +5,7 @@
 import ru.mika.vkpingpong.config.SecretConfig;
 import ru.mika.vkpingpong.dto.callback.CallbackAPIMessageDTO;
 import ru.mika.vkpingpong.dto.request.SendMessageRequest;
+import ru.mika.vkpingpong.dto.response.SendMessageResponse;
 
 import java.util.Random;
 
@@ -22,18 +23,19 @@ public VkClient(@Autowired SecretConfig secretConfig, @Autowired VkRepository vk
     }
 
     public String processRequest(CallbackAPIMessageDTO callbackDTO) {
-        Random rand = new Random();
         var message = callbackDTO.getObject().getMessage();
-        long randomId = Long.parseLong(message.getDate()) * rand.nextInt(10000);
         var sendMessageRequest = SendMessageRequest.builder()
                 .secret(secretConfig.getSecretKey())
                 .userId(message.getFromId())
-                .randomId(randomId)
+                .randomId(message.getId())
                 .message("Вы сказали: " + message.getText())
                 .accessToken(secretConfig.getAccessToken())
                 .v(callbackDTO.getV())
                 .build();
 
-        return vkRepository.send(sendMessageRequest).getResponse();
+        SendMessageResponse sendMessageResponse = vkRepository.send(sendMessageRequest);
+        if (sendMessageResponse != null) return sendMessageResponse.getResponse();
+        else return null;
+
     }
 }

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

@@ -2,32 +2,44 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Getter;
 import org.springframework.stereotype.Component;
 import retrofit2.Call;
-import retrofit2.Retrofit;
-import retrofit2.converter.jackson.JacksonConverterFactory;
+import retrofit2.Response;
 import ru.mika.vkpingpong.dto.request.SendMessageRequest;
 import ru.mika.vkpingpong.dto.response.SendMessageResponse;
 
-import java.util.Map;
+import java.util.*;
 
 @Component
 public class VkRepository {
 
     private final VkApiCreator apiCreator;
 
+    private final Map<Long, List<Long>> callbacksMap = new HashMap<>();
+
     public VkRepository(VkApiCreator apiCreator) {
         this.apiCreator = apiCreator;
     }
 
     public SendMessageResponse send(SendMessageRequest request) {
+        if (callbacksMap.containsKey(request.getUserId())) {
+            for (Long id: callbacksMap.get(request.getUserId())) {
+                if (Objects.equals(id, request.getRandomId())) {
+                    return null;
+                }
+            }
+        }
         var objectMapper = new ObjectMapper();
         Map<String, Object> paramsMap = objectMapper.convertValue(request, new TypeReference<>() {});
         try {
             VkApi vkApi = apiCreator.create();
             Call<SendMessageResponse> responseCall = vkApi.sendMessage(paramsMap);
-            return responseCall.execute().body();
+            Response<SendMessageResponse> response = responseCall.execute();
+            List<Long> randomIdList = callbacksMap.getOrDefault(request.getUserId(), new ArrayList<>());
+            randomIdList.add(request.getRandomId());
+            callbacksMap.put(request.getUserId(), randomIdList);
+            return response.body();
+
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -38,6 +38,7 @@ public static class CallbackMessageDTO {
         Long fromId;
         String text;
         String date;
+        Long id;
     }
     public enum MessageType {
         message_new, confirmation

src/test/java/ru/mika/vkpingpong/api/VkClientTest.java

@@ -48,7 +48,7 @@ void test_whenProcessRequestWithCorrectMessage_Success() {
         verify(vkRepository).send(captor.capture());
         assertEquals("V1", captor.getValue().getV());
         assertEquals("Вы сказали: test", captor.getValue().getMessage());
-        assertEquals(0L, captor.getValue().getRandomId());
+        assertEquals(1L, captor.getValue().getRandomId());
         assertEquals(config.getAccessToken(), captor.getValue().getAccessToken());
         assertEquals(1L, captor.getValue().getUserId());
         assertEquals(config.getSecretKey(), captor.getValue().getSecret());
@@ -66,6 +66,7 @@ CallbackAPIMessageDTO buildCallbackMessageDTO() {
         messageDTO.setDate("000");
         messageDTO.setText("test");
         messageDTO.setFromId(1L);
+        messageDTO.setId(1L);
         objectDTO.setMessage(messageDTO);
         mockDTO.setObject(objectDTO);
         mockDTO.setV("V1");