Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ public static explicit operator AcquisitionFilter(AcquisitionFilterModel model)
Page = model.Page,
Quantity = model.Quantity,

Pid = model.Pid,
Pin = model.Pin,
Address = model.Address,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
Address = model.Address?.Trim(),
AcquisitionFileStatusTypeCode = model.AcquisitionFileStatusTypeCode,
AcquisitionFileNameOrNumber = model.AcquisitionFileNameOrNumber,
ProjectNameOrNumber = model.ProjectNameOrNumber,
OwnerName = model.OwnerName,
AcquisitionFileNameOrNumber = model.AcquisitionFileNameOrNumber?.Trim(),
ProjectNameOrNumber = model.ProjectNameOrNumber?.Trim(),
OwnerName = model.OwnerName?.Trim(),
AcquisitionTeamMemberPersonId = model.AcquisitionTeamMemberPersonId,
AcquisitionTeamMemberOrganizationId = model.AcquisitionTeamMemberOrganizationId,
HasNoticeOfClaim = model.HasNoticeOfClaim,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public static explicit operator ContactFilter(ContactFilterModel model)
Quantity = model.Quantity,

SearchBy = model.SearchBy,
Summary = model.Summary,
Municipality = model.Municipality,
Summary = model.Summary?.Trim(),
Municipality = model.Municipality?.Trim(),
ActiveContactsOnly = model.ActiveContactsOnly,

Sort = model.Sort,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ public static explicit operator DispositionFilter(DispositionFilterModel model)
Page = model.Page,
Quantity = model.Quantity,

Pid = model.Pid,
Pin = model.Pin,
Address = model.Address,
FileNameOrNumberOrReference = model.FileNameOrNumberOrReference,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
Address = model.Address?.Trim(),
FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(),
Comment on lines +106 to +107
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see you guard for nulls here - should be applied to all other places

Also PID/PID should be trimmed as well everywhere (this is the main source of copy/paste)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

DispositionFileStatusCode = model.DispositionFileStatusCode,
DispositionStatusCode = model.DispositionStatusCode,
DispositionTypeCode = model.DispositionTypeCode,
Expand Down
14 changes: 7 additions & 7 deletions source/backend/api/Areas/Leases/Models/LeaseFilterModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,18 +136,18 @@ public static explicit operator LeaseFilter(LeaseFilterModel model)
Page = model.Page,
Quantity = model.Quantity,

Pid = model.Pid,
Pin = model.Pin,
LFileNo = model.LFileNo,
Address = model.Address,
Historical = model.Historical,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
LFileNo = model.LFileNo?.Trim(),
Address = model.Address?.Trim(),
Historical = model.Historical?.Trim(),
LeaseStatusTypes = model.LeaseStatusTypes,
TenantName = model.TenantName,
TenantName = model.TenantName?.Trim(),
Programs = model.Programs,
ExpiryStartDate = model.ExpiryStartDate,
ExpiryEndDate = model.ExpiryEndDate,
RegionType = model.RegionType,
Details = model.Details,
Details = model.Details?.Trim(),
LeaseTeamOrganizationId = model.LeaseTeamOrganizationId,
LeaseTeamPersonId = model.LeaseTeamPersonId,
IsReceivable = model.IsReceivable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ public static explicit operator ManagementActivityFilter(ManagementActivityFilte
Page = model.Page,
Quantity = model.Quantity,

Pid = model.Pid,
Pin = model.Pin,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
RegionCode = model.RegionCode,
Address = model.Address,
FileNameOrNumberOrReference = model.FileNameOrNumberOrReference,
Address = model.Address?.Trim(),
FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(),
ActivityTypeCode = model.ActivityTypeCode,
ActivityStatusCode = model.ActivityStatusCode,
ProjectNameOrNumber = model.ProjectNameOrNumber,
ProjectNameOrNumber = model.ProjectNameOrNumber?.Trim(),
ManagementFileStatusCode = model.ManagementFileStatusCode,
ManagementFilePurposeCode = model.ManagementFilePurposeCode,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ public static explicit operator ManagementFilter(ManagementFilterModel model)
Page = model.Page,
Quantity = model.Quantity,

Pid = model.Pid,
Pin = model.Pin,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
RegionCode = model.RegionCode,
Address = model.Address,
FileNameOrNumberOrReference = model.FileNameOrNumberOrReference,
Address = model.Address?.Trim(),
FileNameOrNumberOrReference = model.FileNameOrNumberOrReference?.Trim(),
ManagementFileStatusCode = model.ManagementFileStatusCode,
ProjectNameOrNumber = model.ProjectNameOrNumber,
ProjectNameOrNumber = model.ProjectNameOrNumber?.Trim(),
ManagementFilePurposeCode = model.ManagementFilePurposeCode,
TeamMemberPersonId = model.TeamMemberPersonId,
TeamMemberOrganizationId = model.TeamMemberOrganizationId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public static explicit operator ProjectFilter(ProjectFilterModel model)
Page = model.Page,
Quantity = model.Quantity,

ProjectNumber = model.ProjectNumber,
ProjectName = model.ProjectName,
ProjectNumber = model.ProjectNumber?.Trim(),
ProjectName = model.ProjectName?.Trim(),
ProjectStatusCode = model.ProjectStatusCode,
ProjectRegionCode = model.ProjectRegionCode,

Expand Down
10 changes: 5 additions & 5 deletions source/backend/api/Areas/Property/Models/PropertyFilterModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ public static explicit operator PropertyFilter(PropertyFilterModel model)
Quantity = model.Quantity,
Sort = model.Sort,

Pid = model.Pid,
Pin = model.Pin,
Address = model.Address,
PlanNumber = model.PlanNumber,
Historical = model.Historical,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
Address = model.Address?.Trim(),
PlanNumber = model.PlanNumber?.Trim(),
Historical = model.Historical?.Trim(),
Ownership = model.Ownership,
TenureCleanup = model.TenureCleanup,
};
Expand Down
10 changes: 5 additions & 5 deletions source/backend/api/Areas/Research/Models/ResearchFilterModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ public static explicit operator ResearchFilter(ResearchFilterModel model)
{
var filter = new ResearchFilter
{
Pid = model.Pid,
Pin = model.Pin,
Pid = model.Pid?.Trim(),
Pin = model.Pin?.Trim(),
Page = model.Page,
Quantity = model.Quantity,
RegionCode = model.RegionCode,
RFileNumber = model.RFileNumber,
RFileNumber = model.RFileNumber?.Trim(),
ResearchFileStatusTypeCode = model.ResearchFileStatusTypeCode,
Name = model.Name,
RoadOrAlias = model.RoadOrAlias,
Name = model.Name?.Trim(),
RoadOrAlias = model.RoadOrAlias?.Trim(),
AppCreateUserid = model.AppCreateUserid,
CreatedOnStartDate = model.CreatedOnStartDate,
CreatedOnEndDate = model.CreatedOnEndDate,
Expand Down
2 changes: 1 addition & 1 deletion source/backend/core/Extensions/DictionaryExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public static double GetDoubleValue(this IDictionary<string, Microsoft.Extension
/// <returns></returns>
public static string GetStringValue(this IDictionary<string, Microsoft.Extensions.Primitives.StringValues> dict, string key, string defaultValue = null)
{
return dict.TryGetValue(key, out Microsoft.Extensions.Primitives.StringValues value) ? value.ToString() : defaultValue;
return dict.TryGetValue(key, out Microsoft.Extensions.Primitives.StringValues value) ? value.ToString().Trim() : defaultValue;
}

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions source/backend/entities/Models/ProjectFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ public ProjectFilter()

public ProjectFilter(string projectNumber, string projectName, string projectStatus, string projectRegion)
{
this.ProjectNumber = projectNumber;
this.ProjectName = projectName;
this.ProjectStatusCode = projectStatus;
this.ProjectRegionCode = projectRegion;
ProjectNumber = projectNumber;
ProjectName = projectName;
ProjectStatusCode = projectStatus;
ProjectRegionCode = projectRegion;
}

public string ProjectNumber { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion source/backend/ltsa/LtsaService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public async Task<OrderWrapper<OrderParent<ParcelInfo>>> PostParcelInfoOrder(str
public async Task<OrderWrapper<OrderParent<StrataPlanCommonProperty>>> PostSpcpOrder(string strataPlanNumber)
{
var url = Options.HostUri.AppendToURL(Options.OrdersEndpoint);
SpcpOrder order = new(new StrataPlanCommonPropertyOrderParameters(strataPlanNumber), productType: OrderParent<StrataPlanCommonProperty>.ProductTypeEnum.commonProperty);
SpcpOrder order = new(new StrataPlanCommonPropertyOrderParameters(strataPlanNumber.Trim()), productType: OrderParent<StrataPlanCommonProperty>.ProductTypeEnum.commonProperty);

return await PostOrderAsync<StrataPlanCommonProperty, OrderWrapper<SpcpOrder>>(url, new OrderWrapper<SpcpOrder>(order));
}
Expand Down
Loading