Skip to content

Commit

Permalink
Merge pull request #73 from LBHackney-IT/feature/TS-1389-Add-TA-Status
Browse files Browse the repository at this point in the history
Feature/TS-1389: Add TA booking status
  • Loading branch information
martapederiva authored Apr 22, 2024
2 parents fd6ac0f + 489cb25 commit 011a7d1
Show file tree
Hide file tree
Showing 9 changed files with 120 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Hackney.Shared.HousingSearch.Tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1
FROM mcr.microsoft.com/dotnet/sdk:6.0

# disable microsoft telematry
ENV DOTNET_CLI_TELEMETRY_OPTOUT='true'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

<TargetFramework>net6.0</TargetFramework>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoFixture" Version="4.18.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Hackney.Shared.HousingSearch\Hackney.Shared.HousingSearch.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using FluentAssertions;
using Xunit;
using AutoFixture;
using Hackney.Shared.HousingSearch.Gateways.Models.Tenures;
using Hackney.Shared.HousingSearch.Domain.Tenure;

namespace Hackney.Shared.HousingSearch.Tests
{
public class TempAccommodationInfoTests
{
private Fixture _fixture = new Fixture();

[Fact]
public void DomainTempAccommodationInfoHasPropertiesSet()
{
//arrange
var aQueryableTAInfo = _fixture.Create<QueryableTempAccommodationInfo>();

//act
var createdDomaninTAInfo = TempAccommodationInfo.Create(aQueryableTAInfo);

//assert
createdDomaninTAInfo.BookingStatus.Should().Be(aQueryableTAInfo.BookingStatus);
}
}
}
32 changes: 32 additions & 0 deletions Hackney.Shared.HousingSearch.Tests/Models/TenureTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using FluentAssertions;
using Xunit;
using AutoFixture;
using Hackney.Shared.HousingSearch.Gateways.Models.Tenures;

namespace Hackney.Shared.HousingSearch.Tests
{
public class TenureTests
{
private Fixture _fixture = new Fixture();

[Fact]
public void DomainTenureHasPropertiesSet()
{
//arrange
var aQueryableTenure = _fixture.Create<QueryableTenure>();

//act
var createdDomainTenure = aQueryableTenure.Create();

//assert
createdDomainTenure.Id.Should().Be(aQueryableTenure.Id);
createdDomainTenure.TenuredAsset.Should().BeEquivalentTo(aQueryableTenure.TenuredAsset);
createdDomainTenure.PaymentReference.Should().BeEquivalentTo(aQueryableTenure.PaymentReference);
createdDomainTenure.HouseholdMembers.Should().BeEquivalentTo(aQueryableTenure.HouseholdMembers);
createdDomainTenure.StartOfTenureDate.Should().BeEquivalentTo(aQueryableTenure.StartOfTenureDate);
createdDomainTenure.EndOfTenureDate.Should().BeEquivalentTo(aQueryableTenure.EndOfTenureDate);
createdDomainTenure.TenureType.Should().BeEquivalentTo(aQueryableTenure.TenureType);
createdDomainTenure.TempAccommodationInfo.Should().BeEquivalentTo(aQueryableTenure.TempAccommodationInfo);
}
}
}
14 changes: 14 additions & 0 deletions Hackney.Shared.HousingSearch.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31229.75
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hackney.Shared.HousingSearch", "Hackney.Shared.HousingSearch\Hackney.Shared.HousingSearch.csproj", "{D2AD4637-52B2-4E66-8FCF-D6EA873ABA01}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hackney.Shared.HousingSearch.Tests", "Hackney.Shared.HousingSearch.Tests\Hackney.Shared.HousingSearch.Tests.csproj", "{6C395BFD-FBD0-40DC-8127-E1DBD702377E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -27,6 +29,18 @@ Global
{D2AD4637-52B2-4E66-8FCF-D6EA873ABA01}.Release|x64.Build.0 = Release|Any CPU
{D2AD4637-52B2-4E66-8FCF-D6EA873ABA01}.Release|x86.ActiveCfg = Release|Any CPU
{D2AD4637-52B2-4E66-8FCF-D6EA873ABA01}.Release|x86.Build.0 = Release|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Debug|x64.ActiveCfg = Debug|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Debug|x64.Build.0 = Debug|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Debug|x86.ActiveCfg = Debug|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Debug|x86.Build.0 = Debug|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Release|Any CPU.Build.0 = Release|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Release|x64.ActiveCfg = Release|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Release|x64.Build.0 = Release|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Release|x86.ActiveCfg = Release|Any CPU
{6C395BFD-FBD0-40DC-8127-E1DBD702377E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using Hackney.Shared.HousingSearch.Gateways.Models.Tenures;

namespace Hackney.Shared.HousingSearch.Domain.Tenure
{
public class TempAccommodationInfo
{
public string BookingStatus { get; set; }

public static TempAccommodationInfo Create(QueryableTempAccommodationInfo TempAccommodationInfo)
{
return new TempAccommodationInfo(TempAccommodationInfo);
}
public TempAccommodationInfo()
{

}
private TempAccommodationInfo(QueryableTempAccommodationInfo TempAccommodationInfo)
{
BookingStatus = TempAccommodationInfo?.BookingStatus;
}
}
}


8 changes: 5 additions & 3 deletions Hackney.Shared.HousingSearch/Domain/Tenure/Tenure.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ namespace Hackney.Shared.HousingSearch.Domain.Tenure
public class Tenure
{
public static Tenure Create(string id, string paymentReference, string startOfTenureDate, string endOfTenureDate,
List<QueryableHouseholdMember> houseHoldMembers, QueryableTenuredAsset tenuredAsset, QueryableTenureType tenureType)
List<QueryableHouseholdMember> houseHoldMembers, QueryableTenuredAsset tenuredAsset, QueryableTenureType tenureType, QueryableTempAccommodationInfo TempAccommodationInfo)
{
return new Tenure(id, paymentReference, startOfTenureDate, endOfTenureDate, houseHoldMembers,
tenuredAsset, tenureType);
tenuredAsset, tenureType, TempAccommodationInfo);
}

public Tenure()
Expand All @@ -20,7 +20,7 @@ public Tenure()
}

private Tenure(string id, string paymentReference, string startOfTenureDate, string endOfTenureDate,
List<QueryableHouseholdMember> houseHoldMembers, QueryableTenuredAsset tenuredAsset, QueryableTenureType tenureType)
List<QueryableHouseholdMember> houseHoldMembers, QueryableTenuredAsset tenuredAsset, QueryableTenureType tenureType, QueryableTempAccommodationInfo queryableTempAccommodationInfo)
{
Id = id;
PaymentReference = paymentReference;
Expand All @@ -29,6 +29,7 @@ private Tenure(string id, string paymentReference, string startOfTenureDate, str
HouseholdMembers = houseHoldMembers != null && houseHoldMembers.Any() ? houseHoldMembers.Select(HouseholdMember.Create).ToList() : new List<HouseholdMember>();
TenureType = TenureType.Create(tenureType);
TenuredAsset = TenuredAsset.Create(tenuredAsset);
TempAccommodationInfo = TempAccommodationInfo.Create(queryableTempAccommodationInfo);
}

public string Id { get; set; }
Expand All @@ -39,5 +40,6 @@ private Tenure(string id, string paymentReference, string startOfTenureDate, str
public string EndOfTenureDate { get; set; }
public TenureType TenureType { get; set; }
public bool IsActive => TenureHelpers.IsTenureActive(EndOfTenureDate);
public TempAccommodationInfo TempAccommodationInfo { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Hackney.Shared.HousingSearch.Gateways.Models.Tenures
{
public class QueryableTempAccommodationInfo
{
public string BookingStatus { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class QueryableTenure
public Domain.Tenure.Tenure Create()
{
return Domain.Tenure.Tenure.Create(Id, PaymentReference, StartOfTenureDate, EndOfTenureDate,
HouseholdMembers, TenuredAsset, TenureType);
HouseholdMembers, TenuredAsset, TenureType, TempAccommodationInfo);
}

[Text(Name = "id")]
Expand All @@ -19,5 +19,6 @@ public Domain.Tenure.Tenure Create()
public string StartOfTenureDate { get; set; }
public string EndOfTenureDate { get; set; }
public QueryableTenureType TenureType { get; set; }
public QueryableTempAccommodationInfo TempAccommodationInfo { get; set; }
}
}

0 comments on commit 011a7d1

Please sign in to comment.