Skip to content

Commit 29700f2

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #119 from TransactionProcessing/task/#116_remove_estate_management
Replace EstateManagement.Database with TransactionProcessor
2 parents 9c3b446 + c3b1355 commit 29700f2

12 files changed

Lines changed: 33 additions & 47 deletions

‎EstateReportingAPI.BusinessLogic/EstateReportingAPI.BusinessLogic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="MediatR" Version="12.4.1" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="8.3.10" />
1212
<PackageReference Include="Shared" Version="2025.1.2" />
13-
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build128" />
13+
<PackageReference Include="TransactionProcessor.Database" Version="2025.1.5-build147" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎EstateReportingAPI.BusinessLogic/ReportingManager.cs‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
namespace EstateReportingAPI.BusinessLogic{
2-
using System.Data.Common;
3-
using EstateManagement.Database.Contexts;
4-
using EstateManagement.Database.Entities;
1+
using TransactionProcessor.Database.Contexts;
2+
using TransactionProcessor.Database.Entities;
3+
using TransactionProcessor.Database.Entities.Summary;
4+
5+
namespace EstateReportingAPI.BusinessLogic{
56
using Microsoft.EntityFrameworkCore;
67
using Models;
7-
using Shared.Exceptions;
88
using System.Linq;
9-
using System.Linq.Dynamic.Core;
10-
using System.Linq.Expressions;
119
using System.Threading;
1210
using Calendar = Models.Calendar;
1311
using Merchant = Models.Merchant;
14-
using System.Linq.Expressions;
15-
using System.Reflection;
1612
using Operator = Models.Operator;
17-
using EstateManagement.Database.Entities.Summary;
1813

1914
public class ReportingManager : IReportingManager{
2015
#region Fields
@@ -141,10 +136,10 @@ public async Task<List<Calendar>> GetCalendarComparisonDates(Guid estateId, Canc
141136

142137
DateTime startOfYear = new DateTime(DateTime.Now.Year, 1, 1);
143138

144-
List<EstateManagement.Database.Entities.Calendar> entities = context.Calendar.Where(c => c.Date >= startOfYear && c.Date < DateTime.Now.Date.AddDays(-1)).OrderByDescending(d => d.Date).ToList();
139+
List<TransactionProcessor.Database.Entities.Calendar> entities = context.Calendar.Where(c => c.Date >= startOfYear && c.Date < DateTime.Now.Date.AddDays(-1)).OrderByDescending(d => d.Date).ToList();
145140

146141
List<Calendar> result = new List<Calendar>();
147-
foreach (EstateManagement.Database.Entities.Calendar calendar in entities){
142+
foreach (TransactionProcessor.Database.Entities.Calendar calendar in entities){
148143
result.Add(new Calendar{
149144
Date = calendar.Date,
150145
DayOfWeek = calendar.DayOfWeek,
@@ -166,10 +161,10 @@ public async Task<List<Calendar>> GetCalendarComparisonDates(Guid estateId, Canc
166161
public async Task<List<Calendar>> GetCalendarDates(Guid estateId, CancellationToken cancellationToken){
167162
EstateManagementGenericContext? context = await this.ContextFactory.GetContext(estateId, ReportingManager.ConnectionStringIdentifier, cancellationToken);
168163

169-
List<EstateManagement.Database.Entities.Calendar> entities = context.Calendar.Where(c => c.Date <= DateTime.Now.Date).ToList();
164+
List<TransactionProcessor.Database.Entities.Calendar> entities = context.Calendar.Where(c => c.Date <= DateTime.Now.Date).ToList();
170165

171166
List<Calendar> result = new List<Calendar>();
172-
foreach (EstateManagement.Database.Entities.Calendar calendar in entities){
167+
foreach (TransactionProcessor.Database.Entities.Calendar calendar in entities){
173168
result.Add(new Calendar{
174169
Date = calendar.Date,
175170
DayOfWeek = calendar.DayOfWeek,

‎EstateReportingAPI.IntegrationTests/ControllerTestsBase.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
using System.Net.Http;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using EstateManagement.Database.Entities;
76
using SimpleResults;
7+
using TransactionProcessor.Database.Contexts;
8+
using TransactionProcessor.Database.Entities;
89

910
namespace EstateReportingAPI.IntegrationTests;
1011

@@ -15,8 +16,6 @@ namespace EstateReportingAPI.IntegrationTests;
1516
using Common;
1617
using Ductus.FluentDocker.Services;
1718
using Ductus.FluentDocker.Services.Extensions;
18-
using EstateManagement.Database.Contexts;
19-
using Newtonsoft.Json;
2019
using NLog;
2120
using Shared.IntegrationTesting;
2221
using Shared.Logger;

‎EstateReportingAPI.IntegrationTests/CustomWebApplicationFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using System.Threading;
44
using System.Threading.Tasks;
55
using Shared.Repositories;
6+
using TransactionProcessor.Database.Contexts;
67

78
namespace EstateReportingAPI.IntegrationTests;
89

910
using BusinessLogic;
10-
using EstateManagement.Database.Contexts;
1111
using EstateReportingAPI.Common;
1212
using k8s.KubeConfigModels;
1313
using Microsoft.AspNetCore.Authentication;

‎EstateReportingAPI.IntegrationTests/DatabaseHelper.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,13 @@
88
using JasperFx.Core;
99
using Microsoft.Data.SqlClient;
1010
using Shared.Logger;
11+
using TransactionProcessor.Database.Contexts;
12+
using TransactionProcessor.Database.Entities;
1113

1214
namespace EstateReportingAPI.IntegrationTests;
1315

1416
using System.Reflection;
1517
using System.Text;
16-
using System.Xml.Linq;
17-
using EstateManagement.Database.Contexts;
18-
using EstateManagement.Database.Entities;
19-
using EstateManagement.Database.Migrations.MySql;
20-
using k8s.KubeConfigModels;
21-
using Microsoft.AspNetCore.Html;
2218
using Microsoft.EntityFrameworkCore;
2319

2420
public class DatabaseHelper{
@@ -64,7 +60,7 @@ public async Task AddCalendarYear(Int32 year){
6460

6561
public async Task AddCalendarDates(List<DateTime> dates){
6662
foreach (DateTime dateTime in dates){
67-
EstateManagement.Database.Entities.Calendar c = dateTime.ToCalendar();
63+
Calendar c = dateTime.ToCalendar();
6864
await this.Context.Calendar.AddAsync(c);
6965
}
7066

‎EstateReportingAPI.IntegrationTests/DimensionControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Threading;
55
using System.Threading.Tasks;
66
using SimpleResults;
7+
using TransactionProcessor.Database.Contexts;
78

89
namespace EstateReportingAPI.IntegrationTests;
910

10-
using EstateManagement.Database.Contexts;
1111
using EstateReportingAPI.DataTrasferObjects;
1212
using Shouldly;
1313
using Xunit;

‎EstateReportingAPI.IntegrationTests/EstateReportingAPI.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="EstateManagement.Database" Version="2024.8.2-build128" />
10+
<PackageReference Include="TransactionProcessor.Database" Version="2025.1.5-build147" />
1111
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
1212
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

‎EstateReportingAPI.IntegrationTests/Extensions.cs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Globalization;
34
using System.Linq;
45
using System.Text;
56
using System.Threading.Tasks;
7+
using Calendar = TransactionProcessor.Database.Entities.Calendar;
68

79
namespace EstateReportingAPI.IntegrationTests
810
{
9-
using BusinessLogic;
10-
using EstateManagement.Database.Entities;
11-
using EstateReportingAPI.Common;
12-
using Microsoft.Extensions.DependencyInjection;
13-
using Shared.EntityFramework;
14-
using System.Globalization;
15-
using Calendar = System.Globalization.Calendar;
16-
1711
public static class Extensions{
18-
public static EstateManagement.Database.Entities.Calendar ToCalendar(this DateTime date){
19-
return new EstateManagement.Database.Entities.Calendar{
12+
public static Calendar ToCalendar(this DateTime date){
13+
return new Calendar{
2014
Date = date,
2115
DayOfWeek = date.DayOfWeek.ToString(),
2216
DayOfWeekShort = date.DayOfWeek.ToString().Substring(0, 3),
@@ -33,7 +27,7 @@ public static EstateManagement.Database.Entities.Calendar ToCalendar(this DateTi
3327

3428
public static Int32 GetWeekNumber(this DateTime date){
3529
// Define the calendar to use (in this case, the Gregorian calendar)
36-
Calendar calendar = CultureInfo.InvariantCulture.Calendar;
30+
System.Globalization.Calendar calendar = CultureInfo.InvariantCulture.Calendar;
3731

3832
// Get the week number for the current date
3933
int weekNumber = calendar.GetWeekOfYear(date, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
@@ -43,7 +37,7 @@ public static Int32 GetWeekNumber(this DateTime date){
4337
public static Int32 GetDayOfWeekNumber(this DateTime date)
4438
{
4539
// Define the calendar to use (in this case, the Gregorian calendar)
46-
Calendar calendar = CultureInfo.InvariantCulture.Calendar;
40+
System.Globalization.Calendar calendar = CultureInfo.InvariantCulture.Calendar;
4741

4842
// Get the week number for the current date
4943
int dayOfWeekNumber = (Int32)calendar.GetDayOfWeek(date);

‎EstateReportingAPI.IntegrationTests/FactSettlementsControllerTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
using System.Collections.Generic;
33
using System.Threading;
44
using System.Threading.Tasks;
5+
using TransactionProcessor.Database.Contexts;
6+
using TransactionProcessor.Database.Entities;
57

68
namespace EstateReportingAPI.IntegrationTests {
7-
using EstateManagement.Database.Contexts;
8-
using EstateManagement.Database.Entities;
99
using EstateReportingAPI.DataTransferObjects;
1010
using Microsoft.EntityFrameworkCore;
1111
using Shouldly;

‎EstateReportingAPI.IntegrationTests/FactTransactionsControllerTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
using Ductus.FluentDocker.Common;
66
using EstateReportingAPI.IntegrationTests;
77
using Microsoft.EntityFrameworkCore;
8+
using TransactionProcessor.Database.Contexts;
9+
using TransactionProcessor.Database.Entities;
810
using Xunit.Abstractions;
911

1012
namespace EstateReportingAPI.IntegrationTests;
@@ -13,8 +15,6 @@ namespace EstateReportingAPI.IntegrationTests;
1315
using System.Diagnostics.Contracts;
1416
using System.Linq;
1517
using DataTrasferObjects;
16-
using EstateManagement.Database.Contexts;
17-
using EstateManagement.Database.Entities;
1818
using EstateReportingAPI.DataTransferObjects;
1919
using EstateReportingAPI.Models;
2020
using Microsoft.OpenApi.Services;

0 commit comments

Comments
 (0)