Skip to content

Commit f2ea54e

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #427 from TransactionProcessing/task/#425_upgrade_security_client
client updates (mainly security)
2 parents 195091c + 99ab0e7 commit f2ea54e

File tree

15 files changed

+63
-60
lines changed

15 files changed

+63
-60
lines changed

‎FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_RequestIsHandled
195195
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/processed");
196196
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/failed");
197197

198-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
198+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
199199

200200
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.OperatorList);
201201

@@ -216,7 +216,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FileNotFound_Req
216216
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/processed");
217217
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/failed");
218218

219-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
219+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
220220

221221
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.OperatorList);
222222

@@ -238,7 +238,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_NoFileProfiles_R
238238

239239
this.FileSystem.AddFile(TestData.FilePathWithName, new MockFileData("D,1,1,1"));
240240

241-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
241+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
242242

243243
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.OperatorList);
244244

@@ -260,7 +260,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_OperatorNotFound
260260
.ReturnsAsync(Result.Success);
261261
this.FileSystem.AddFile(TestData.FilePathWithName, new MockFileData("D,1,1,1"));
262262

263-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
263+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
264264

265265
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.NotFound());
266266

@@ -281,7 +281,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_NullOperatorList
281281

282282
this.FileSystem.AddFile(TestData.FilePathWithName, new MockFileData("D,1,1,1"));
283283

284-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
284+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
285285

286286
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.NotFound());
287287

@@ -304,7 +304,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_ProcessedDirecto
304304
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/inprogress");
305305
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/failed");
306306

307-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
307+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
308308

309309
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.OperatorList);
310310
Result result = await this.FileProcessorDomainService.ProcessUploadedFile(TestData.ProcessUploadedFileCommand, CancellationToken.None);
@@ -327,7 +327,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FailedDirectoryN
327327
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/inprogress");
328328
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/processed");
329329

330-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
330+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
331331

332332
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.OperatorList);
333333

@@ -352,7 +352,7 @@ public async Task FileRequestHandler_ProcessUploadedFileRequest_FileIsEmpty_Requ
352352
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/processed");
353353
this.FileSystem.AddDirectory("home/txnproc/bulkfiles/safaricom/failed");
354354

355-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
355+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
356356

357357
this.EstateClient.Setup(e => e.GetOperators(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.OperatorList);
358358

@@ -384,7 +384,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Reques
384384
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
385385
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse()));
386386

387-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
387+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
388388

389389
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
390390
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadata);
@@ -412,7 +412,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_WithOp
412412
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
413413
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse()));
414414

415-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
415+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
416416

417417
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
418418
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadataWithOperatorName);
@@ -513,7 +513,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_FileLi
513513
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
514514
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse()));
515515

516-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
516+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
517517

518518
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(true);
519519

@@ -538,7 +538,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_EmptyF
538538
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
539539
.ReturnsAsync(Result.Success( TestData.GetMerchantContractsResponse()));
540540

541-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
541+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
542542
var result = await this.FileProcessorDomainService.ProcessTransactionForFileLine(TestData.ProcessTransactionForFileLineCommand, CancellationToken.None);
543543
this.FileFormatHandler.Verify(f => f.ParseFileLine(It.IsAny<String>()), Times.Never);
544544
}
@@ -560,7 +560,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_FilePa
560560
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
561561
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse()));
562562

563-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
563+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
564564

565565
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
566566
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Throws<InvalidDataException>();
@@ -586,7 +586,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Mercha
586586
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
587587
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse()));
588588

589-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
589+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
590590

591591
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
592592
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadata);
@@ -612,7 +612,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_NoMerc
612612
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
613613
.ReturnsAsync(Result.NotFound());
614614

615-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
615+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
616616

617617
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
618618
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadata);
@@ -638,7 +638,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_NoMerc
638638
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
639639
.ReturnsAsync(Result.NotFound());
640640

641-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
641+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
642642

643643
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
644644
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadata);
@@ -664,7 +664,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Mercha
664664
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
665665
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponseNoNullValueProduct()));
666666

667-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
667+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
668668

669669
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
670670
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadata);
@@ -690,7 +690,7 @@ public async Task FileRequestHandler_ProcessTransactionForFileLineRequest_Transa
690690
this.EstateClient.Setup(e => e.GetMerchantContracts(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
691691
.ReturnsAsync(Result.Success(TestData.GetMerchantContractsResponse()));
692692

693-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse());
693+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
694694

695695
this.FileFormatHandler.Setup(f => f.FileLineCanBeIgnored(It.IsAny<String>())).Returns(false);
696696
this.FileFormatHandler.Setup(f => f.ParseFileLine(It.IsAny<String>())).Returns(TestData.TransactionMetadata);

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build125" />
8+
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build128" />
99
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
10-
<PackageReference Include="EstateManagement.Client" Version="2024.8.2-build125" />
11-
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
12-
<PackageReference Include="Shared" Version="2024.11.2" />
13-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.11.2" />
10+
<PackageReference Include="EstateManagement.Client" Version="2024.8.2-build128" />
11+
<PackageReference Include="SecurityService.Client" Version="2024.88.2-build73" />
12+
<PackageReference Include="Shared" Version="2024.11.4" />
13+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.11.4" />
1414
<PackageReference Include="MediatR" Version="12.2.0" />
15-
<PackageReference Include="Shared.EventStore" Version="2024.11.2" />
15+
<PackageReference Include="Shared.EventStore" Version="2024.11.4" />
1616
<PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
17-
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build118" />
17+
<PackageReference Include="TransactionProcessor.Client" Version="2024.8.2-build119" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
2020
</ItemGroup>

‎FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using FileProcessor.Models;
2+
using Shared.Results;
23
using SimpleResults;
34

45
namespace FileProcessor.BusinessLogic.Managers

0 commit comments

Comments
 (0)