From 0e9d173898df43f99f47bcc4f6f2b7c5bf1d6462 Mon Sep 17 00:00:00 2001 From: Petre Chitashvili Date: Wed, 1 Oct 2025 11:27:08 +0400 Subject: [PATCH 1/2] Fixed https://github.com/AppifySheets/TBC-IntegrationService-StandardPlus-Client/issues/20 --- .../ImportSinglePaymentOrdersRequestIo.cs | 2 +- .../ImportSinglePaymentOrders/TransferTypeInterfaces.cs | 9 ++++++--- .../ImportSinglePaymentOrders/TransferTypeRecords.cs | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/ImportSinglePaymentOrdersRequestIo.cs b/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/ImportSinglePaymentOrdersRequestIo.cs index f048fcb..c2c7cb9 100644 --- a/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/ImportSinglePaymentOrdersRequestIo.cs +++ b/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/ImportSinglePaymentOrdersRequestIo.cs @@ -34,7 +34,7 @@ public override string SoapXml() {TransferType.AdditionalDescription} {TransferType.Is(b => $"{b.Description}")} {TransferType.Is(b => $"{b.BeneficiaryName}")} - {TransferType.Is(b => $"{b.PersonalNumber}")} + {TransferType.Is(b => $"{b.PersonalNumber}")} {TransferType.Is(b => $"{b.BeneficiaryTaxCode}")} {TransferType.Is(b => $""" diff --git a/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeInterfaces.cs b/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeInterfaces.cs index 8f72d80..116394b 100644 --- a/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeInterfaces.cs +++ b/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeInterfaces.cs @@ -10,7 +10,6 @@ public sealed record BankTransferCommonDetails public required long DocumentNumber { get; init; } public required decimal Amount { get; init; } public required string BeneficiaryName { get; init; } - public required string? PersonalNumber { get; init; } public required string Description { get; init; } public string? AdditionalDescription { get; init; } } @@ -23,7 +22,7 @@ public abstract record TransferTypeRecord public long DocumentNumber => BankTransferCommonDetails.DocumentNumber; public decimal Amount => BankTransferCommonDetails.Amount; public string BeneficiaryName => BankTransferCommonDetails.BeneficiaryName; - public string? PersonalNumber => BankTransferCommonDetails.PersonalNumber; + // public string? PersonalNumber => BankTransferCommonDetails.PersonalNumber; public string Description => BankTransferCommonDetails.Description; public string? AdditionalDescription => BankTransferCommonDetails.AdditionalDescription; } @@ -31,9 +30,13 @@ public abstract record TransferTypeRecord public interface IBeneficiaryName { public string BeneficiaryName { get; } - public string? PersonalNumber { get; } + // public string? PersonalNumber { get; } } +public interface IPersonalNumber +{ + string? PersonalNumber { get; } +} public interface IDescription { public string Description { get; } diff --git a/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeRecords.cs b/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeRecords.cs index 379a65b..2c77c3f 100644 --- a/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeRecords.cs +++ b/AppifySheets.TBC.IntegrationService.Client/SoapInfrastructure/ImportSinglePaymentOrders/TransferTypeRecords.cs @@ -3,9 +3,10 @@ namespace AppifySheets.TBC.IntegrationService.Client.SoapInfrastructure.ImportSinglePaymentOrders; -public record TransferWithinBankPaymentOrderIo : TransferTypeRecord, IRecipient, IBeneficiaryName, IDescription +public record TransferWithinBankPaymentOrderIo : TransferTypeRecord, IRecipient, IBeneficiaryName, IDescription, IPersonalNumber { public required BankAccount RecipientAccountWithCurrency { get; init; } + public required string? PersonalNumber { get; init; } } public record TransferToOtherBankForeignCurrencyPaymentOrderIo( From f76876891196c056a086067622d7727a4f9fafeb Mon Sep 17 00:00:00 2001 From: Petre Chitashvili Date: Wed, 1 Oct 2025 11:42:45 +0400 Subject: [PATCH 2/2] fix: Add PersonalNumber field to TransferWithinBank initializers - Remove PersonalNumber from BankTransferCommonDetails (doesn't exist there) - Add PersonalNumber = null to all TransferWithinBankPaymentOrderIo initializers in demo and tests - Fixes compilation errors in CI build *Collaboration by Claude* --- .../Program.cs | 7 ++++--- .../TBCSoapCallerTests.cs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AppifySheets.TBC.IntegrationService.Client.DemoConsole/Program.cs b/AppifySheets.TBC.IntegrationService.Client.DemoConsole/Program.cs index 285bede..753be61 100644 --- a/AppifySheets.TBC.IntegrationService.Client.DemoConsole/Program.cs +++ b/AppifySheets.TBC.IntegrationService.Client.DemoConsole/Program.cs @@ -33,15 +33,15 @@ Amount = 0.01m, BeneficiaryName = "TEST", SenderAccountWithCurrency = ownAccountGEL, - Description = "TEST", - PersonalNumber = null // Adding required PersonalNumber field + Description = "TEST" }; var withinBankGel2 = await tbcSoapCaller.GetDeserialized(new ImportSinglePaymentOrdersRequestIo( new TransferWithinBankPaymentOrderIo { RecipientAccountWithCurrency = BankAccount.Create("GE86TB1144836120100002", "GEL").Value, - BankTransferCommonDetails = bankTransferCommonDetails + BankTransferCommonDetails = bankTransferCommonDetails, + PersonalNumber = null })); var withinBankCurrency = await tbcSoapCaller.GetDeserialized(new ImportSinglePaymentOrdersRequestIo( @@ -52,6 +52,7 @@ SenderAccountWithCurrency = ownAccountUSD }, RecipientAccountWithCurrency = BankAccount.Create("GE86TB1144836120100002", "USD").Value, + PersonalNumber = null })); var toAnotherBankGel = await tbcSoapCaller.GetDeserialized( diff --git a/AppifySheets.TBC.IntegrationService.Tests/TBCSoapCallerTests.cs b/AppifySheets.TBC.IntegrationService.Tests/TBCSoapCallerTests.cs index 1e110a1..1f6e896 100644 --- a/AppifySheets.TBC.IntegrationService.Tests/TBCSoapCallerTests.cs +++ b/AppifySheets.TBC.IntegrationService.Tests/TBCSoapCallerTests.cs @@ -72,15 +72,15 @@ public async Task ImportSinglePaymentOrders_returns_values() Amount = 0.01m, BeneficiaryName = "TEST", SenderAccountWithCurrency = ownAccountGEL, - Description = "TEST", - PersonalNumber = null // Adding required PersonalNumber field + Description = "TEST" }; var withinBankGel2 = await _tbcSoapCaller.GetDeserialized(new ImportSinglePaymentOrdersRequestIo( new TransferWithinBankPaymentOrderIo { RecipientAccountWithCurrency = BankAccount.Create("GE24TB7755145063300001", "GEL").Value, - BankTransferCommonDetails = bankTransferCommonDetails + BankTransferCommonDetails = bankTransferCommonDetails, + PersonalNumber = null })); var withinBankCurrency = await _tbcSoapCaller.GetDeserialized(new ImportSinglePaymentOrdersRequestIo( @@ -91,6 +91,7 @@ public async Task ImportSinglePaymentOrders_returns_values() SenderAccountWithCurrency = ownAccountUSD }, RecipientAccountWithCurrency = BankAccount.Create("GE86TB1144836120100002", "USD").Value, + PersonalNumber = null })); var toAnotherBankGel = await _tbcSoapCaller.GetDeserialized(