From be8f42f970b334b83d43c0edd2499196e44084bd Mon Sep 17 00:00:00 2001 From: "HOME-LAPTOP\\kshkulev" Date: Thu, 28 Aug 2025 12:35:42 +0900 Subject: [PATCH] Remove nullable from some types --- ...ImportSupplyResourceContractDataPayload.cs | 8 ++++---- ...ImportSupplyResourceContractDataRequest.cs | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Hcs.Client/Client/Api/Payload/HouseManagement/ImportSupplyResourceContractDataPayload.cs b/Hcs.Client/Client/Api/Payload/HouseManagement/ImportSupplyResourceContractDataPayload.cs index 986a842..b74ef87 100644 --- a/Hcs.Client/Client/Api/Payload/HouseManagement/ImportSupplyResourceContractDataPayload.cs +++ b/Hcs.Client/Client/Api/Payload/HouseManagement/ImportSupplyResourceContractDataPayload.cs @@ -31,13 +31,13 @@ namespace Hcs.Client.Api.Payload.HouseManagement /// /// Необязательное. Договор заключен на неопределенный срок или нет /// - public bool? indefiniteTerm; + public bool indefiniteTerm; /// /// Необязательное. Автоматически пролонгировать договор на один год при наступлении /// даты окончания действия или нет. /// - public bool? automaticRollOverOneYear; + public bool automaticRollOverOneYear; /// /// Условное. Дата окончания действия. Обязательно для заполнения, если @@ -61,7 +61,7 @@ namespace Hcs.Client.Api.Payload.HouseManagement /// в сроки, установленные в договоре, или в любой день месяца, если в договоре установлен признак /// "Разрешить передачу показаний приборов учета в любой день месяца" И заполнен . /// - public bool? indicationsAnyDay; + public bool indicationsAnyDay; /// /// Необязательное. Ссылка на НСИ "Основание заключения договора" (реестровый номер 58). Значения @@ -115,7 +115,7 @@ namespace Hcs.Client.Api.Payload.HouseManagement /// ведутся в разрезе договора и предмет договора включает коммунальную услугу "Холодное водоснабжение" /// И/ИЛИ "Горячее водоснабжение"/ /// - public bool? noConnectionToWaterSupply; + public bool noConnectionToWaterSupply; /// /// Условное. Данные об объекте жилищного фонда. При импорте договора должен быть добавлен как минимум diff --git a/Hcs.Client/Client/Api/Request/HouseManagement/ImportSupplyResourceContractDataRequest.cs b/Hcs.Client/Client/Api/Request/HouseManagement/ImportSupplyResourceContractDataRequest.cs index 96ea5a4..21d3c0f 100644 --- a/Hcs.Client/Client/Api/Request/HouseManagement/ImportSupplyResourceContractDataRequest.cs +++ b/Hcs.Client/Client/Api/Request/HouseManagement/ImportSupplyResourceContractDataRequest.cs @@ -72,7 +72,7 @@ namespace Hcs.Client.Api.Request.HouseManagement throw new ArgumentException($"{nameof(payload.signingDate)} OR/AND {nameof(payload.effectiveDate)} are default"); } - if (!payload.comptetionDate.HasValue && payload.automaticRollOverOneYear.HasValue) + if (!payload.comptetionDate.HasValue && payload.automaticRollOverOneYear) { throw new ArgumentException($"{nameof(payload.comptetionDate)} is null but {nameof(payload.automaticRollOverOneYear)} has value"); } @@ -83,7 +83,7 @@ namespace Hcs.Client.Api.Request.HouseManagement throw new ArgumentException($"{nameof(payload.period)} is null but {nameof(payload.volumeDepends)} OR/AND {nameof(payload.meteringDeviceInformation)} have value"); } - if (payload.indicationsAnyDay.HasValue && payload.period == null) + if (payload.indicationsAnyDay && payload.period == null) { throw new ArgumentException($"{nameof(payload.indicationsAnyDay)} has value but {nameof(payload.period)} is null"); } @@ -199,14 +199,14 @@ namespace Hcs.Client.Api.Request.HouseManagement var items = new List(); var itemsElementName = new List(); - if (payload.indefiniteTerm.HasValue) + if (payload.indefiniteTerm) { - items.Add(payload.indefiniteTerm.Value); + items.Add(payload.indefiniteTerm); itemsElementName.Add(ItemsChoiceType9.IndefiniteTerm); } - if (payload.automaticRollOverOneYear.HasValue) + if (payload.automaticRollOverOneYear) { - items.Add(payload.automaticRollOverOneYear.Value); + items.Add(payload.automaticRollOverOneYear); itemsElementName.Add(ItemsChoiceType9.AutomaticRollOverOneYear); items.Add(payload.comptetionDate.Value); @@ -223,9 +223,9 @@ namespace Hcs.Client.Api.Request.HouseManagement contract.Period = payload.period; } - if (payload.indicationsAnyDay.HasValue) + if (payload.indicationsAnyDay) { - contract.IndicationsAnyDay = payload.indicationsAnyDay.Value; + contract.IndicationsAnyDay = true; contract.IndicationsAnyDaySpecified = true; } @@ -253,9 +253,9 @@ namespace Hcs.Client.Api.Request.HouseManagement contract.SpecifyingQualityIndicators = payload.specifyingQualityIndicators; - if (payload.noConnectionToWaterSupply.HasValue) + if (payload.noConnectionToWaterSupply) { - contract.NoConnectionToWaterSupply = payload.noConnectionToWaterSupply.Value; + contract.NoConnectionToWaterSupply = true; contract.NoConnectionToWaterSupplySpecified = true; }