Add object address export from resource supply contract

Hcs.Client/Client/Api/HouseManagementApi.cs

@@ -44,5 +44,17 @@ namespace Hcs.Client.Api
             var request = new ExportSupplyResourceContractDataRequest(client);
             return await request.ExecuteAsync(contractNumber, token);
         }
+
+        /// <summary>
+        /// Возвращает объекты жилищного фонда из договора ресурсоснабжения по его идентификатору
+        /// </summary>
+        /// <param name="contractRootGuid">Идентификатор договора ресурсоснабжения в ГИС ЖКХ</param>
+        /// <param name="token">Токен отмены</param>
+        /// <returns>Объекты жилищного фонда</returns>
+        public async Task<IEnumerable<exportSupplyResourceContractObjectAddressResultType>> ExportSupplyResourceContractObjectAddressDataAsync(Guid contractRootGuid, CancellationToken token = default)
+        {
+            var request = new ExportSupplyResourceContractObjectAddressDataRequest(client);
+            return await request.ExecuteAsync(contractRootGuid, token);
+        }
     }
 }

Hcs.Client/Client/Api/Request/HouseManagement/ExportSupplyResourceContractDataRequest.cs

@@ -1,4 +1,5 @@
-using Hcs.Client.Internal;
+using Hcs.Client.Api.Request.Exception;
+using Hcs.Client.Internal;
 using Hcs.Service.Async.HouseManagement;
 using System;
 using System.Collections.Generic;
@@ -107,6 +108,8 @@ namespace Hcs.Client.Api.Request.HouseManagement
                 Items = [.. items]
             };
 
+            try
+            {
                 var result = await SendAndWaitResultAsync(request, async asyncClient =>
                 {
                     var ackResponse = await asyncClient.exportSupplyResourceContractDataAsync(
@@ -119,5 +122,14 @@ namespace Hcs.Client.Api.Request.HouseManagement
 
                 return new PaginationData(contractResult.Item);
             }
+            catch (NoResultsRemoteException)
+            {
+                return PaginationData.CreateLastPageData();
+            }
+            catch (System.Exception e)
+            {
+                throw e;
+            }
+        }
     }
 }

Hcs.Client/Client/Api/Request/HouseManagement/ExportSupplyResourceContractObjectAddressDataRequest.cs

@@ -0,0 +1,96 @@
+using Hcs.Client.Api.Request.Exception;
+using Hcs.Client.Internal;
+using Hcs.Service.Async.HouseManagement;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Hcs.Client.Api.Request.HouseManagement
+{
+    internal class ExportSupplyResourceContractObjectAddressDataRequest(ClientBase client) : HouseManagementRequestBase(client)
+    {
+        internal async Task<IEnumerable<exportSupplyResourceContractObjectAddressResultType>> ExecuteAsync(Guid contractRootGuid, CancellationToken token)
+        {
+            var result = new List<exportSupplyResourceContractObjectAddressResultType>();
+
+            void OnResultReceived(exportSupplyResourceContractObjectAddressResultType[] addresses)
+            {
+                if (addresses?.Length > 0)
+                {
+                    result.AddRange(addresses);
+                }
+            }
+
+            var pageNum = 0;
+            Guid? exportObjectGuid = null;
+            while (true)
+            {
+                pageNum++;
+
+                client.TryLog($"Querying page #{pageNum}...");
+
+                var data = await QueryBatchAsync(contractRootGuid, exportObjectGuid, OnResultReceived, token);
+                if (data.IsLastPage)
+                {
+                    break;
+                }
+
+                exportObjectGuid = data.NextGuid;
+            }
+
+            return result;
+        }
+
+        private async Task<PaginationData> QueryBatchAsync(
+            Guid contractRootGuid, Guid? exportObjectGuid,
+            Action<exportSupplyResourceContractObjectAddressResultType[]> onResultReceived,
+            CancellationToken token)
+        {
+            var itemsElementName = new List<ItemsChoiceType34>();
+            var items = new List<string>();
+
+            itemsElementName.Add(ItemsChoiceType34.ContractRootGUID);
+            items.Add(contractRootGuid.ToString());
+
+            if (exportObjectGuid.HasValue)
+            {
+                itemsElementName.Add(ItemsChoiceType34.ExportObjectGUID);
+                items.Add(exportObjectGuid.ToString());
+            }
+
+            // http://open-gkh.ru/HouseManagement/exportSupplyResourceContractObjectAddressRequest.html
+            var request = new exportSupplyResourceContractObjectAddressRequest
+            {
+                Id = Constants.SIGNED_XML_ELEMENT_ID,
+                version = "13.1.1.1",
+                ItemsElementName = [.. itemsElementName],
+                Items = [.. items]
+            };
+
+            try
+            {
+                var result = await SendAndWaitResultAsync(request, async asyncClient =>
+                {
+                    var ackResponse = await asyncClient.exportSupplyResourceContractObjectAddressDataAsync(
+                        CreateRequestHeader(), request);
+                    return ackResponse.AckRequest.Ack;
+                }, token);
+
+                var contractResult = result.Items.OfType<getStateResultExportSupplyResourceContractObjectAddress>().First();
+                onResultReceived?.Invoke(contractResult.ObjectAddress);
+
+                return new PaginationData(contractResult.Item);
+            }
+            catch (NoResultsRemoteException)
+            {
+                return PaginationData.CreateLastPageData();
+            }
+            catch (System.Exception e)
+            {
+                throw e;
+            }
+        }
+    }
+}

Hcs.Client/Hcs.Client.csproj

@@ -81,6 +81,7 @@
     <Compile Include="Client\Api\Request\Adapter\IGetStateRequest.cs" />
     <Compile Include="Client\Api\Request\Adapter\IGetStateResponse.cs" />
     <Compile Include="Client\Api\Request\HouseManagement\ExportSupplyResourceContractDataRequest.cs" />
+    <Compile Include="Client\Api\Request\HouseManagement\ExportSupplyResourceContractObjectAddressDataRequest.cs" />
     <Compile Include="Client\Api\Request\HouseManagement\HouseManagementRequestBase.cs" />
     <Compile Include="Client\Api\Request\NsiCommon\ExportNsiItemRequest.cs" />
     <Compile Include="Client\Api\Request\NsiCommon\NsiCommonRequestBase.cs" />

Hcs.TestApp/TestApp/Program.cs

@@ -45,6 +45,8 @@ namespace Hcs.TestApp
                 //houseManagementScenario.ExportSupplyResourceContractDataByGuid();
                 //houseManagementScenario.ExportSupplyResourceContractDataByNumber();
 
+                //houseManagementScenario.ExportSupplyResourceContractObjectAddressData();
+
                 //nsiScenario.ExportDataProviderNsiItem1();
                 //nsiScenario.ExportDataProviderNsiItem51();
                 //nsiScenario.ExportDataProviderNsiItem59();

Hcs.TestApp/TestApp/Scenario/HouseManagementScenario.cs

@@ -24,5 +24,11 @@ namespace Hcs.TestApp.Scenario
             var result = client.HouseManagement.ExportSupplyResourceContractDataAsync("239009043").Result;
             Console.WriteLine("Scenario execution " + (result != null ? "succeeded" : "failed"));
         }
+
+        internal void ExportSupplyResourceContractObjectAddressData()
+        {
+            var result = client.HouseManagement.ExportSupplyResourceContractObjectAddressDataAsync(Guid.Parse("575a7ff9-5473-4ab4-b077-fa80c1f85f0b")).Result;
+            Console.WriteLine("Scenario execution " + (result != null ? "succeeded" : "failed"));
+        }
     }
 }