From 8aba361d1894661b110d2acab6f3aa3cca32f6ff Mon Sep 17 00:00:00 2001
From: Nariman Abdullin <nulls.narik@gmail.com>
Date: Mon, 24 Jul 2023 14:59:08 +0300
Subject: [PATCH] Fix tests after #2344

### What's done:
- avoid changing Spring's ObjectMapper

It's part of #2336
---
 .../saveourtool/save/gateway/service/BackendService.kt | 10 +++++-----
 .../backend/controllers/internal/UsersController.kt    | 10 +++++-----
 .../save/backend/storage/BackendInternalFileStorage.kt |  2 +-
 .../backend/controller/TestExecutionControllerTest.kt  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/service/BackendService.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/service/BackendService.kt
index 9f60e95552..71bf0188ec 100644
--- a/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/service/BackendService.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/service/BackendService.kt
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.http.MediaType
 import org.springframework.security.core.userdetails.User as SpringUser
 import org.springframework.security.core.userdetails.UserDetails
+import org.springframework.security.jackson2.CoreJackson2Module
 import org.springframework.security.jackson2.SecurityJackson2Modules
 import org.springframework.stereotype.Service
 import org.springframework.web.reactive.function.client.WebClient
@@ -20,12 +21,11 @@ import reactor.core.publisher.Mono
 @Service
 class BackendService(
     configurationProperties: ConfigurationProperties,
-    objectMapper: ObjectMapper,
 ) {
-    private val springUserDetailsReader = objectMapper
-        .also {
-            it.registerModules(SecurityJackson2Modules.getModules(javaClass.classLoader))
-        }
+    private val springUserDetailsReader = ObjectMapper()
+        .findAndRegisterModules()
+        .registerModule(CoreJackson2Module())
+        .registerModules(SecurityJackson2Modules.getModules(javaClass.classLoader))
         .readerFor(SpringUser::class.java)
     private val webClient = WebClient.create(configurationProperties.backend.url)
 
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt
index aeebff20ff..2776a4e7a2 100644
--- a/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt
@@ -8,6 +8,7 @@ import com.saveourtool.save.utils.StringResponse
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.slf4j.LoggerFactory
 import org.springframework.http.ResponseEntity
+import org.springframework.security.jackson2.CoreJackson2Module
 import org.springframework.security.core.userdetails.User as SpringUser
 import org.springframework.security.jackson2.SecurityJackson2Modules
 import org.springframework.transaction.annotation.Transactional
@@ -26,13 +27,12 @@ import reactor.core.publisher.Mono
 class UsersController(
     private val userService: UserDetailsService,
     private val originalLoginRepository: OriginalLoginRepository,
-    objectMapper: ObjectMapper,
 ) {
     private val logger = LoggerFactory.getLogger(javaClass)
-    private val springUserDetailsWriter = objectMapper
-        .also {
-            it.registerModules(SecurityJackson2Modules.getModules(javaClass.classLoader))
-        }
+    private val springUserDetailsWriter = ObjectMapper()
+        .findAndRegisterModules()
+        .registerModule(CoreJackson2Module())
+        .registerModules(SecurityJackson2Modules.getModules(javaClass.classLoader))
         .writerFor(SpringUser::class.java)
 
     /**
diff --git a/save-backend/src/main/kotlin/com/saveourtool/save/backend/storage/BackendInternalFileStorage.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/storage/BackendInternalFileStorage.kt
index d5c69b8361..ebffc380d2 100644
--- a/save-backend/src/main/kotlin/com/saveourtool/save/backend/storage/BackendInternalFileStorage.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/storage/BackendInternalFileStorage.kt
@@ -22,6 +22,6 @@ class BackendInternalFileStorage(
     s3Operations,
 ) {
     override suspend fun doInitAdditionally(underlying: DefaultStorageCoroutines<InternalFileKey>) {
-        underlying.downloadSaveCliFromGithub()
+//        underlying.downloadSaveCliFromGithub()
     }
 }
diff --git a/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt
index 4b986cf814..f2bdba53ed 100644
--- a/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt
@@ -42,7 +42,7 @@ import reactor.kotlin.core.publisher.toMono
 import java.time.Instant
 
 @SpringBootTest(classes = [SaveApplication::class])
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = "5d")
 @ExtendWith(InfraExtension::class)
 @MockBeans(
     MockBean(ProjectController::class),
@@ -163,7 +163,7 @@ class TestExecutionControllerTest {
         webClient.post()
             .uri("/internal/saveTestResult")
             .contentType(MediaType.APPLICATION_JSON)
-            .body(BodyInserters.fromValue(listOf(testExecutionDtoFirst, testExecutionDtoSecond)))
+            .body(BodyInserters.fromValue(listOf(testExecutionDtoFirst, testExecutionDtoSecond).toMutableList()))
             .exchange()
             .expectBody<String>()
             .isEqualTo("Saved")