From 5aca0cd99a2176282f54877123aa823dcfaeb979 Mon Sep 17 00:00:00 2001
From: psemenkov <psemenkov@mfd.ru>
Date: Mon, 3 Oct 2022 13:03:28 +0300
Subject: [PATCH] fixing bug

---
 .../account/BankAccountControllerTest.java    | 50 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/backend-api/src/test/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java b/clearing-parent/backend-api/src/test/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
index e0705f548..792d57ff6 100644
--- a/clearing-parent/backend-api/src/test/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
+++ b/clearing-parent/backend-api/src/test/ru/spcex/clearing/backendapi/controller/queue/account/BankAccountControllerTest.java
@@ -1,15 +1,19 @@
 package ru.spcex.clearing.backendapi.controller.queue.account;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.filter.CharacterEncodingFilter;
+import ru.clearing.classes.statics.data.account.BankAccount;
 import ru.spcex.clearing.backendapi.config.WebConfig;
 import ru.spcex.clearing.backendapi.controller.queue.config.*;
 import ru.spcex.clearing.backendapi.controller.queue.utils.MatcherFactory;
@@ -17,8 +21,10 @@ import ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNe
 import ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction;
 import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
 import ru.spcex.clearing.backendapi.controller.response.cud.QueueSuccessResponse;
+import ru.spcex.clearing.backendapi.controller.response.entity.account.BankAccountBackendGetById;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.errors.ActionValidationException;
+import ru.spcex.clearing.backendapi.service.impl.StateLoaderImpl;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
 import ru.spcex.clearing.platform.messaging.domain.cud.account.BankAccountNewRequest;
 
@@ -31,13 +37,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static ru.spcex.clearing.backendapi.controller.queue.utils.JsonUtil.writeValue;
 
-@SpringJUnitWebConfig(classes = {
+@ContextConfiguration(classes = {
         WebConfig.class,
         IOperator.class,
         BankAccountControllerConfig.class,
         KafkaConfig.class,
         HazelcastServiceTestConfiguration.class,
+        StateLoaderImplConfig.class,
         Jackson2HttpConverterConfig.class})
+@ExtendWith(SpringExtension.class)
 class BankAccountControllerTest {
 
     public static final MatcherFactory.Matcher<CudResponse> CUD_RESPONSE_MATCHER = MatcherFactory.usingIgnoringFieldsComparator(CudResponse.class);
@@ -52,6 +60,10 @@ class BankAccountControllerTest {
 
     private MockMvc mockMvc;
 
+    @Autowired
+    @Qualifier("stateLoaderImpl")
+    private StateLoaderImpl stateLoader;
+
     @Autowired
     private WebApplicationContext webApplicationContext;
 
@@ -200,6 +212,40 @@ class BankAccountControllerTest {
                 .andExpect(content().json(writeValue(extended)));
     }
 
+    @Test
+    void getById() throws Exception {
+        //ARRANGE
+        BankAccount predictableResult = new BankAccount();
+        predictableResult.setBankName("ooo tinkoff");
+        predictableResult.setBankIdentificationCode("99999");
+        predictableResult.setCorrespondentAccount("9294189285498598598");
+        predictableResult.setCorrespondentAccountName("BIK OF TINKOFF");
+        predictableResult.setCurrency("RUB");
+        predictableResult.setDestination("OOO ROGA I KOPITA");
+        predictableResult.setTaxpayerIdentificationNumber("848484848484");
+        predictableResult.setTaxRegistrationReasonCode("886886");
+        predictableResult.setAccount("123456789123");
+        predictableResult.setId(currentId.getAndIncrement());
+
+//        IMap<Long, ClearingMemberCategory> iMap = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_ClearingMemberCategory);
+//        iMap.put(ID, existsСlearingMemberCategory);
+
+        BankAccountBackendGetById extended = new BankAccountBackendGetById();
+
+        //ACT
+        mockMvc.perform(MockMvcRequestBuilders.get(REST_URL + "0")
+                        .contentType(MediaType.APPLICATION_JSON))
+                .andDo(print())//output to the log request and response
+//      ASSERT
+                .andExpect(status().isOk())
+                .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+                .andExpect(content().json(writeValue(extended)));
+    }
+
+    @Test
+    void getAll() {
+    }
+
     private void assertThrowsFor(IAction<?> iAction) {
         assertThrows(ActionValidationException.class, () -> {
             try {