Skip to content

Commit

Permalink
Test corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
@asanchezr
asanchezr committed Feb 10, 2024
1 parent c0378f7 commit a8d7cd5
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 17 deletions.
8 changes: 4 additions & 4 deletions source/backend/dal/Models/PropertyFilterCriteria.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,22 @@ public class PropertyFilterCriteria
/// <summary>
/// get/set - Whether or not to show core inventory properties.
/// </summary>
public bool IsCoreInventory { get; set; }
public bool IsCoreInventory { get; set; } = true;

/// <summary>
/// get/set - Whether or not to show properties of interest.
/// </summary>
public bool IsPropertyOfInterest { get; set; }
public bool IsPropertyOfInterest { get; set; } = true;

/// <summary>
/// get/set - Whether or not to show other interest properties.
/// </summary>
public bool IsOtherInterest { get; set; }
public bool IsOtherInterest { get; set; } = true;

/// <summary>
/// get/set - Whether or not to show disposed properties.
/// </summary>
public bool IsDisposed { get; set; }
public bool IsDisposed { get; set; } = false;

#endregion
}
Expand Down
18 changes: 17 additions & 1 deletion source/backend/tests/core/Entities/PropertyHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static partial class EntityHelper
/// <param name="areaUnit"></param>
/// <param name="dataSource"></param>
/// <returns></returns>
public static Entity.PimsProperty CreateProperty(int pid, int? pin = null, Entity.PimsPropertyType type = null, Entity.PimsPropertyClassificationType classification = null, Entity.PimsAddress address = null, Entity.PimsPropertyTenureType tenure = null, Entity.PimsAreaUnitType areaUnit = null, Entity.PimsDataSourceType dataSource = null, Entity.PimsPropertyStatusType status = null, Entity.PimsLease lease = null, short? regionCode = null)
public static Entity.PimsProperty CreateProperty(int pid, int? pin = null, Entity.PimsPropertyType type = null, Entity.PimsPropertyClassificationType classification = null, Entity.PimsAddress address = null, Entity.PimsPropertyTenureType tenure = null, Entity.PimsAreaUnitType areaUnit = null, Entity.PimsDataSourceType dataSource = null, Entity.PimsPropertyStatusType status = null, Entity.PimsLease lease = null, short? regionCode = null, bool? isCoreInventory = null, bool? isPointOfInterest = null, bool? isOtherInterest = null, bool? isDisposed = null)
{
type ??= EntityHelper.CreatePropertyType("Land");
classification ??= EntityHelper.CreatePropertyClassificationType("Class");
Expand All @@ -49,6 +49,22 @@ public static Entity.PimsProperty CreateProperty(int pid, int? pin = null, Entit
{
property.RegionCode = regionCode.Value;
}
if (isCoreInventory.HasValue)
{
property.IsOwned = isCoreInventory.Value;
}
if (isPointOfInterest.HasValue)
{
property.IsPropertyOfInterest = isPointOfInterest.Value;
}
if (isOtherInterest.HasValue)
{
property.IsOtherInterest = isOtherInterest.Value;
}
if (isDisposed.HasValue)
{
property.IsDisposed = isDisposed.Value;
}
return property;
}

Expand Down
24 changes: 12 additions & 12 deletions source/backend/tests/unit/dal/Repositories/PropertyRepositoryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public void GetMatchingIds_LeaseRcbvl_All_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, addProperty: false);
lease.OrigExpiryDate = DateTime.Now.AddDays(1);
property.PimsPropertyLeases.Add(new PimsPropertyLease() { PropertyId = property.Internal_Id, LeaseId = lease.Internal_Id, Lease = lease });
Expand All @@ -225,7 +225,7 @@ public void GetMatchingIds_LeaseRcbvl_NoTerms_ExpiryDate_Null()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, addProperty: false);
lease.OrigExpiryDate = null;
property.PimsPropertyLeases.Add(new PimsPropertyLease() { PropertyId = property.Internal_Id, LeaseId = lease.Internal_Id, Lease = lease });
Expand Down Expand Up @@ -263,7 +263,7 @@ public void GetMatchingIds_LeaseRcbvl_All_Success_HasTerms_Term_ExpiryDate_Null(
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, addProperty: false);
lease.OrigExpiryDate = DateTime.Now.AddDays(10);
lease.PimsLeaseTerms = new List<PimsLeaseTerm>()
Expand All @@ -289,7 +289,7 @@ public void GetMatchingIds_LeaseRcbvl_All_Success_HasTerms_Term_ExpiryDate_Futur
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, addProperty: false);
lease.OrigExpiryDate = DateTime.Now.AddDays(10);
lease.PimsLeaseTerms = new List<PimsLeaseTerm>()
Expand All @@ -316,7 +316,7 @@ public void GetMatchingIds_LeaseStatus_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, pimsLeaseStatusType: new PimsLeaseStatusType() { Id = "test2", Description = "Active", DbCreateUserid = "test", DbLastUpdateUserid = "test" }, addProperty: false);
property.PimsPropertyLeases.Add(new PimsPropertyLease() { PropertyId = property.Internal_Id, LeaseId = lease.Internal_Id, Lease = lease });
_helper.AddAndSaveChanges(property);
Expand All @@ -334,7 +334,7 @@ public void GetMatchingIds_LeaseType_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, pimsLeaseLicenseType: new PimsLeaseLicenseType() { Id = "test", Description = "Active", DbCreateUserid = "test", DbLastUpdateUserid = "test" }, addProperty: false);
property.PimsPropertyLeases.Add(new PimsPropertyLease() { PropertyId = property.Internal_Id, LeaseId = lease.Internal_Id, Lease = lease });
_helper.AddAndSaveChanges(property);
Expand All @@ -352,7 +352,7 @@ public void GetMatchingIds_LeasePurpose_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var lease = EntityHelper.CreateLease(1, pimsLeasePurposeType: new PimsLeasePurposeType() { Id = "test", Description = "Active", DbCreateUserid = "test", DbLastUpdateUserid = "test" }, addProperty: false);
property.PimsPropertyLeases.Add(new PimsPropertyLease() { PropertyId = property.Internal_Id, LeaseId = lease.Internal_Id, Lease = lease });
_helper.AddAndSaveChanges(property);
Expand All @@ -370,7 +370,7 @@ public void GetMatchingIds_Anomaly_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
property.PimsPropPropAnomalyTypes.Add(new PimsPropPropAnomalyType() { PropertyAnomalyTypeCode = "test" });
_helper.AddAndSaveChanges(property);

Expand All @@ -387,7 +387,7 @@ public void GetMatchingIds_Project_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
var file = EntityHelper.CreateAcquisitionFile(1);
file.ProjectId = 1;
property.PimsPropertyAcquisitionFiles.Add(new PimsPropertyAcquisitionFile() { AcquisitionFile = file });
Expand All @@ -406,7 +406,7 @@ public void GetMatchingIds_Tenure_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
property.PimsPropPropTenureTypes.Add(new PimsPropPropTenureType() { PropertyTenureTypeCode = "test" });
_helper.AddAndSaveChanges(property);

Expand All @@ -423,7 +423,7 @@ public void GetMatchingIds_TenureRoad_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
property.PimsPropPropRoadTypes.Add(new PimsPropPropRoadType() { PropertyRoadTypeCode = "test" });
_helper.AddAndSaveChanges(property);

Expand All @@ -440,7 +440,7 @@ public void GetMatchingIds_TenurePph_Success()
{
// Arrange
var repository = CreateRepositoryWithPermissions(Permissions.PropertyView);
var property = EntityHelper.CreateProperty(100);
var property = EntityHelper.CreateProperty(100, isCoreInventory: true);
property.PphStatusTypeCode = "test";
_helper.AddAndSaveChanges(property);

Expand Down

0 comments on commit a8d7cd5

Please sign in to comment.