Skip to content

Commit c2915b5

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #444 from TransactionProcessing/task/#443_remove_estate_management
remove estate management
2 parents 4ea0aa4 + 1c620e6 commit c2915b5

27 files changed

+175
-266
lines changed

‎FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
using System.Threading.Tasks;
66
using FileProcessor.Models;
77
using SimpleResults;
8+
using TransactionProcessor.Database.Contexts;
9+
using TransactionProcessor.Database.Entities;
810

911
namespace FileProcessor.BusinessLogic.Tests
1012
{
1113
using System.Threading;
1214
using Common;
13-
using EstateManagement.Database.Contexts;
14-
using EstateManagement.Database.Entities;
1515
using FileAggregate;
1616
using FileProcessor.Models;
1717
using Managers;
@@ -319,19 +319,19 @@ private void VerifyFile(FileAggregate source, Result<FileDetails> fileDetails)
319319
}
320320
}
321321

322-
private void VerifyImportLogs(List<EstateManagement.Database.Entities.FileImportLog> source, Result<List<FileProcessor.Models.FileImportLog>> importLogs, Guid? merchantId = null)
322+
private void VerifyImportLogs(List<TransactionProcessor.Database.Entities.FileImportLog> source, Result<List<FileProcessor.Models.FileImportLog>> importLogs, Guid? merchantId = null)
323323
{
324324
importLogs.Data.ShouldNotBeNull();
325325
importLogs.Data.ShouldNotBeEmpty();
326326
importLogs.Data.Count.ShouldBe(TestData.FileImportLogs.Count);
327-
foreach (EstateManagement.Database.Entities.FileImportLog fileImportLog in source)
327+
foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in source)
328328
{
329329
var importLog = importLogs.Data.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId);
330330
VerifyImportLog(fileImportLog, importLog, merchantId);
331331
}
332332
}
333333

334-
private void VerifyImportLog(EstateManagement.Database.Entities.FileImportLog source, Result<FileProcessor.Models.FileImportLog> importLog, Guid? merchantId = null)
334+
private void VerifyImportLog(TransactionProcessor.Database.Entities.FileImportLog source, Result<FileProcessor.Models.FileImportLog> importLog, Guid? merchantId = null)
335335
{
336336
importLog.Data.ShouldNotBeNull();
337337
importLog.Data.FileImportLogDateTime.ShouldBe(source.ImportLogDateTime);

‎FileProcessor.BusinessLogic.Tests/FileProcessorDomainServiceTests.cs‎

Lines changed: 47 additions & 52 deletions
Large diffs are not rendered by default.

‎FileProcessor.BusinessLogic.Tests/ModelFactoryTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
namespace FileProcessor.BusinessLogic.Tests{
1+
using FileProcessor.Models;
2+
using TransactionProcessor.Database.Entities;
3+
4+
namespace FileProcessor.BusinessLogic.Tests{
25
using System.Collections.Generic;
36
using System.Linq;
47
using Common;
5-
using EstateManagement.Database.Entities;
6-
using FileProcessor.Models;
78
using Shouldly;
89
using Testing;
910
using Xunit;
10-
using FileImportLog = EstateManagement.Database.Entities.FileImportLog;
1111

1212
public class ModelFactoryTests{
1313
#region Methods
1414

1515
[Fact]
1616
public void ModelFactory_ConvertFrom_FileImportLog_IsConverted(){
1717
IModelFactory modelFactory = new ModelFactory();
18-
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
18+
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
1919
files.Add((TestData.FileImportLog1Files[0], TestData.Files1[0], TestData.Merchant));
2020
FileProcessor.Models.FileImportLog result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs.First(), files);
2121
this.VerifyImportLog(TestData.FileImportLogs.First(), files, result);
@@ -24,7 +24,7 @@ public void ModelFactory_ConvertFrom_FileImportLog_IsConverted(){
2424
[Fact]
2525
public void ModelFactory_ConvertFrom_FileImportLog_NoFiles_IsConverted(){
2626
IModelFactory modelFactory = new ModelFactory();
27-
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
27+
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
2828
FileProcessor.Models.FileImportLog result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs.First(), files);
2929

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

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

@@ -45,7 +45,7 @@ public void ModelFactory_ConvertFrom_FileImportLog_NoImportLogs_IsConverted(){
4545
[Fact]
4646
public void ModelFactory_ConvertFrom_FileImportLogs_IsConverted(){
4747
IModelFactory modelFactory = new ModelFactory();
48-
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
48+
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
4949
files.Add((TestData.FileImportLog1Files[0], TestData.Files1[0], TestData.Merchant));
5050
files.Add((TestData.FileImportLog1Files[1], TestData.Files1[1], TestData.Merchant));
5151
List<FileProcessor.Models.FileImportLog> result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs, files);
@@ -56,18 +56,18 @@ public void ModelFactory_ConvertFrom_FileImportLogs_IsConverted(){
5656
[Fact]
5757
public void ModelFactory_ConvertFrom_FileImportLogs_NoFiles_IsConverted(){
5858
IModelFactory modelFactory = new ModelFactory();
59-
List<(FileImportLogFile, File, Merchant)> files = new List<(FileImportLogFile, File, Merchant)>();
59+
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> files = new List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)>();
6060
List<FileProcessor.Models.FileImportLog> result = modelFactory.ConvertFrom(TestData.EstateId, TestData.FileImportLogs, files);
6161

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

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

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

81-
private void VerifyImportLogs(List<FileImportLog> sourceImportLogs, List<(FileImportLogFile, File, Merchant)> sourceImportLogFiles, List<FileProcessor.Models.FileImportLog> importLogs){
81+
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){
8282
importLogs.ShouldNotBeNull();
8383
importLogs.ShouldNotBeEmpty();
8484
importLogs.Count.ShouldBe(TestData.FileImportLogs.Count);
85-
foreach (FileImportLog fileImportLog in sourceImportLogs){
85+
foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in sourceImportLogs){
8686
FileProcessor.Models.FileImportLog importLog = importLogs.SingleOrDefault(i => i.FileImportLogId == fileImportLog.FileImportLogId);
87-
List<(FileImportLogFile, File, Merchant)> sourceFiles = sourceImportLogFiles.Where(s => s.Item1.FileImportLogId == fileImportLog.FileImportLogId).ToList();
87+
List<(FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> sourceFiles = sourceImportLogFiles.Where(s => s.Item1.FileImportLogId == fileImportLog.FileImportLogId).ToList();
8888
this.VerifyImportLog(fileImportLog, sourceFiles, importLog);
8989
}
9090
}

‎FileProcessor.BusinessLogic/Common/ConfigurationReaderConnectionStringRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using System.Linq;
44
using System.Text;
55
using System.Threading.Tasks;
6+
using MySqlConnector;
67

78
namespace FileProcessor.BusinessLogic.Common
89
{
910
using System.Data.Common;
1011
using System.Diagnostics.CodeAnalysis;
1112
using System.Threading;
1213
using Microsoft.Data.SqlClient;
13-
using MySqlConnector;
1414
using Shared.General;
1515
using Shared.Repositories;
1616

‎FileProcessor.BusinessLogic/Common/IModelFactory.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
namespace FileProcessor.BusinessLogic.Common
1+
using TransactionProcessor.Database.Entities;
2+
3+
namespace FileProcessor.BusinessLogic.Common
24
{
35
using System;
46
using System.Collections.Generic;
5-
using EstateManagement.Database.Entities;
67
using FileImportLogModel = FileProcessor.Models.FileImportLog;
78

89
/// <summary>
@@ -13,12 +14,14 @@ public interface IModelFactory
1314
#region Methods
1415

1516
List<FileImportLogModel> ConvertFrom(Guid estateId,
16-
List<EstateManagement.Database.Entities.FileImportLog> importLogs,
17-
List<(FileImportLogFile, File, Merchant)> importLogFilesList);
17+
List<TransactionProcessor.Database.Entities.FileImportLog> importLogs,
18+
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File,
19+
TransactionProcessor.Database.Entities.Merchant)> importLogFilesList);
1820

1921
FileImportLogModel ConvertFrom(Guid estateId,
20-
EstateManagement.Database.Entities.FileImportLog importLog,
21-
List<(FileImportLogFile, File, Merchant)> importLogFilesList);
22+
TransactionProcessor.Database.Entities.FileImportLog importLog,
23+
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File,
24+
TransactionProcessor.Database.Entities.Merchant)> importLogFilesList);
2225

2326
#endregion
2427
}

‎FileProcessor.BusinessLogic/Common/ModelFactory.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
namespace FileProcessor.BusinessLogic.Common
1+
using TransactionProcessor.Database.Entities;
2+
3+
namespace FileProcessor.BusinessLogic.Common
24
{
35
using System;
46
using System.Collections.Generic;
57
using System.Linq;
6-
using EstateManagement.Database.Entities;
78
using FileProcessor.Models;
89
using FileImportLog = FileProcessor.Models.FileImportLog;
910

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

30-
foreach (EstateManagement.Database.Entities.FileImportLog fileImportLog in importLogs)
31+
foreach (TransactionProcessor.Database.Entities.FileImportLog fileImportLog in importLogs)
3132
{
3233
FileImportLog model = new FileImportLog();
3334

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

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

41-
foreach ((FileImportLogFile, File, Merchant) importLogFile in currentImportLogFiles)
42+
foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant) importLogFile in currentImportLogFiles)
4243
{
4344
model.Files.Add(new ImportLogFile
4445
{
@@ -65,8 +66,8 @@ public List<FileImportLog> ConvertFrom(Guid estateId,
6566
/// <param name="importLogFilesList">The import log files list.</param>
6667
/// <returns></returns>
6768
public FileImportLog ConvertFrom(Guid estateId,
68-
EstateManagement.Database.Entities.FileImportLog importLog,
69-
List<(FileImportLogFile, File, Merchant)> importLogFilesList)
69+
TransactionProcessor.Database.Entities.FileImportLog importLog,
70+
List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList)
7071
{
7172
FileImportLog model = new FileImportLog();
7273

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

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

80-
foreach ((FileImportLogFile, File,Merchant) importLogFile in currentImportLogFiles)
81+
foreach ((FileImportLogFile, TransactionProcessor.Database.Entities.File,Merchant) importLogFile in currentImportLogFiles)
8182
{
8283
model.Files.Add(new ImportLogFile
8384
{

‎FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
namespace FileProcessor.BusinessLogic.EventHandling
77
{
88
using System.Threading;
9-
using EstateManagement.Client;
109
using File.DomainEvents;
1110
using FileAggregate;
1211
using FileImportLog.DomainEvents;

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="EstateManagement.Database" Version="2025.1.5" />
98
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.3" />
10-
<PackageReference Include="EstateManagement.Client" Version="2025.1.5" />
119
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
1210
<PackageReference Include="Shared" Version="2025.1.2" />
1311
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
1412
<PackageReference Include="MediatR" Version="12.2.0" />
1513
<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
1614
<PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
17-
<PackageReference Include="TransactionProcessor.Client" Version="2025.1.4" />
15+
<PackageReference Include="TransactionProcessor.Client" Version="2025.1.5-build145" />
1816
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
1917
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
18+
<PackageReference Include="TransactionProcessor.Database" Version="2025.1.5-build145" />
2019
</ItemGroup>
2120

2221
<ItemGroup>

0 commit comments

Comments
 (0)