From aab8165c81a008f0185a546180c2a23612a20375 Mon Sep 17 00:00:00 2001 From: "HOME-LAPTOP\\kshkulev" Date: Tue, 16 Sep 2025 17:42:09 +0900 Subject: [PATCH] Rename --- Hcs.Client/Client/Api/BillsApi.cs | 4 ++-- Hcs.Client/Client/Api/DeviceMeteringApi.cs | 2 +- ...ayload.cs => ImportPaymentDocumentDataPayload.cs} | 2 +- ...equest.cs => ImportPaymentDocumentDataRequest.cs} | 10 +++++----- ...tory.cs => ExportMeteringDeviceHistoryRequest.cs} | 2 +- Hcs.Client/Hcs.Client.csproj | 6 +++--- Hcs.TestApp/TestApp/Program.cs | 2 +- Hcs.TestApp/TestApp/Scenario/BillsScenario.cs | 12 ++++++------ 8 files changed, 20 insertions(+), 20 deletions(-) rename Hcs.Client/Client/Api/Payload/Bills/{ImportPaymentDocumentPayload.cs => ImportPaymentDocumentDataPayload.cs} (99%) rename Hcs.Client/Client/Api/Request/Bills/{ImportPaymentDocumentRequest.cs => ImportPaymentDocumentDataRequest.cs} (97%) rename Hcs.Client/Client/Api/Request/DeviceMetering/{ExportMeteringDeviceHistory.cs => ExportMeteringDeviceHistoryRequest.cs} (98%) diff --git a/Hcs.Client/Client/Api/BillsApi.cs b/Hcs.Client/Client/Api/BillsApi.cs index 505279c..3adaf0b 100644 --- a/Hcs.Client/Client/Api/BillsApi.cs +++ b/Hcs.Client/Client/Api/BillsApi.cs @@ -14,9 +14,9 @@ namespace Hcs.Client.Api /// Пейлоад сведений о платежных документах /// Токен отмены /// true, если операция выполнена успешно, иначе - false - public async Task ImportPaymentDocumentAsync(ImportPaymentDocumentPayload payload, CancellationToken token = default) + public async Task ImportPaymentDocumentDataAsync(ImportPaymentDocumentDataPayload payload, CancellationToken token = default) { - var request = new ImportPaymentDocumentRequest(client); + var request = new ImportPaymentDocumentDataRequest(client); return await request.ExecuteAsync(payload, token); } } diff --git a/Hcs.Client/Client/Api/DeviceMeteringApi.cs b/Hcs.Client/Client/Api/DeviceMeteringApi.cs index ffc3fed..63fa536 100644 --- a/Hcs.Client/Client/Api/DeviceMeteringApi.cs +++ b/Hcs.Client/Client/Api/DeviceMeteringApi.cs @@ -18,7 +18,7 @@ namespace Hcs.Client.Api /// Лицевые счета public async Task> ExportMeteringDeviceHistoryAsync(ExportMeteringDeviceHistoryPayload payload, CancellationToken token = default) { - var request = new ExportMeteringDeviceHistory(client); + var request = new ExportMeteringDeviceHistoryRequest(client); return await request.ExecuteAsync(payload, token); } diff --git a/Hcs.Client/Client/Api/Payload/Bills/ImportPaymentDocumentPayload.cs b/Hcs.Client/Client/Api/Payload/Bills/ImportPaymentDocumentDataPayload.cs similarity index 99% rename from Hcs.Client/Client/Api/Payload/Bills/ImportPaymentDocumentPayload.cs rename to Hcs.Client/Client/Api/Payload/Bills/ImportPaymentDocumentDataPayload.cs index be6f166..4c2bc02 100644 --- a/Hcs.Client/Client/Api/Payload/Bills/ImportPaymentDocumentPayload.cs +++ b/Hcs.Client/Client/Api/Payload/Bills/ImportPaymentDocumentDataPayload.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace Hcs.Client.Api.Payload.Bills { // http://open-gkh.ru/Bills/importPaymentDocumentRequest.html - public class ImportPaymentDocumentPayload + public class ImportPaymentDocumentDataPayload { // http://open-gkh.ru/Bills/importPaymentDocumentRequest/PaymentInformation.html public class PaymentInformation diff --git a/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentRequest.cs b/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs similarity index 97% rename from Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentRequest.cs rename to Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs index 17de2d2..ae49c46 100644 --- a/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentRequest.cs +++ b/Hcs.Client/Client/Api/Request/Bills/ImportPaymentDocumentDataRequest.cs @@ -11,11 +11,11 @@ using System.Threading.Tasks; namespace Hcs.Client.Api.Request.Bills { - internal class ImportPaymentDocumentRequest(ClientBase client) : BillsRequestBase(client) + internal class ImportPaymentDocumentDataRequest(ClientBase client) : BillsRequestBase(client) { protected override bool CanBeRestarted => false; - internal async Task ExecuteAsync(ImportPaymentDocumentPayload payload, CancellationToken token) + internal async Task ExecuteAsync(ImportPaymentDocumentDataPayload payload, CancellationToken token) { // TODO: Добавить проверку пейлоада @@ -42,7 +42,7 @@ namespace Hcs.Client.Api.Request.Bills return true; } - private importPaymentDocumentRequest GetRequestFromPayload(ImportPaymentDocumentPayload payload) + private importPaymentDocumentRequest GetRequestFromPayload(ImportPaymentDocumentDataPayload payload) { var items = new List(); if (payload.confirmAmountsCorrect) @@ -52,7 +52,7 @@ namespace Hcs.Client.Api.Request.Bills items.Add(payload.month); items.Add(payload.year); - var paymentInformations = new Dictionary(); + var paymentInformations = new Dictionary(); foreach (var entry in payload.paymentInformation) { var paymentInformation = new importPaymentDocumentRequestPaymentInformation() @@ -71,7 +71,7 @@ namespace Hcs.Client.Api.Request.Bills var chargeInfo = new List(); foreach (var subEntry in entry.chargeInfo) { - if (subEntry is ImportPaymentDocumentPayload.MunicipalService municipalService) + if (subEntry is ImportPaymentDocumentDataPayload.MunicipalService municipalService) { var item = new PDServiceChargeTypeMunicipalService() { diff --git a/Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistory.cs b/Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistoryRequest.cs similarity index 98% rename from Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistory.cs rename to Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistoryRequest.cs index c7f67d0..d1afc81 100644 --- a/Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistory.cs +++ b/Hcs.Client/Client/Api/Request/DeviceMetering/ExportMeteringDeviceHistoryRequest.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace Hcs.Client.Api.Request.DeviceMetering { - internal class ExportMeteringDeviceHistory(ClientBase client) : DeviceMeteringRequestBase(client) + internal class ExportMeteringDeviceHistoryRequest(ClientBase client) : DeviceMeteringRequestBase(client) { protected override bool EnableMinimalResponseWaitDelay => false; diff --git a/Hcs.Client/Hcs.Client.csproj b/Hcs.Client/Hcs.Client.csproj index ed3510a..76234c2 100644 --- a/Hcs.Client/Hcs.Client.csproj +++ b/Hcs.Client/Hcs.Client.csproj @@ -71,7 +71,7 @@ - + @@ -98,9 +98,9 @@ - + - + diff --git a/Hcs.TestApp/TestApp/Program.cs b/Hcs.TestApp/TestApp/Program.cs index 46571ca..726d845 100644 --- a/Hcs.TestApp/TestApp/Program.cs +++ b/Hcs.TestApp/TestApp/Program.cs @@ -45,7 +45,7 @@ namespace Hcs.TestApp var paymentsScenario = new PaymentsScenario(client); try { - //billsScenario.ImportPaymentDocument(); + //billsScenario.ImportPaymentDocumentData(); //deviceMeteringScenario.ExportMeteringDeviceHistory(); //deviceMeteringScenario.ImportMeteringDeviceValues(); diff --git a/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs b/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs index dbece2c..1ca4994 100644 --- a/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs +++ b/Hcs.TestApp/TestApp/Scenario/BillsScenario.cs @@ -11,27 +11,27 @@ namespace Hcs.TestApp.Scenario { private readonly UniClient client = client; - internal void ImportPaymentDocument() + internal void ImportPaymentDocumentData() { - var paymentInformation = new ImportPaymentDocumentPayload.PaymentInformation() + var paymentInformation = new ImportPaymentDocumentDataPayload.PaymentInformation() { bankBIK = "049805609", operatingAccountNumber = "40602810276000100228" }; - var payload = new ImportPaymentDocumentPayload() + var payload = new ImportPaymentDocumentDataPayload() { confirmAmountsCorrect = true, month = 8, year = 2025, paymentInformation = [paymentInformation], - paymentDocument = [new ImportPaymentDocumentPayload.PaymentDocument() + paymentDocument = [new ImportPaymentDocumentDataPayload.PaymentDocument() { paymentInformation = paymentInformation, accountGuid = "019917a8-6eb6-74cc-99b7-58350127ac50", paymentDocumentNumber = "23900701600162023", chargeInfo = [ - new ImportPaymentDocumentPayload.MunicipalService() + new ImportPaymentDocumentDataPayload.MunicipalService() { moneyRecalculation = 0M, moneyDiscount = 0M, @@ -63,7 +63,7 @@ namespace Hcs.TestApp.Scenario }] }; - var result = client.Bills.ImportPaymentDocumentAsync(payload).Result; + var result = client.Bills.ImportPaymentDocumentDataAsync(payload).Result; Console.WriteLine("Scenario execution " + (result ? "succeeded" : "failed")); } }