Skip to content

use results for all flows #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2024
Merged

use results for all flows #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FIleProcessor.Models/FileDetails.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion FIleProcessor.Models/FileImportLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
using System;
using System.Collections.Generic;
Expand Down
2 changes: 1 addition & 1 deletion FIleProcessor.Models/FileLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
using System;

Expand Down
2 changes: 1 addition & 1 deletion FIleProcessor.Models/FileProfile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
using System;

Expand Down
2 changes: 1 addition & 1 deletion FIleProcessor.Models/ImportLogFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
using System;

Expand Down
2 changes: 1 addition & 1 deletion FIleProcessor.Models/ProcessingResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
/// <summary>
///
Expand Down
2 changes: 1 addition & 1 deletion FIleProcessor.Models/ProcessingSummary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FIleProcessor.Models
namespace FileProcessor.Models
{
using System;

Expand Down
28 changes: 14 additions & 14 deletions FileProcessor.BusinessLogic.Tests/DummyFileProcessorDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
namespace FileProcessor.BusinessLogic.Tests;
using FileProcessor.DataTransferObjects;
using SimpleResults;

namespace FileProcessor.BusinessLogic.Tests;

using System;
using System.Threading;
using System.Threading.Tasks;
using Requests;
using Services;

public class DummyFileProcessorDomainService : IFileProcessorDomainService
{
public async Task<Guid> UploadFile(UploadFileRequest request,
CancellationToken cancellationToken) {
return Guid.NewGuid();
}
public class DummyFileProcessorDomainService : IFileProcessorDomainService {

public async Task<Result<Guid>> UploadFile(FileCommands.UploadFileCommand command,
CancellationToken cancellationToken) =>
Result.Success(Guid.NewGuid());

public async Task<Result> ProcessUploadedFile(FileCommands.ProcessUploadedFileCommand command,
CancellationToken cancellationToken) => Result.Success();

public async Task ProcessUploadedFile(ProcessUploadedFileRequest request,
CancellationToken cancellationToken) {
}

public async Task ProcessTransactionForFileLine(ProcessTransactionForFileLineRequest request,
CancellationToken cancellationToken) {
}
public async Task<Result> ProcessTransactionForFileLine(FileCommands.ProcessTransactionForFileLineCommand command,
CancellationToken cancellationToken) => Result.Success();
}
108 changes: 56 additions & 52 deletions FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FileProcessor.Models;
using SimpleResults;

namespace FileProcessor.BusinessLogic.Tests
{
Expand All @@ -11,7 +13,7 @@ namespace FileProcessor.BusinessLogic.Tests
using EstateManagement.Database.Contexts;
using EstateManagement.Database.Entities;
using FileAggregate;
using FIleProcessor.Models;
using FileProcessor.Models;
using Managers;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Diagnostics;
Expand All @@ -23,8 +25,8 @@ namespace FileProcessor.BusinessLogic.Tests
using Shouldly;
using Testing;
using Xunit;
using FileImportLog = FIleProcessor.Models.FileImportLog;
using FileLine = FIleProcessor.Models.FileLine;
using FileImportLog = FileProcessor.Models.FileImportLog;
using FileLine = FileProcessor.Models.FileLine;

public class FileProcessingManagerTests
{
Expand All @@ -40,7 +42,8 @@ public async Task FileProcessingManager_GetAllFileProfiles_AllFileProfilesReturn

var allFileProfiles = await manager.GetAllFileProfiles(CancellationToken.None);
allFileProfiles.ShouldNotBeNull();
allFileProfiles.ShouldNotBeEmpty();
allFileProfiles.IsSuccess.ShouldBeTrue();
allFileProfiles.Data.ShouldNotBeEmpty();
}

[Fact]
Expand All @@ -55,7 +58,8 @@ public async Task FileProcessingManager_GetFileProfile_FIleProfileReturned()

var fileProfile = await manager.GetFileProfile(TestData.SafaricomFileProfileId, CancellationToken.None);
fileProfile.ShouldNotBeNull();
fileProfile.FileProfileId.ShouldBe(TestData.SafaricomFileProfileId);
fileProfile.IsSuccess.ShouldBeTrue();
fileProfile.Data.FileProfileId.ShouldBe(TestData.SafaricomFileProfileId);
}

[Fact]
Expand Down Expand Up @@ -161,15 +165,16 @@ public async Task FileProcessingManager_GetFile_FileReturned()

Mock<IAggregateRepository<FileAggregate, DomainEvent>> fileAggregateRepository =
new Mock<IAggregateRepository<FileAggregate, DomainEvent>>();
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFileAggregateWithLines);
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.GetFileAggregateWithLines()));
FileProcessorManager manager = new FileProcessorManager(fileProfiles, contextFactory.Object, modelFactory, fileAggregateRepository.Object);

var fileDetails = await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);
Result<FileDetails> fileDetails = await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);

fileDetails.IsSuccess.ShouldBeTrue();
this.VerifyFile(TestData.GetFileAggregateWithLines(), fileDetails);
fileDetails.MerchantName.ShouldBeNull();
fileDetails.UserEmailAddress.ShouldBeNull();
fileDetails.FileProfileName.ShouldBeNull();
fileDetails.Data.MerchantName.ShouldBeNull();
fileDetails.Data.UserEmailAddress.ShouldBeNull();
fileDetails.Data.FileProfileName.ShouldBeNull();
}

[Fact]
Expand All @@ -191,13 +196,14 @@ public async Task FileProcessingManager_GetFile_FileReturnedWithMerchantName()

Mock<IAggregateRepository<FileAggregate, DomainEvent>> fileAggregateRepository =
new Mock<IAggregateRepository<FileAggregate, DomainEvent>>();
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFileAggregateWithLines);
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.GetFileAggregateWithLines()));
FileProcessorManager manager = new FileProcessorManager(fileProfiles, contextFactory.Object, modelFactory, fileAggregateRepository.Object);

var fileDetails = await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);
fileDetails.IsSuccess.ShouldBeTrue();

this.VerifyFile(TestData.GetFileAggregateWithLines(), fileDetails);
fileDetails.MerchantName.ShouldBe(TestData.MerchantName);
fileDetails.Data.MerchantName.ShouldBe(TestData.MerchantName);
}

[Fact]
Expand All @@ -218,13 +224,13 @@ public async Task FileProcessingManager_GetFile_FileReturnedWithUserEmailAddress

Mock<IAggregateRepository<FileAggregate, DomainEvent>> fileAggregateRepository =
new Mock<IAggregateRepository<FileAggregate, DomainEvent>>();
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFileAggregateWithLines);
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.GetFileAggregateWithLines()));
FileProcessorManager manager = new FileProcessorManager(fileProfiles, contextFactory.Object, modelFactory, fileAggregateRepository.Object);

var fileDetails = await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);

fileDetails.IsSuccess.ShouldBeTrue();
this.VerifyFile(TestData.GetFileAggregateWithLines(), fileDetails);
fileDetails.UserEmailAddress.ShouldBe(TestData.UserEmailAddress);
fileDetails.Data.UserEmailAddress.ShouldBe(TestData.UserEmailAddress);
}

[Fact]
Expand Down Expand Up @@ -254,13 +260,13 @@ public async Task FileProcessingManager_GetFile_FileReturnedWithFileProfileName(

Mock<IAggregateRepository<FileAggregate, DomainEvent>> fileAggregateRepository =
new Mock<IAggregateRepository<FileAggregate, DomainEvent>>();
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetFileAggregateWithLines);
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.GetFileAggregateWithLines()));
FileProcessorManager manager = new FileProcessorManager(fileProfiles, contextFactory.Object, modelFactory, fileAggregateRepository.Object);

var fileDetails = await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);

fileDetails.IsSuccess.ShouldBeTrue();
this.VerifyFile(TestData.GetFileAggregateWithLines(), fileDetails);
fileDetails.FileProfileName.ShouldBe(TestData.SafaricomProfileName);
fileDetails.Data.FileProfileName.ShouldBe(TestData.SafaricomProfileName);
}

[Fact]
Expand All @@ -274,73 +280,71 @@ public async Task FileProcessingManager_GetFile_FileNotFound_ErrorThrown()

Mock<IAggregateRepository<FileAggregate, DomainEvent>> fileAggregateRepository =
new Mock<IAggregateRepository<FileAggregate, DomainEvent>>();
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetEmptyFileAggregate);
fileAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.GetEmptyFileAggregate()));
FileProcessorManager manager = new FileProcessorManager(fileProfiles, contextFactory.Object, modelFactory, fileAggregateRepository.Object);

Should.Throw<NotFoundException>(async () =>
{
await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);
});
var result = await manager.GetFile(TestData.FileId, TestData.EstateId, CancellationToken.None);
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.NotFound);
}


private void VerifyFile(FileAggregate source, FileDetails fileDetails)
private void VerifyFile(FileAggregate source, Result<FileDetails> fileDetails)
{
var fileModel = source.GetFile();

fileDetails.FileId.ShouldBe(fileModel.FileId);
fileDetails.FileImportLogId.ShouldBe(fileModel.FileImportLogId);
fileDetails.FileLocation.ShouldBe(fileModel.FileLocation);
fileDetails.FileProfileId.ShouldBe(fileModel.FileProfileId);
fileDetails.MerchantId.ShouldBe(fileModel.MerchantId);
fileDetails.ProcessingCompleted.ShouldBe(fileModel.ProcessingCompleted);
fileDetails.UserId.ShouldBe(fileModel.UserId);
fileDetails.EstateId.ShouldBe(fileModel.EstateId);

fileDetails.ProcessingSummary.ShouldNotBeNull();
fileDetails.ProcessingSummary.FailedLines.ShouldBe(fileModel.ProcessingSummary.FailedLines);
fileDetails.ProcessingSummary.IgnoredLines.ShouldBe(fileModel.ProcessingSummary.IgnoredLines);
fileDetails.ProcessingSummary.NotProcessedLines.ShouldBe(fileModel.ProcessingSummary.NotProcessedLines);
fileDetails.ProcessingSummary.SuccessfullyProcessedLines.ShouldBe(fileModel.ProcessingSummary.SuccessfullyProcessedLines);
fileDetails.ProcessingSummary.TotalLines.ShouldBe(fileModel.ProcessingSummary.TotalLines);
fileDetails.Data.FileId.ShouldBe(fileModel.FileId);
fileDetails.Data.FileImportLogId.ShouldBe(fileModel.FileImportLogId);
fileDetails.Data.FileLocation.ShouldBe(fileModel.FileLocation);
fileDetails.Data.FileProfileId.ShouldBe(fileModel.FileProfileId);
fileDetails.Data.MerchantId.ShouldBe(fileModel.MerchantId);
fileDetails.Data.ProcessingCompleted.ShouldBe(fileModel.ProcessingCompleted);
fileDetails.Data.UserId.ShouldBe(fileModel.UserId);
fileDetails.Data.EstateId.ShouldBe(fileModel.EstateId);

fileDetails.Data.ProcessingSummary.ShouldNotBeNull();
fileDetails.Data.ProcessingSummary.FailedLines.ShouldBe(fileModel.ProcessingSummary.FailedLines);
fileDetails.Data.ProcessingSummary.IgnoredLines.ShouldBe(fileModel.ProcessingSummary.IgnoredLines);
fileDetails.Data.ProcessingSummary.NotProcessedLines.ShouldBe(fileModel.ProcessingSummary.NotProcessedLines);
fileDetails.Data.ProcessingSummary.SuccessfullyProcessedLines.ShouldBe(fileModel.ProcessingSummary.SuccessfullyProcessedLines);
fileDetails.Data.ProcessingSummary.TotalLines.ShouldBe(fileModel.ProcessingSummary.TotalLines);

foreach (FileLine fileModelFileLine in fileModel.FileLines)
{
FileLine? fileLineToVerify = fileDetails.FileLines.SingleOrDefault(f => f.LineNumber == fileModelFileLine.LineNumber);
FileLine? fileLineToVerify = fileDetails.Data.FileLines.SingleOrDefault(f => f.LineNumber == fileModelFileLine.LineNumber);
fileLineToVerify.ShouldNotBeNull();
fileLineToVerify.LineData.ShouldBe(fileModelFileLine.LineData);
fileLineToVerify.TransactionId.ShouldBe(fileModelFileLine.TransactionId);
fileLineToVerify.ProcessingResult.ShouldBe(fileModelFileLine.ProcessingResult);
}
}

private void VerifyImportLogs(List<EstateManagement.Database.Entities.FileImportLog> source, List<FIleProcessor.Models.FileImportLog> importLogs, Guid? merchantId = null)
private void VerifyImportLogs(List<EstateManagement.Database.Entities.FileImportLog> source, Result<List<FileProcessor.Models.FileImportLog>> importLogs, Guid? merchantId = null)
{
importLogs.ShouldNotBeNull();
importLogs.ShouldNotBeEmpty();
importLogs.Count.ShouldBe(TestData.FileImportLogs.Count);
importLogs.Data.ShouldNotBeNull();
importLogs.Data.ShouldNotBeEmpty();
importLogs.Data.Count.ShouldBe(TestData.FileImportLogs.Count);
foreach (EstateManagement.Database.Entities.FileImportLog fileImportLog in source)
{
var importLog = importLogs.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId);
var importLog = importLogs.Data.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId);
VerifyImportLog(fileImportLog, importLog, merchantId);
}
}

private void VerifyImportLog(EstateManagement.Database.Entities.FileImportLog source, FIleProcessor.Models.FileImportLog importLog, Guid? merchantId = null)
private void VerifyImportLog(EstateManagement.Database.Entities.FileImportLog source, Result<FileProcessor.Models.FileImportLog> importLog, Guid? merchantId = null)
{
importLog.ShouldNotBeNull();
importLog.FileImportLogDateTime.ShouldBe(source.ImportLogDateTime);
importLog.Files.Count.ShouldBe(importLog.Files.Count);

List<ImportLogFile> filesToVerify = importLog.Files;
importLog.Data.ShouldNotBeNull();
importLog.Data.FileImportLogDateTime.ShouldBe(source.ImportLogDateTime);

List<ImportLogFile> filesToVerify = importLog.Data.Files;
if (merchantId.HasValue)
{
filesToVerify = filesToVerify.Where(f => f.MerchantId == merchantId.Value).ToList();
}

foreach (ImportLogFile importLogFile in filesToVerify)
{
var file = importLog.Files.SingleOrDefault(impfile => impfile.FileId == importLogFile.FileId);
var file = importLog.Data.Files.SingleOrDefault(impfile => impfile.FileId == importLogFile.FileId);
file.ShouldNotBeNull();
file.MerchantId.ShouldBe(importLogFile.MerchantId);
file.FilePath.ShouldBe(importLogFile.FilePath);
Expand Down
Loading
Loading