Skip to content
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

TS-1921 Add support for IsPartOfTemporaryAccommodationBlock flag in AssetManagement #158

Merged
merged 3 commits into from
Jan 29, 2025
Merged

TS-1921 Add support for IsPartOfTemporaryAccommodationBlock flag in AssetManagement #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2ddc36
add support for IsPartOfTemporaryAccommodationBlock in AssetManagement
LBHTKarki Jan 24, 2025
f660565
improve ta validation
LBHTKarki Jan 24, 2025
f9da672
update asset shared to version 0.44.0
LBHTKarki Jan 29, 2025
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
2 changes: 1 addition & 1 deletion AssetInformationApi.Tests/AssetInformationApi.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="Hackney.Core.Testing.DynamoDb" Version="1.57.0" />
<PackageReference Include="Hackney.Core.Testing.Shared" Version="1.66.0" />
<PackageReference Include="Hackney.Core.Testing.Sns" Version="1.71.0" />
<PackageReference Include="Hackney.Shared.Asset" Version="0.42" />
<PackageReference Include="Hackney.Shared.Asset" Version="0.44.0" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
115 changes: 115 additions & 0 deletions AssetInformationApi.Tests/V1/Boundary/Request/Validation/AddAssetRequestValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,121 @@ public void RequestShouldErrorWhenIsTemporaryAccommodationBlockIsTrueAndTemporar
result.ShouldHaveValidationErrorFor(x => x.AssetManagement.TemporaryAccommodationParentAssetId);
result.Errors.Any(x => x.ErrorMessage == expectedErrorMessage).Should().BeTrue();
}

[Fact]
public void RequestShouldErrorWhenIsPartOfTemporaryAccommodationBlockIsTrueAndTemporaryAccommodationParentAssetIdIsNull()
{
var assetmanagement = new Hackney.Shared.Asset.Domain.AssetManagement()
{
IsTemporaryAccomodation = true,
IsTemporaryAccommodationBlock = false,
IsPartOfTemporaryAccommodationBlock = true,
TemporaryAccommodationParentAssetId = null,
};

var assetAddress = _fixture.Create<Hackney.Shared.Asset.Domain.AssetAddress>();

var model = new AddAssetRequest()
{
Id = Guid.NewGuid(),
AssetAddress = assetAddress,
AssetManagement = assetmanagement,
};

var expectedErrorMessage = "TemporaryAccommodationParentAssetId cannot be null when IsPartOfTemporaryAccommodationBlock is true";

var result = _sut.TestValidate(model);

result.ShouldHaveValidationErrorFor(x => x.AssetManagement.TemporaryAccommodationParentAssetId);
result.Errors.Any(x => x.ErrorMessage == expectedErrorMessage).Should().BeTrue();
}

[Fact]
public void RequestShouldErrorWhenIsPartOfTemporaryAccommodationBlockIsTrueAndIsTemporaryAccommodationBlockIsTrue()
{
var assetManagement = new Hackney.Shared.Asset.Domain.AssetManagement()
{
IsTemporaryAccomodation = true,
IsTemporaryAccommodationBlock = true,
IsPartOfTemporaryAccommodationBlock = true,
TemporaryAccommodationParentAssetId = null,
};

var assetAddress = _fixture.Create<Hackney.Shared.Asset.Domain.AssetAddress>();

var model = new AddAssetRequest()
{
Id = Guid.NewGuid(),
AssetAddress = assetAddress,
AssetManagement = assetManagement,
};

var expectedErrorMessage = "IsPartOfTemporaryAccommodationBlock cannot be true when IsTemporaryAccommodationBlock is true";

var result = _sut.TestValidate(model);

result.ShouldHaveValidationErrorFor(x => x.AssetManagement.IsPartOfTemporaryAccommodationBlock);
result.Errors.Any(x => x.ErrorMessage == expectedErrorMessage).Should().BeTrue();
}

[Fact]
public void RequestShouldNotHaveErrorsWhenIsTemporaryAccommodationBlockIsTrueAndIsPartOfTemporaryAccommodationBlockIsNull()
{

var assetManagement = new Hackney.Shared.Asset.Domain.AssetManagement()
{
IsTemporaryAccomodation = true,
IsTemporaryAccommodationBlock = true,
TemporaryAccommodationParentAssetId = null,
};

var assetAddress = _fixture.Create<Hackney.Shared.Asset.Domain.AssetAddress>();

var model = new AddAssetRequest()
{
Id = Guid.NewGuid(),
AssetAddress = assetAddress,
AssetManagement = assetManagement,
};

var result = _sut.TestValidate(model);

result.ShouldNotHaveValidationErrorFor(x => x.AssetManagement.IsPartOfTemporaryAccommodationBlock);
}

[Theory]
[InlineData(false)]
[InlineData(null)]
public void RequestShouldErrorWhenTASpecificPropertiesAreSetForNonTAAsset(bool? isTemporaryAccommodation)
{
var assetManagement = new Hackney.Shared.Asset.Domain.AssetManagement()
{
IsTemporaryAccomodation = isTemporaryAccommodation,
IsTemporaryAccommodationBlock = true,
IsPartOfTemporaryAccommodationBlock = true,
TemporaryAccommodationParentAssetId = Guid.NewGuid(),
};

var assetAddress = _fixture.Create<Hackney.Shared.Asset.Domain.AssetAddress>();

var model = new AddAssetRequest()
{
Id = Guid.NewGuid(),
AssetAddress = assetAddress,
AssetManagement = assetManagement,
};

var expectedErrorMessageForIsTemporaryAccommodationBlock = "IsTemporaryAccommodationBlock cannot be true when IsTemporaryAccomodation is false";
var expectedErrorMessageForIsPartOfTemporaryAccommodationBlock = "IsPartOfTemporaryAccommodationBlock cannot be true when IsTemporaryAccomodation is false";
var expectedErrorMessageForTemporaryAccommodationParentAssetId = "TemporaryAccommodationParentAssetId must be null when IsTemporaryAccomodation is false";

var result = _sut.TestValidate(model);

result.ShouldHaveValidationErrorFor(x => x.AssetManagement.IsTemporaryAccommodationBlock);
result.Errors.Any(x => x.ErrorMessage == expectedErrorMessageForIsTemporaryAccommodationBlock).Should().BeTrue();
result.Errors.Any(x => x.ErrorMessage == expectedErrorMessageForIsPartOfTemporaryAccommodationBlock).Should().BeTrue();
result.Errors.Any(x => x.ErrorMessage == expectedErrorMessageForTemporaryAccommodationParentAssetId).Should().BeTrue();
}
#endregion
}
}
2 changes: 1 addition & 1 deletion AssetInformationApi/AssetInformationApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageReference Include="Hackney.Core.Sns" Version="1.52.0" />
<PackageReference Include="Hackney.Core.Validation" Version="1.56.0" />
<PackageReference Include="Hackney.Core.Validation.AspNet" Version="1.53.0" />
<PackageReference Include="Hackney.Shared.Asset" Version="0.42" />
<PackageReference Include="Hackney.Shared.Asset" Version="0.44.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
Expand Down
27 changes: 27 additions & 0 deletions AssetInformationApi/V1/Boundary/Request/Validation/AddAssetRequestValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,34 @@ public AddAssetRequestValidator()
.Null()
.When(x => x.AssetManagement.IsTemporaryAccommodationBlock == true)
.WithMessage("Temporary accommodation block cannot have TemporaryAccommodationParentAssetId");

RuleFor(x => x.AssetManagement.TemporaryAccommodationParentAssetId)
.NotNull()
.When(x => x.AssetManagement.IsPartOfTemporaryAccommodationBlock == true)
.WithMessage("TemporaryAccommodationParentAssetId cannot be null when IsPartOfTemporaryAccommodationBlock is true");

RuleFor(x => x.AssetManagement.IsPartOfTemporaryAccommodationBlock)
.Must(x => x == false || x == null)
.When(x => x.AssetManagement.IsTemporaryAccommodationBlock == true)
.WithMessage("IsPartOfTemporaryAccommodationBlock cannot be true when IsTemporaryAccommodationBlock is true");

When(x => x.AssetManagement.IsTemporaryAccomodation == false || x.AssetManagement.IsTemporaryAccomodation == null, () =>
{
RuleFor(x => x.AssetManagement.IsTemporaryAccommodationBlock)
.Must(x => x == false)
.WithMessage("IsTemporaryAccommodationBlock cannot be true when IsTemporaryAccomodation is false");

RuleFor(x => x.AssetManagement.IsPartOfTemporaryAccommodationBlock)
.Must(x => x == false)
.WithMessage("IsPartOfTemporaryAccommodationBlock cannot be true when IsTemporaryAccomodation is false");

RuleFor(x => x.AssetManagement.TemporaryAccommodationParentAssetId)
.Null()
.WithMessage("TemporaryAccommodationParentAssetId must be null when IsTemporaryAccomodation is false");
});
});


}
}
}