Skip to content

remove estate management #444

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
StuartFerguson merged 3 commits into from
Feb 14, 2025
Merged

remove estate management #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24ce519
remove estate management
StuartFerguson Feb 14, 2025
7ee2474
Update TransactionProcessor packages to version 2025.1.5-build145
StuartFerguson Feb 14, 2025
1c620e6
Add MySql support in ConfigurationReader
StuartFerguson Feb 14, 2025
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
10 changes: 5 additions & 5 deletions FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
using System.Threading.Tasks;
using FileProcessor.Models;
using SimpleResults;
using TransactionProcessor.Database.Contexts;
using TransactionProcessor.Database.Entities;

namespace FileProcessor.BusinessLogic.Tests
{
using System.Threading;
using Common;
using EstateManagement.Database.Contexts;
using EstateManagement.Database.Entities;
using FileAggregate;
using FileProcessor.Models;
using Managers;
Expand Down Expand Up @@ -319,19 +319,19 @@ private void VerifyFile(FileAggregate source, Result<FileDetails> fileDetails)
}
}

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

private void VerifyImportLog(EstateManagement.Database.Entities.FileImportLog source, Result<FileProcessor.Models.FileImportLog> importLog, Guid? merchantId = null)
private void VerifyImportLog(TransactionProcessor.Database.Entities.FileImportLog source, Result<FileProcessor.Models.FileImportLog> importLog, Guid? merchantId = null)
{
importLog.Data.ShouldNotBeNull();
importLog.Data.FileImportLogDateTime.ShouldBe(source.ImportLogDateTime);
Expand Down
99 changes: 47 additions & 52 deletions FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions FileProcessor.BusinessLogic.Tests/ModelFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
namespace FileProcessor.BusinessLogic.Tests{
using FileProcessor.Models;
using TransactionProcessor.Database.Entities;

namespace FileProcessor.BusinessLogic.Tests{
using System.Collections.Generic;
using System.Linq;
using Common;
using EstateManagement.Database.Entities;
using FileProcessor.Models;
using Shouldly;
using Testing;
using Xunit;
using FileImportLog = EstateManagement.Database.Entities.FileImportLog;

public class ModelFactoryTests{
#region Methods

[Fact]
public void ModelFactory_ConvertFrom_FileImportLog_IsConverted(){
IModelFactory modelFactory = new ModelFactory();
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
files.Add((TestData.FileImportLog1Files[0], TestData.Files1[0], TestData.Merchant));
FileProcessor.Models.FileImportLog result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs.First(), files);
this.VerifyImportLog(TestData.FileImportLogs.First(), files, result);
Expand All @@ -24,7 +24,7 @@ public void ModelFactory_ConvertFrom_FileImportLog_IsConverted(){
[Fact]
public void ModelFactory_ConvertFrom_FileImportLog_NoFiles_IsConverted(){
IModelFactory modelFactory = new ModelFactory();
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
FileProcessor.Models.FileImportLog result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs.First(), files);

this.VerifyImportLog(TestData.FileImportLogs.First(), files, result);
Expand All @@ -33,8 +33,8 @@ public void ModelFactory_ConvertFrom_FileImportLog_NoFiles_IsConverted(){
[Fact]
public void ModelFactory_ConvertFrom_FileImportLog_NoImportLogs_IsConverted(){
IModelFactory modelFactory = new ModelFactory();
List<FileImportLog> fileImportLogs = new List<FileImportLog>();
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
List<TransactionProcessor.Database.Entities.FileImportLog> fileImportLogs = new List<TransactionProcessor.Database.Entities.FileImportLog>();
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();

List<FileProcessor.Models.FileImportLog> result = modelFactory.ConvertFrom(TestData.EstateId, fileImportLogs, files);

Expand All @@ -45,7 +45,7 @@ public void ModelFactory_ConvertFrom_FileImportLog_NoImportLogs_IsConverted(){
[Fact]
public void ModelFactory_ConvertFrom_FileImportLogs_IsConverted(){
IModelFactory modelFactory = new ModelFactory();
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
files.Add((TestData.FileImportLog1Files[0], TestData.Files1[0], TestData.Merchant));
files.Add((TestData.FileImportLog1Files[1], TestData.Files1[1], TestData.Merchant));
List<FileProcessor.Models.FileImportLog> result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs, files);
Expand All @@ -56,18 +56,18 @@ public void ModelFactory_ConvertFrom_FileImportLogs_IsConverted(){
[Fact]
public void ModelFactory_ConvertFrom_FileImportLogs_NoFiles_IsConverted(){
IModelFactory modelFactory = new ModelFactory();
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
List<FileProcessor.Models.FileImportLog> result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs, files);

this.VerifyImportLogs(TestData.FileImportLogs, files, result);
}

private void VerifyImportLog(FileImportLog sourceImportLog, List<(FileImportLogFile, File, Merchant)> sourceFiles, FileProcessor.Models.FileImportLog importLog){
private void VerifyImportLog(TransactionProcessor.Database.Entities.FileImportLog sourceImportLog, List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceFiles, FileProcessor.Models.FileImportLog importLog){
importLog.ShouldNotBeNull();
importLog.FileImportLogDateTime.ShouldBe(sourceImportLog.ImportLogDateTime);
importLog.Files.Count.ShouldBe(sourceFiles.Count);

foreach ((FileImportLogFile, File, Merchant) sourceFile in sourceFiles){
foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant) sourceFile in sourceFiles){
ImportLogFile file = importLog.Files.SingleOrDefault(impfile => impfile.FileId == sourceFile.Item2.FileId);
file.ShouldNotBeNull();
file.MerchantId.ShouldBe(sourceFile.Item3.MerchantId);
Expand All @@ -78,13 +78,13 @@ private void VerifyImportLog(FileImportLog sourceImportLog, List<(FileImportLogF
}
}

private void VerifyImportLogs(List<FileImportLog> sourceImportLogs, List<(FileImportLogFile, File, Merchant)> sourceImportLogFiles, List<FileProcessor.Models.FileImportLog> importLogs){
private void VerifyImportLogs(List<TransactionProcessor.Database.Entities.FileImportLog> sourceImportLogs, List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceImportLogFiles, List<FileProcessor.Models.FileImportLog> importLogs){
importLogs.ShouldNotBeNull();
importLogs.ShouldNotBeEmpty();
importLogs.Count.ShouldBe(TestData.FileImportLogs.Count);
foreach (FileImportLog fileImportLog in sourceImportLogs){
foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in sourceImportLogs){
FileProcessor.Models.FileImportLog importLog = importLogs.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId);
List<(FileImportLogFile, File, Merchant)> sourceFiles = sourceImportLogFiles.Where(s => s.Item1.FileImportLogId == fileImportLog.FileImportLogId).ToList();
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceFiles = sourceImportLogFiles.Where(s => s.Item1.FileImportLogId == fileImportLog.FileImportLogId).ToList();
this.VerifyImportLog(fileImportLog, sourceFiles, importLog);
}
}
Expand Down
2 changes: 1 addition & 1 deletion FileProcessor.BusinessLogic/Common/ConfigurationReaderConnectionStringRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MySqlConnector;

namespace FileProcessor.BusinessLogic.Common
{
using System.Data.Common;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using Microsoft.Data.SqlClient;
using MySqlConnector;
using Shared.General;
using Shared.Repositories;

Expand Down
15 changes: 9 additions & 6 deletions FileProcessor.BusinessLogic/Common/IModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
namespace FileProcessor.BusinessLogic.Common
using TransactionProcessor.Database.Entities;

namespace FileProcessor.BusinessLogic.Common
{
using System;
using System.Collections.Generic;
using EstateManagement.Database.Entities;
using FileImportLogModel = FileProcessor.Models.FileImportLog;

/// <summary>
Expand All @@ -13,12 +14,14 @@ public interface IModelFactory
#region Methods

List<FileImportLogModel> ConvertFrom(Guid estateId,
List<EstateManagement.Database.Entities.FileImportLog> importLogs,
List<(FileImportLogFile, File, Merchant)> importLogFilesList);
List<TransactionProcessor.Database.Entities.FileImportLog> importLogs,
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File,
TransactionProcessor.Database.Entities.Merchant)> importLogFilesList);

FileImportLogModel ConvertFrom(Guid estateId,
EstateManagement.Database.Entities.FileImportLog importLog,
List<(FileImportLogFile, File, Merchant)> importLogFilesList);
TransactionProcessor.Database.Entities.FileImportLog importLog,
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File,
TransactionProcessor.Database.Entities.Merchant)> importLogFilesList);

#endregion
}
Expand Down
23 changes: 12 additions & 11 deletions FileProcessor.BusinessLogic/Common/ModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
namespace FileProcessor.BusinessLogic.Common
using TransactionProcessor.Database.Entities;

namespace FileProcessor.BusinessLogic.Common
{
using System;
using System.Collections.Generic;
using System.Linq;
using EstateManagement.Database.Entities;
using FileProcessor.Models;
using FileImportLog = FileProcessor.Models.FileImportLog;

Expand All @@ -22,12 +23,12 @@ public class ModelFactory : IModelFactory
/// <param name="importLogFilesList">The import log files list.</param>
/// <returns></returns>
public List<FileImportLog> ConvertFrom(Guid estateId,
List<EstateManagement.Database.Entities.FileImportLog> importLogs,
List<(FileImportLogFile, File, Merchant)> importLogFilesList)
List<TransactionProcessor.Database.Entities.FileImportLog> importLogs,
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList)
{
List<FileImportLog> models = new List<FileImportLog>();

foreach (EstateManagement.Database.Entities.FileImportLog fileImportLog in importLogs)
foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in importLogs)
{
FileImportLog model = new FileImportLog();

Expand All @@ -36,9 +37,9 @@ public List<FileImportLog> ConvertFrom(Guid estateId,
model.EstateId = estateId;
model.Files = new List<ImportLogFile>();

IEnumerable<(FileImportLogFile, File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == fileImportLog.FileImportLogId);
IEnumerable<(FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == fileImportLog.FileImportLogId);

foreach ((FileImportLogFile, File, Merchant) importLogFile in currentImportLogFiles)
foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant) importLogFile in currentImportLogFiles)
{
model.Files.Add(new ImportLogFile
{
Expand All @@ -65,8 +66,8 @@ public List<FileImportLog> ConvertFrom(Guid estateId,
/// <param name="importLogFilesList">The import log files list.</param>
/// <returns></returns>
public FileImportLog ConvertFrom(Guid estateId,
EstateManagement.Database.Entities.FileImportLog importLog,
List<(FileImportLogFile, File, Merchant)> importLogFilesList)
TransactionProcessor.Database.Entities.FileImportLog importLog,
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList)
{
FileImportLog model = new FileImportLog();

Expand All @@ -75,9 +76,9 @@ public FileImportLog ConvertFrom(Guid estateId,
model.EstateId = estateId;
model.Files = new List<ImportLogFile>();

IEnumerable<(FileImportLogFile, File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == importLog.FileImportLogId);
IEnumerable<(FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant)> currentImportLogFiles = importLogFilesList.Where(fi => fi.Item1.FileImportLogId == importLog.FileImportLogId);

foreach ((FileImportLogFile, File,Merchant) importLogFile in currentImportLogFiles)
foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant) importLogFile in currentImportLogFiles)
{
model.Files.Add(new ImportLogFile
{
Expand Down
1 change: 0 additions & 1 deletion FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
namespace FileProcessor.BusinessLogic.EventHandling
{
using System.Threading;
using EstateManagement.Client;
using File.DomainEvents;
using FileAggregate;
using FileImportLog.DomainEvents;
Expand Down
5 changes: 2 additions & 3 deletions FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EstateManagement.Database" Version="2025.1.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
<PackageReference Include="EstateManagement.Client" Version="2025.1.5" />
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
<PackageReference Include="Shared" Version="2025.1.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.1.4" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.1.5-build145" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.1.5-build145" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading