treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-256 небольшая чистка кода

Browse source
This commit is contained in:
AKurakin 2023-04-28 15:43:35 +03:00
parent fb7ff4711a
commit f542cc0441
11 changed files with 68 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/AbstractQueueController.java
View file

@ -4,6 +4,7 @@ import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
import ru.spcex.clearing.backendapi.domain.actions.IAction;
import ru.spcex.clearing.backendapi.service.IOperator;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
public class AbstractQueueController {

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryController.java
View file

@ -27,11 +27,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/clearing-member-categories")
public class EditClearingMemberCategoryController extends AbstractQueueController {
public class ClearingMemberCategoryController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public EditClearingMemberCategoryController(IOperator operator, IStateLoader stateLoader) {
public ClearingMemberCategoryController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

7
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoController.java
View file

@ -16,7 +16,6 @@ import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
import ru.spcex.clearing.backendapi.service.IOperator;
import ru.spcex.clearing.backendapi.service.IStateLoader;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.platform.imdg.api.Imdg;
@ -29,15 +28,13 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/company-infos")
public class EditCompanyInfoController extends AbstractQueueController {
private final IStateLoader stateLoader;
public class CompanyInfoController extends AbstractQueueController {
private final Imdg<Company> companyImdg;
private final GetResponseFactory responseFactory;
@Autowired
public EditCompanyInfoController(IOperator operator, IStateLoader stateLoader, ImdgProvider imdgProvider, GetResponseFactory responseFactory) {
public CompanyInfoController(IOperator operator, ImdgProvider imdgProvider, GetResponseFactory responseFactory) {
super(operator);
this.stateLoader = stateLoader;
this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
this.responseFactory = responseFactory;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolController.java
View file

@ -25,12 +25,12 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/company-symbols")
public class EditCompanySymbolController extends AbstractQueueController {
public class CompanySymbolController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public EditCompanySymbolController(IOperator operator, IStateLoader stateLoader) {
public CompanySymbolController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

4
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactController.java → clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactController.java
View file

@ -25,11 +25,11 @@ import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/contacts")
public class EditContactController extends AbstractQueueController {
public class ContactController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public EditContactController(IOperator operator, IStateLoader stateLoader) {
public ContactController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}

10
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
View file

@ -95,10 +95,10 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
//company
CompanyRoleSetController.class,
CompanyController.class,
EditClearingMemberCategoryController.class,
EditCompanyInfoController.class,
EditCompanySymbolController.class,
EditContactController.class,
ClearingMemberCategoryController.class,
CompanyInfoController.class,
CompanySymbolController.class,
ContactController.class,
ProfileDocumentController.class,
RelationController.class,
//execution
@ -162,7 +162,7 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
MessagesTestConfig.class,
Jackson2HttpConverterTestConfig.class})
@ExtendWith(SpringExtension.class)
@WebMvcTest//(controllers = DeleteCompanyController.class)
@WebMvcTest
//@TestPropertySource(properties = "spring.config.location=D:/repo/mfd/clearing/clearing-parent/backend-api/src/main/resources/")
public abstract class AbstractControllerTest {
protected static final MatcherFactoryWithJson.Matcher<BaseRequest> BASE_REQUEST_MATCHER = usingIgnoringFieldsComparatorForClass(BaseRequest.class,"userId");

12
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditClearingMemberCategoryControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ClearingMemberCategoryControllerTest.java
View file

@ -17,11 +17,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
class ClearingMemberCategoryControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/clearing-member-categories/";
/**
* {@link EditClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* {@link ClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* Тест проверяет получение сущности {@link ClearingMemberCategoryNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ClearingMemberCategoryNewAction}:<br>
* {@link ClearingMemberCategoryNewAction#clearingMemberCategory} - "Category"<br>
@ -40,7 +40,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* {@link ClearingMemberCategoryController#add(ClearingMemberCategoryNewAction)}<br>
* Тест проверяет получение сущности {@link ClearingMemberCategoryNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ClearingMemberCategoryNewAction}:<br>
* {@link ClearingMemberCategoryNewAction#clearingMemberCategory} - "Category"<br>
@ -53,7 +53,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#update(Long, ClearingMemberCategoryUpdateAction)}<br>
* {@link ClearingMemberCategoryController#update(Long, ClearingMemberCategoryUpdateAction)}<br>
* Тест проверяет получение сущности {@link ClearingMemberCategoryUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ClearingMemberCategoryUpdateAction}:<br>
* {@link ClearingMemberCategoryUpdateAction#clearingMemberCategory} - Category<br>
@ -72,7 +72,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#delete(Long)} <br>
* {@link ClearingMemberCategoryController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /clearing-member-categories/{@link Long}: - currentId<br>
*/
@ -88,7 +88,7 @@ class EditClearingMemberCategoryControllerTest extends AbstractControllerTest {
}
/**
* {@link EditClearingMemberCategoryController#getAll()} <br>
* {@link ClearingMemberCategoryController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_ClearingMemberCategory.<br>
* Входной запрос /clearing-member-categories/ <br>
* Ответ CommonGetAllResponse <br>

39
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/DeleteCompanyControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyControllerTest.java
View file

@ -3,15 +3,19 @@ package ru.spcex.clearing.backendapi.controller.queue.company;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.company.Company;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.backendapi.controller.queue.registry.TradingClearingRegistryController;
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyNewAction;
import ru.spcex.clearing.backendapi.controller.request.cud.registry.TradingClearingRegistryNewAction;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest;
class DeleteCompanyControllerTest extends AbstractControllerTest {
class CompanyControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/companies/";
/**
* {@link DeleteCompanyController#delete(Long)} <br>
* {@link CompanyController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /companies/{@link Long}: - 0L<br>
*/
@ -27,7 +31,7 @@ class DeleteCompanyControllerTest extends AbstractControllerTest {
}
/**
* {@link DeleteCompanyController#getAll()} <br>
* {@link CompanyController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.<br>
* Входной запрос /companies <br>
*/
@ -45,4 +49,33 @@ class DeleteCompanyControllerTest extends AbstractControllerTest {
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_Company, existCompany, REST_URL);
}
/**
* {@link CompanyController#add(CompanyNewAction)}<br>
* Тест проверяет создание сущности {@link CompanyNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanyNewAction}:<br>
* {@link CompanyNewAction#fullName "Full name"<br>
* {@link CompanyNewAction#companySymbol "CLRC"<br>
* {@link CompanyNewAction#companySymbolValue "NAME1"<br>
* {@link CompanyNewAction#workflowStatus "ACTV"<br>
*/
@Test
void add() throws Exception {
//ARRANGE
CompanyNewAction newAction = getCompanyNewAction();
//ACT and ASSERT
checkAddingByRestApi(REST_URL, newAction);
checkSendedMessegeFromKafka(Consts.DESTINATION_COMPANY_NEW, newAction);
}
CompanyNewAction getCompanyNewAction() {
CompanyNewAction newAction = new CompanyNewAction();
newAction.setFullName("Full name");
newAction.setCompanySymbol("CLRC");
newAction.setCompanySymbolValue("NAME1");
newAction.setWorkflowStatus("ACTV");
return newAction;
}
}

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanyInfoControllerTest.java
View file

@ -26,11 +26,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditCompanyInfoControllerTest extends AbstractControllerTest {
class CompanyInfoControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/company-infos/";
/**
* {@link EditCompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* {@link CompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanyInfoUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanyInfoUpdateAction}:<br>
* {@link CompanyInfoUpdateAction#workflowStatus} - ACTV<br>
@ -54,7 +54,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* {@link CompanyInfoController#update(Long, CompanyInfoUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanyInfoUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanyInfoUpdateAction}:<br>
* {@link CompanyInfoUpdateAction#workflowStatus} - ACTV<br>
@ -95,7 +95,7 @@ class EditCompanyInfoControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanyInfoController#getAll()} <br>
* {@link CompanyInfoController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Company.<br>
* Входной запрос /company-infos/ <br>
* Ответ CommonGetAllResponse <br>

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanySymbolControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/CompanySymbolControllerTest.java
View file

@ -16,11 +16,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditCompanySymbolControllerTest extends AbstractControllerTest {
class CompanySymbolControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/company-symbols/";
/**
* {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanySymbolUpdateAction}:<br>
* {@link CompanySymbolUpdateAction#companyId} - 1000L<br>
@ -35,7 +35,7 @@ class EditCompanySymbolControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanySymbolUpdateAction}:<br>
* {@link CompanySymbolUpdateAction#companyId} - 1000L<br>
@ -58,7 +58,7 @@ class EditCompanySymbolControllerTest extends AbstractControllerTest {
}
/**
* {@link EditCompanySymbolController#getAll()} <br>
* {@link CompanySymbolController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_CompanySymbols.<br>
* Входной запрос /clearing-member-categories/ <br>
* Ответ CommonGetAllResponse <br>

8
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/EditContactControllerTest.java → clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/company/ContactControllerTest.java
View file

@ -17,11 +17,11 @@ import ru.spcex.clearing.platform.messaging.domain.Consts;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static ru.spcex.clearing.test.json.JsonUtil.writeValue;
class EditContactControllerTest extends AbstractControllerTest {
class ContactControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/contacts/";
/**
* {@link EditCompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* {@link CompanySymbolController#update(Long, CompanySymbolUpdateAction)}<br>
* Тест проверяет получение сущности {@link CompanySymbolUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link CompanySymbolUpdateAction}:<br>
* {@link CompanySymbolUpdateAction#companyId} - 1000L<br>
@ -36,7 +36,7 @@ class EditContactControllerTest extends AbstractControllerTest {
}
/**
* {@link EditContactController#update(Long, ContactUpdateAction)}<br>
* {@link ContactController#update(Long, ContactUpdateAction)}<br>
* Тест проверяет получение сущности {@link ContactUpdateAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link ContactUpdateAction}:<br>
* {@link ContactUpdateAction#contactType} - ContactType<br>
@ -57,7 +57,7 @@ class EditContactControllerTest extends AbstractControllerTest {
}
/**
* {@link EditContactController#getAll()} <br>
* {@link ContactController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_Contact.<br>
* Входной запрос /contacts/ <br>
* Ответ CommonGetAllResponse <br>