Skip to content

Commit 47e01df

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #130 from StuartFerguson/task/#128_addfeetypeandenabledflag
Update to get fees only return enabled
2 parents 569d130 + 1f31872 commit 47e01df

7 files changed

Lines changed: 12 additions & 20 deletions

File tree

‎EstateManagement.IntegrationTests/EstateManagement.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="ClientProxyBase" Version="0.0.15.7" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
12-
<PackageReference Include="EstateReporting.Database" Version="1.0.0-build7" />
12+
<PackageReference Include="EstateReporting.Database" Version="1.0.1.1-build12" />
1313
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="20.6.0" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />

‎EstateManagement.Models/EstateManagement.Models.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="EstateReporting.Database" Version="1.0.0-build7" />
8+
<PackageReference Include="EstateReporting.Database" Version="1.0.1.1-build12" />
99
</ItemGroup>
1010

1111
</Project>

‎EstateManagement.Models/Factories/ModelFactory.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,11 @@ public List<TransactionFee> ConvertFrom(List<ContractProductTransactionFeeEntity
221221
TransactionFeeId = f.TransactionFeeId,
222222
Value = f.Value,
223223
Description = f.Description,
224-
CalculationType = (CalculationType)f.CalculationType});
224+
CalculationType = (CalculationType)f.CalculationType,
225+
FeeType = (FeeType)f.FeeType,
226+
IsEnabled = f.IsEnabled
227+
}
228+
);
225229
});
226230

227231
return productTransactionFeesModelList;

‎EstateManagement.Repository.Tests/EstateManagementRepositoryTests.cs‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public void EstateManagementRepository_CanBeCreated_IsCreated()
4141

4242
[Theory]
4343
[InlineData(TestDatabaseType.InMemory)]
44-
[InlineData(TestDatabaseType.SqliteInMemory)]
4544
public async Task EstateManagementRepository_GetEstate_EstateRetrieved(TestDatabaseType testDatabaseType)
4645
{
4746
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -64,7 +63,6 @@ public async Task EstateManagementRepository_GetEstate_EstateRetrieved(TestDatab
6463

6564
[Theory]
6665
[InlineData(TestDatabaseType.InMemory)]
67-
[InlineData(TestDatabaseType.SqliteInMemory)]
6866
public async Task EstateManagementRepository_GetEstate_EstateNotFound_ErrorThrown(TestDatabaseType testDatabaseType)
6967
{
7068
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -85,7 +83,6 @@ public async Task EstateManagementRepository_GetEstate_EstateNotFound_ErrorThrow
8583

8684
[Theory]
8785
[InlineData(TestDatabaseType.InMemory)]
88-
[InlineData(TestDatabaseType.SqliteInMemory)]
8986
public async Task EstateManagementRepository_GetMerchants_MerchantRetrieved(TestDatabaseType testDatabaseType)
9087
{
9188
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -119,7 +116,6 @@ public async Task EstateManagementRepository_GetMerchants_MerchantRetrieved(Test
119116

120117
[Theory]
121118
[InlineData(TestDatabaseType.InMemory)]
122-
[InlineData(TestDatabaseType.SqliteInMemory)]
123119
public async Task EstateManagementRepository_GetMerchants_NoMerchantsFound_NullMerchantsReturned(TestDatabaseType testDatabaseType)
124120
{
125121
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -143,7 +139,6 @@ public async Task EstateManagementRepository_GetMerchants_NoMerchantsFound_NullM
143139

144140
[Theory]
145141
[InlineData(TestDatabaseType.InMemory)]
146-
[InlineData(TestDatabaseType.SqliteInMemory)]
147142
public async Task EstateManagementRepository_GetContract_ContractRetrieved(TestDatabaseType testDatabaseType)
148143
{
149144
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -166,7 +161,6 @@ public async Task EstateManagementRepository_GetContract_ContractRetrieved(TestD
166161

167162
[Theory]
168163
[InlineData(TestDatabaseType.InMemory)]
169-
[InlineData(TestDatabaseType.SqliteInMemory)]
170164
public async Task EstateManagementRepository_GetContract_IncludeProducts_ContractRetrieved(TestDatabaseType testDatabaseType)
171165
{
172166
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -189,7 +183,6 @@ public async Task EstateManagementRepository_GetContract_IncludeProducts_Contrac
189183

190184
[Theory]
191185
[InlineData(TestDatabaseType.InMemory)]
192-
[InlineData(TestDatabaseType.SqliteInMemory)]
193186
public async Task EstateManagementRepository_GetContract_IncludeProductsWithFees_ContractRetrieved(TestDatabaseType testDatabaseType)
194187
{
195188
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -212,7 +205,6 @@ public async Task EstateManagementRepository_GetContract_IncludeProductsWithFees
212205

213206
[Theory]
214207
[InlineData(TestDatabaseType.InMemory)]
215-
[InlineData(TestDatabaseType.SqliteInMemory)]
216208
public async Task EstateManagementRepository_GetContract_ContractNotFound_ErrorThrown(TestDatabaseType testDatabaseType)
217209
{
218210
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -232,7 +224,6 @@ public async Task EstateManagementRepository_GetContract_ContractNotFound_ErrorT
232224

233225
[Theory]
234226
[InlineData(TestDatabaseType.InMemory)]
235-
[InlineData(TestDatabaseType.SqliteInMemory)]
236227
public async Task EstateManagementRepository_GetTransactionFeesForProduct_TransactionFeesForProductRetrieved(TestDatabaseType testDatabaseType)
237228
{
238229
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -254,7 +245,6 @@ public async Task EstateManagementRepository_GetTransactionFeesForProduct_Transa
254245

255246
[Theory]
256247
[InlineData(TestDatabaseType.InMemory)]
257-
[InlineData(TestDatabaseType.SqliteInMemory)]
258248
public async Task EstateManagementRepository_GetMerchantContracts_MerchantContractsRetrieved(TestDatabaseType testDatabaseType)
259249
{
260250
EstateReportingContext context = await EstateManagementRepositoryTests.GetContext(Guid.NewGuid().ToString("N"), testDatabaseType);
@@ -309,10 +299,7 @@ private static async Task<EstateReportingContext> GetContext(String databaseName
309299
{
310300
throw new NotSupportedException($"Database type [{databaseType}] not supported");
311301
}
312-
313-
314-
315-
302+
316303
return context;
317304
}
318305
}

‎EstateManagement.Repository/EstateManagement.Repository.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="EstateReporting.Database" Version="1.0.0-build7" />
8+
<PackageReference Include="EstateReporting.Database" Version="1.0.1.1-build12" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎EstateManagement.Repository/EstateManagementRepository.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,8 @@ public async Task<List<TransactionFee>> GetTransactionFeesForProduct(Guid estate
253253

254254
List<ContractProductTransactionFee> transactionFees = await context
255255
.ContractProductTransactionFees
256-
.Where(c => c.EstateId == estateId && c.ContractId == contractId && c.ProductId == productId)
256+
.Where(c => c.EstateId == estateId && c.ContractId == contractId && c.ProductId == productId
257+
&& c.IsEnabled == true)
257258
.ToListAsync(cancellationToken);
258259

259260
List<TransactionFee> transactionFeeModels = this.ModelFactory.ConvertFrom(transactionFees);

‎EstateManagement.Testing/EstateManagement.Testing.csproj‎

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

88
<ItemGroup>
9-
<PackageReference Include="EstateReporting.Database" Version="1.0.0-build7" />
9+
<PackageReference Include="EstateReporting.Database" Version="1.0.1.1-build12" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)