Skip to content

Get Merchants for Estate added #103

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 2 commits into from
May 12, 2020
Merged

Get Merchants for Estate added #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e3a763
Get Merchants for Estate added
StuartFerguson May 12, 2020
b3bf082
Merge branch 'master' into task/#98_estatemerchantlist
StuartFerguson May 12, 2020
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
6 changes: 3 additions & 3 deletions EstateManagement.BusinessLogic.Tests/EstateManagement.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.7.0">
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="Shared.EventStore" Version="0.0.5.1" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
31 changes: 24 additions & 7 deletions EstateManagement.BusinessLogic.Tests/Manager/EstateManagementManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace EstateManagement.BusinessLogic.Tests.Manager
using Manger;
using MerchantAggregate;
using Models;
using Models.Estate;
using Models.Factories;
using Models.Merchant;
using Moq;
Expand Down Expand Up @@ -72,7 +73,7 @@ public async Task EstateManagementManager_GetEstate_InvalidEstateId_ErrorIsThrow
}

[Fact]
public async Task EstateManagementManager_GetMerchant_MerchantIsReturnedWithEmptyAddressesAndContacts()
public async Task EstateManagementManager_GetMerchant_MerchantIsReturnedWithNullAddressesAndContacts()
{
this.MerchantAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.CreatedMerchantAggregate);

Expand All @@ -82,12 +83,12 @@ public async Task EstateManagementManager_GetMerchant_MerchantIsReturnedWithEmpt
merchantModel.EstateId.ShouldBe(TestData.EstateId);
merchantModel.MerchantId.ShouldBe(TestData.MerchantId);
merchantModel.MerchantName.ShouldBe(TestData.MerchantName);
merchantModel.Addresses.ShouldBeEmpty();
merchantModel.Contacts.ShouldBeEmpty();
merchantModel.Addresses.ShouldBeNull();
merchantModel.Contacts.ShouldBeNull();
}

[Fact]
public async Task EstateManagementManager_GetMerchant_WithAddress_MerchantIsReturnedWithEmptyContacts()
public async Task EstateManagementManager_GetMerchant_WithAddress_MerchantIsReturnedWithNullContacts()
{
this.MerchantAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.MerchantAggregateWithAddress);

Expand All @@ -98,11 +99,11 @@ public async Task EstateManagementManager_GetMerchant_WithAddress_MerchantIsRetu
merchantModel.MerchantId.ShouldBe(TestData.MerchantId);
merchantModel.MerchantName.ShouldBe(TestData.MerchantName);
merchantModel.Addresses.ShouldHaveSingleItem();
merchantModel.Contacts.ShouldBeEmpty();
merchantModel.Contacts.ShouldBeNull();
}

[Fact]
public async Task EstateManagementManager_GetMerchant_WithContact_MerchantIsReturnedWithEmptyAddresses()
public async Task EstateManagementManager_GetMerchant_WithContact_MerchantIsReturnedWithNullAddresses()
{
this.MerchantAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.MerchantAggregateWithContact);

Expand All @@ -112,8 +113,24 @@ public async Task EstateManagementManager_GetMerchant_WithContact_MerchantIsRetu
merchantModel.EstateId.ShouldBe(TestData.EstateId);
merchantModel.MerchantId.ShouldBe(TestData.MerchantId);
merchantModel.MerchantName.ShouldBe(TestData.MerchantName);
merchantModel.Addresses.ShouldBeEmpty();
merchantModel.Addresses.ShouldBeNull();
merchantModel.Contacts.ShouldHaveSingleItem();
}

[Fact]
public async Task EstateManagementManager_GetMerchants_MerchantListIsReturned()
{
this.EstateManagementRepository.Setup(e => e.GetMerchants(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(new List<Merchant>
{
TestData
.MerchantModelWithAddressesContactsDevicesAndOperators
});

List<Merchant> merchantList = await this.EstateManagementManager.GetMerchants(TestData.EstateId, CancellationToken.None);

merchantList.ShouldNotBeNull();
merchantList.ShouldNotBeEmpty();
merchantList.ShouldHaveSingleItem();
}
}
}
Loading