From da0e319e952472f664182ab957cb6747ec057060 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Fri, 30 Sep 2022 13:47:26 +0300 Subject: [PATCH] Refactoring CompanyInfo and dependent classes --- .../entity/company/CompanyBackendGetAll.java | 1 - .../entity/company/CompanyBackendInfoGetAll.java | 1 - .../classes/statics/data/account/AccountBalance.java | 2 +- .../classes/statics/data/profile/CompanyInfo.java | 9 --------- .../imdg/businessevent/CompanyHistoryMapStore.java | 9 ++++----- .../imdg/businessobject/CompanyMapStore.java | 12 +++++------- 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java index c657efe39..d7f4fab4f 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java @@ -55,7 +55,6 @@ public class CompanyBackendGetAll extends BasicSpcexResponse { CompanyInfo profile = company.getProfile(); companyInfoFields.setId(profile.getId()); companyInfoFields.setCompanyId(profile.getCompanyId()); - companyInfoFields.setClearingMemberCategory(profile.getClearingMemberCategory()); companyInfoFields.setCorporationSoleType(profile.getCorporationSoleType()); companyInfoFields.setCountryCode(profile.getCountryCode()); companyInfoFields.setDescription(profile.getDescription()); diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java index ddb1692a7..effd0af08 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java @@ -43,7 +43,6 @@ public class CompanyBackendInfoGetAll extends BasicSpcexResponse { var singleItem = new CompanyBackendInfoGetFields(); singleItem.setId(companyInfo.getId()); singleItem.setCompanyId(companyInfo.getCompanyId()); - singleItem.setClearingMemberCategory(companyInfo.getClearingMemberCategory()); singleItem.setCorporationSoleType(companyInfo.getCorporationSoleType()); singleItem.setCountryCode(companyInfo.getCountryCode()); singleItem.setDescription(companyInfo.getDescription()); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java index a652975ea..ad7611ace 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/account/AccountBalance.java @@ -9,7 +9,7 @@ import java.time.LocalDate; /** * Счета *

- * DB table: ACCOUNT + * DB table: ACCOUNT_BALANCE **/ public class AccountBalance extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java index 824450757..175c17b69 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java @@ -10,7 +10,6 @@ public class CompanyInfo extends SpcexObjectBase { private static final long serialVersionUID = ConstSerializable.serialVersionUID; private Long companyId; // Company.CompanyInfo.companyId = CompanyInfo.id - private String clearingMemberCategory; // ref CHAR(4), private String corporationSoleType; // ref CHAR(4), private String countryCode; //ref CHAR(4), private String description; @@ -34,14 +33,6 @@ public class CompanyInfo extends SpcexObjectBase { this.companyId = companyId; } - public String getClearingMemberCategory() { - return clearingMemberCategory; - } - - public void setClearingMemberCategory(String clearingMemberCategory) { - this.clearingMemberCategory = clearingMemberCategory; - } - public String getCorporationSoleType() { return corporationSoleType; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java index aa0ff5f3c..ce029e5a9 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyHistoryMapStore.java @@ -29,16 +29,16 @@ public class CompanyHistoryMapStore extends BusinessEventMapStore companyInfoToSQLArgs(@NonNull CompanyInfo companyInfo, CompanyHistory rootUpdate) { @@ -97,7 +97,6 @@ public class CompanyHistoryMapStore extends BusinessEventMapStore { @Override public String[] getFields() { return new String[]{ - "id", "created_at", "updated_at", "trading_code", "clearing_code", "registration_code", "workflow_status", "short_name", "full_name" + "id", "created_at", "updated_at", "trading_code", "clearing_code", "registration_code", "workflow_status", "short_name", "full_name" }; } public String[] getFieldsForCompanyInfo() { return new String[]{ - "id", "company_id", "clearing_member_category", "corporation_sole_type", "country_code", "description", + "id", "company_id", "corporation_sole_type", "country_code", "description", "professional_sign", "legal_kind", "organization_type", "residence", "short_name", "full_name", - "short_name_eng", "full_name_eng", "trading_code", "clearing_code", "registration_code" + "short_name_eng", "full_name_eng", "trading_code", "clearing_code", "registration_code" }; } @@ -102,7 +102,6 @@ public class CompanyMapStore extends BusinessObjectMapStore { CompanyInfo companyInfo = new CompanyInfo(); companyInfo.setId(rs.getObject("Id", Long.class)); companyInfo.setCompanyId(rs.getObject("CompanyId", Long.class)); - companyInfo.setClearingMemberCategory(rs.getString("ClearingMemberCategory")); companyInfo.setCorporationSoleType(rs.getString("CorporationSoleType")); companyInfo.setCountryCode(rs.getString("CountryCode")); companyInfo.setDescription(rs.getString("Description")); @@ -133,14 +132,13 @@ public class CompanyMapStore extends BusinessObjectMapStore { * Перечисление значений полей CompanyInfo. * См. insertCompanyInfoStatement * - * @param companyInfo должен быть заполнен id, company_id = company.id + * @param companyInfo должен быть заполнен id, company_id = company.id * @return */ protected List companyInfoToSQLArgs(@NonNull CompanyInfo companyInfo) { List companyInfoArgs = new ArrayList<>(Arrays.asList( companyInfo.getId(), companyInfo.getCompanyId(), - companyInfo.getClearingMemberCategory(), companyInfo.getCorporationSoleType(), companyInfo.getCountryCode(), companyInfo.getDescription(), @@ -155,7 +153,7 @@ public class CompanyMapStore extends BusinessObjectMapStore { companyInfo.getTradingCode(), companyInfo.getClearingCode(), companyInfo.getRegistrationCode() - )); + )); return companyInfoArgs; } }