Merge pull request #29 from LBHackney-IT/feature/OptionalTempAccomInfo

Add "Booking Status" and "Assigned Officer" under a sub-model within Create, Update & Layer Tenure models.

.env.sample

@@ -0,0 +1,2 @@
+# Token to access locked Hackney Shared Github packages
+LBHPACKAGESTOKEN=ghp_YourPATWithDownloadGithubPackagesPrivileges

Hackney.Shared.Tenure.Tests/Factories/CreateRequestFactoryTests.cs

@@ -37,6 +37,8 @@ public void CanMapARequestToADatabaseObject()
             databaseEntity.TenuredAsset.Should().BeEquivalentTo(request.TenuredAsset);
             databaseEntity.TenureType.Should().Be(request.TenureType);
             databaseEntity.Terminated.Should().Be(request.Terminated);
+            databaseEntity.TempAccommodationInfo.Should().BeEquivalentTo(request.TempAccommodationInfo);
+            databaseEntity.FurtherAccountInformation.Should().BeEquivalentTo(request.FurtherAccountInformation);
         }
 
         [Fact]

Hackney.Shared.Tenure.Tests/Factories/EntityFactoryTest.cs

@@ -12,17 +12,46 @@ public class EntityFactoryTest
     {
         private readonly Fixture _fixture = new Fixture();
 
+        #region Tenure Information
+        [Fact]
+        public void NullTenureDomainMapsToNullTenureDatabaseEntity()
+        {
+            // arrange
+            TenureInformation domainTenure = null;
+
+            // act
+            var entityTenure = domainTenure.ToDatabase();
+
+            // assert
+            entityTenure.Should().BeNull();
+        }
+
+        [Fact]
+        public void NullTenureDatabaseEntityMapsToNullTenureDomain()
+        {
+            // arrange
+            TenureInformationDb entityTenure = null;
+
+            // act
+            var domainTenure = entityTenure.ToDomain();
+
+            // assert
+            domainTenure.Should().BeNull();
+        }
+
         [Fact]
         public void CanMapADatabaseEntityToADomainObject()
         {
             var databaseEntity = _fixture.Create<TenureInformationDb>();
             databaseEntity.EndOfTenureDate = DateTime.UtcNow;
 
-            var entity = databaseEntity.ToDomain();
+            var domainTenure = databaseEntity.ToDomain();
 
-            databaseEntity.Should().BeEquivalentTo(entity, config => config.Excluding(x => x.IsActive));
-        }
+            // If it is null, cross-static-method calls are not properly covered.
+            domainTenure.TempAccommodationInfo.Should().NotBeNull();
 
+            databaseEntity.Should().BeEquivalentTo(domainTenure, config => config.Excluding(x => x.IsActive));
+        }
 
         [Fact]
         public void CanMapADomainEntityToADatabaseObject()
@@ -32,7 +61,123 @@ public void CanMapADomainEntityToADatabaseObject()
 
             var databaseEntity = entity.ToDatabase();
 
+            // If it is null, cross-static-method calls are not properly covered.
+            databaseEntity.TempAccommodationInfo.Should().NotBeNull();
+
             entity.Should().BeEquivalentTo(databaseEntity);
         }
+        #endregion
+        #region Temporary Accommodation Information
+        #region Domain to Entity
+        [Fact]
+        public void NullTAOfficerDomainMapsToNullTAOfficerDatabase()
+        {
+            // arrange
+            TemporaryAccommodationOfficer domainTAOfficer = null;
+
+            // act
+            var taOfficerEntity = domainTAOfficer.ToDatabase();
+
+            // assert
+            taOfficerEntity.Should().BeNull();
+        }
+        [Fact]
+        public void NullTAInfoDomainMapsToNullTAInfoDatabase()
+        {
+            // arrange
+            TemporaryAccommodationInfo domainTAInfo = null;
+
+            // act
+            var taInfoEntity = domainTAInfo.ToDatabase();
+
+            // assert
+            taInfoEntity.Should().BeNull();
+        }
+        [Fact]
+        public void TAInfoDomainMapsFieldsCorrectlyToTAInfoDatabase()
+        {
+            // arrange
+            var domainTAInfo = _fixture.Create<TemporaryAccommodationInfo>();
+
+            // act
+            var taInfoEntity = domainTAInfo.ToDatabase();
+
+            // assert
+            taInfoEntity.BookingStatus.Should().Be(domainTAInfo.BookingStatus);
+            // If it is null, cross-static-method calls were not properly covered.
+            taInfoEntity.AssignedOfficer.Should().NotBeNull();
+            taInfoEntity.AssignedOfficer.Should().BeEquivalentTo(domainTAInfo.AssignedOfficer);
+        }
+        [Fact]
+        public void TAOfficerDomainMapsFieldsCorrectlyToTAOfficerDatabase()
+        {
+            // arrange
+            var domainTAOfficer = _fixture.Create<TemporaryAccommodationOfficer>();
+
+            // act
+            var taOfficerEntity = domainTAOfficer.ToDatabase();
+
+            // assert
+            taOfficerEntity.FirstName.Should().Be(domainTAOfficer.FirstName);
+            taOfficerEntity.LastName.Should().Be(domainTAOfficer.LastName);
+            taOfficerEntity.Email.Should().Be(domainTAOfficer.Email);
+        }
+        #endregion
+        #region Entity to Domain
+        [Fact]
+        public void NullTAOfficerEntityMapsToNullTAOfficerDomain()
+        {
+            // arrange
+            TemporaryAccommodationOfficerDb entityTAOfficer = null;
+
+            // act
+            var taOfficerDomain = entityTAOfficer.ToDomain();
+
+            // assert
+            taOfficerDomain.Should().BeNull();
+        }
+        [Fact]
+        public void NullTAInfoEntityMapsToNullTAInfoDomain()
+        {
+            // arrange
+            TemporaryAccommodationInfoDb entityTAInfo = null;
+
+            // act
+            var taInfoDomain = entityTAInfo.ToDomain();
+
+            // assert
+            taInfoDomain.Should().BeNull();
+        }
+        [Fact]
+        public void TAInfoEntityMapsFieldsCorrectlyToTAInfoDomain()
+        {
+            // arrange
+            var entityTAInfo = _fixture.Create<TemporaryAccommodationInfoDb>();
+
+            // act
+            var taInfoDomain = entityTAInfo.ToDomain();
+
+            // assert
+            taInfoDomain.BookingStatus.Should().Be(entityTAInfo.BookingStatus);
+            // If it is null, cross-static-method calls were not properly covered.
+            taInfoDomain.AssignedOfficer.Should().NotBeNull();
+            taInfoDomain.AssignedOfficer.Should().BeEquivalentTo(entityTAInfo.AssignedOfficer);
+        }
+        [Fact]
+        public void TAOfficerEntityMapsFieldsCorrectlyToTAOfficerDomain()
+        {
+            // arrange
+            var entityTAOfficer = _fixture.Create<TemporaryAccommodationOfficerDb>();
+
+            // act
+            var taOfficerDomain = entityTAOfficer.ToDomain();
+
+            // assert
+            taOfficerDomain.FirstName.Should().Be(entityTAOfficer.FirstName);
+            taOfficerDomain.LastName.Should().Be(entityTAOfficer.LastName);
+            taOfficerDomain.Email.Should().Be(entityTAOfficer.Email);
+        }
+        #endregion
+        #endregion
     }
 }

Hackney.Shared.Tenure.Tests/Factories/ResponseFactoryTest.cs

@@ -12,6 +12,7 @@ public class ResponseFactoryTest
     {
         private readonly Fixture _fixture = new Fixture();
 
+        #region Tenure Information
         [Fact]
         public void CanMapANullTenureInfoToAResponseObject()
         {
@@ -26,8 +27,11 @@ public void CanMapATenureInfoToAResponseObject()
         {
             var domain = _fixture.Create<TenureInformation>();
             var response = domain.ToResponse();
+
             domain.Should().BeEquivalentTo(response);
 
+            // If it is null, cross-static-method calls were not properly covered.
+            response.TempAccommodationInfo.Should().NotBeNull();
         }
 
         [Fact]
@@ -48,5 +52,61 @@ public void CanMapNullDomainTenureInfoListToAnEmptyResponsesList()
 
             responseNotes.Should().BeEmpty();
         }
+        #endregion
+        #region Temporary Accommodation details
+        [Fact]
+        public void NullTAOfficerDomainMapsToNullTAOfficerResponse()
+        {
+            // arrange
+            TemporaryAccommodationOfficer domainTAOfficer = null;
+
+            // act
+            var taOfficerPresentation = domainTAOfficer.ToResponse();
+
+            // assert
+            taOfficerPresentation.Should().BeNull();
+        }
+        [Fact]
+        public void NullTAInfoDomainMapsToNullTAInfoResponse()
+        {
+            // arrange
+            TemporaryAccommodationInfo domainTAInfo = null;
+
+            // act
+            var taInfoPresentation = domainTAInfo.ToResponse();
+
+            // assert
+            taInfoPresentation.Should().BeNull();
+        }
+        [Fact]
+        public void TAInfoDomainMapsFieldsCorrectlyToTAInfoResponse()
+        {
+            // arrange
+            var domainTAInfo = _fixture.Create<TemporaryAccommodationInfo>();
+
+            // act
+            var taInfoPresentation = domainTAInfo.ToResponse();
+
+            // assert
+            taInfoPresentation.BookingStatus.Should().Be(domainTAInfo.BookingStatus);
+            // If it is null, cross-static-method calls were not properly covered.
+            taInfoPresentation.AssignedOfficer.Should().NotBeNull();
+            taInfoPresentation.AssignedOfficer.Should().BeEquivalentTo(domainTAInfo.AssignedOfficer);
+        }
+        [Fact]
+        public void TAOfficerDomainMapsFieldsCorrectlyToTAOfficerResponse()
+        {
+            // arrange
+            var domainTAOfficer = _fixture.Create<TemporaryAccommodationOfficer>();
+
+            // act
+            var taOfficerPresentation = domainTAOfficer.ToResponse();
+
+            // assert
+            taOfficerPresentation.FirstName.Should().Be(domainTAOfficer.FirstName);
+            taOfficerPresentation.LastName.Should().Be(domainTAOfficer.LastName);
+            taOfficerPresentation.Email.Should().Be(domainTAOfficer.Email);
+        }
+        #endregion
     }
 }

Hackney.Shared.Tenure/Boundary/Requests/CreateTenureRequestObject.cs

@@ -31,6 +31,7 @@ public class CreateTenureRequestObject
         public int NumberOfAdultsInProperty { get; set; }
         public int NumberOfChildrenInProperty { get; set; }
         public bool? HasOffsiteStorage { get; set; }
+        public TemporaryAccommodationInfo TempAccommodationInfo { get; set; }
         public FurtherAccountInformation FurtherAccountInformation { get; set; }
     }
 }

Hackney.Shared.Tenure/Boundary/Requests/EditTenureDetailsRequestObject.cs

@@ -13,12 +13,14 @@ public class EditTenureDetailsRequestObject
         public Charges Charges { get; set; }
         public TenureType TenureType { get; set; }
         public string TenureSource { get; set; }
-        public Terminated Terminated { get; set; }
-        public DateTime? PotentialEndDate { get; set; }
+        public Terminated Terminated { get; set; }
+        public DateTime? PotentialEndDate { get; set; }
         public string FundingSource { get; set; }
         public int NumberOfAdultsInProperty { get; set; }
         public int NumberOfChildrenInProperty { get; set; }
         public bool? HasOffsiteStorage { get; set; }
+        // Using a Domain (instead of Request) model because of limitations & risks imposed by the over-engineered entity updater solution
+        public TemporaryAccommodationInfo TempAccommodationInfo { get; set; }
         public FurtherAccountInformation FurtherAccountInformation { get; set; }
         public IEnumerable<LegacyReference> LegacyReferences { get; set; }
         public TenuredAsset TenuredAsset { get; set; }

Hackney.Shared.Tenure/Boundary/Response/TemporaryAccommodationInfoResponse.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Hackney.Shared.Tenure.Boundary.Response
+{
+    public class TemporaryAccommodationInfoResponse
+    {
+        public string BookingStatus { get; set; }
+        public TemporaryAccommodationOfficerResponse AssignedOfficer { get; set; }
+    }
+}

Hackney.Shared.Tenure/Boundary/Response/TemporaryAccommodationOfficerResponse.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Hackney.Shared.Tenure.Boundary.Response
+{
+    public class TemporaryAccommodationOfficerResponse
+    {
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string Email { get; set; }
+    }
+}

Hackney.Shared.Tenure/Boundary/Response/TenureResponseObject.cs

@@ -32,6 +32,7 @@ public class TenureResponseObject
         public int NumberOfAdultsInProperty { get; set; }
         public int NumberOfChildrenInProperty { get; set; }
         public bool? HasOffsiteStorage { get; set; }
+        public TemporaryAccommodationInfoResponse TempAccommodationInfo { get; set; }
         public FurtherAccountInformation FurtherAccountInformation { get; set; }
     }
 }

Hackney.Shared.Tenure/Domain/TemporaryAccommodationInfo.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Hackney.Shared.Tenure.Domain
+{
+    public class TemporaryAccommodationInfo
+    {
+        public string BookingStatus { get; set; }
+        public TemporaryAccommodationOfficer AssignedOfficer { get; set; }
+    }
+}

Hackney.Shared.Tenure/Domain/TemporaryAccommodationOfficer.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Hackney.Shared.Tenure.Domain
+{
+    public class TemporaryAccommodationOfficer
+    {
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string Email { get; set; }
+    }
+}

Hackney.Shared.Tenure/Domain/TenureInformation.cs

@@ -35,6 +35,7 @@ public class TenureInformation
         public int NumberOfAdultsInProperty { get; set; }
         public int NumberOfChildrenInProperty { get; set; }
         public bool? HasOffsiteStorage { get; set; }
+        public TemporaryAccommodationInfo TempAccommodationInfo { get; set; }
         public FurtherAccountInformation FurtherAccountInformation { get; set; }
 
     }

Hackney.Shared.Tenure/Factories/CreateRequestFactory.cs

@@ -35,6 +35,7 @@ public static TenureInformationDb ToDatabase(this CreateTenureRequestObject crea
                 NumberOfAdultsInProperty = createTenureRequestObject.NumberOfAdultsInProperty,
                 NumberOfChildrenInProperty = createTenureRequestObject.NumberOfChildrenInProperty,
                 HasOffsiteStorage = createTenureRequestObject.HasOffsiteStorage,
+                TempAccommodationInfo = createTenureRequestObject.TempAccommodationInfo.ToDatabase(),
                 FurtherAccountInformation = createTenureRequestObject.FurtherAccountInformation
             };
         }