UAT Release 6.1

source/backend/api/Areas/Acquisition/Models/AcquisitionFilterModel.cs

@@ -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,

source/backend/api/Areas/Contacts/Models/Search/ContactFilterModel.cs

@@ -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,

source/backend/api/Areas/Disposition/Models/DispositionFilterModel.cs

@@ -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(),
                 DispositionFileStatusCode = model.DispositionFileStatusCode,
                 DispositionStatusCode = model.DispositionStatusCode,
                 DispositionTypeCode = model.DispositionTypeCode,

source/backend/api/Areas/Documents/SearchController.cs

@@ -13,6 +13,7 @@
 using Pims.Core.Extensions;
 using Pims.Core.Json;
 using Pims.Core.Security;
+using Pims.Dal.Entities;
 using Swashbuckle.AspNetCore.Annotations;
 
 namespace Pims.Api.Areas.Documents
@@ -29,12 +30,14 @@ namespace Pims.Api.Areas.Documents
     public class SearchController : ControllerBase
     {
         private readonly IDocumentService _documentService;
+        private readonly IPropertyService _propertyService;
         private readonly IMapper _mapper;
         private readonly ILogger _logger;
 
-        public SearchController(IDocumentService documentService, IMapper mapper, ILogger<SearchController> logger)
+        public SearchController(IDocumentService documentService, IPropertyService propertyService, IMapper mapper, ILogger<SearchController> logger)
         {
             _documentService = documentService;
+            _propertyService = propertyService;
             _mapper = mapper;
             _logger = logger;
         }
@@ -70,7 +73,36 @@ public IActionResult GetDocuments([FromQuery] DocumentSearchFilterModel filter)
             _logger.LogInformation("Dispatching to service: {Service}", _documentService.GetType());
             var documents = _documentService.GetPage(filter);
 
+            // Transform all properties to lat/long for returned documents that have properties, this is required for the front end to properly display the property locations.
+            foreach (var document in documents.Items)
+            {
+                var propertyDocuments = document.PimsPropertyDocuments ?? new List<PimsPropertyDocument>();
+                document.PimsPropertyDocuments = TransformAllPropertiesToLatLong(propertyDocuments);
+            }
+
             return new JsonResult(_mapper.Map<PageModel<DocumentSearchResultModel>>(documents));
         }
+
+        /// <summary>
+        /// Returns the spatial location and boundary polygons in lat/long (4326) for a list of document properties.
+        /// The spatial values will be modified in-place.
+        /// </summary>
+        /// <param name="propertyDocuments">The document properties to re-project.</param>
+        /// <returns>The document properties with transformed spatial locations.</returns>
+        private ICollection<PimsPropertyDocument> TransformAllPropertiesToLatLong(ICollection<PimsPropertyDocument> propertyDocuments)
+        {
+            if (propertyDocuments == null)
+            {
+                return propertyDocuments;
+            }
+
+            foreach (var propertyDocument in propertyDocuments)
+            {
+                propertyDocument.Property = _propertyService.TransformPropertyToLatLong(propertyDocument.Property);
+            }
+
+            return propertyDocuments;
+        }
+
     }
 }

source/backend/api/Areas/Leases/Models/LeaseFilterModel.cs

@@ -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,

source/backend/api/Areas/Management/ActivitySearchController.cs

@@ -58,7 +58,7 @@ public ActivitySearchController(IManagementActivityService managementActivitySer
         [HttpGet]
         [HasPermission(Permissions.ManagementView)]
         [Produces("application/json")]
-        [ProducesResponseType(typeof(IEnumerable<ManagementActivityFilterModel>), 200)]
+        [ProducesResponseType(typeof(IEnumerable<ManagementActivityModel>), 200)]
         [ProducesResponseType(typeof(Api.Models.ErrorResponseModel), 400)]
         [SwaggerOperation(Tags = new[] { "management-activities" })]
         [TypeFilter(typeof(NullJsonResultFilter))]

source/backend/api/Areas/Management/Models/ManagementActivityFilterModel.cs

@@ -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,
 

source/backend/api/Areas/Management/Models/ManagementFilterModel.cs

@@ -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,

source/backend/api/Areas/Projects/Models/ProjectFilterModel.cs

@@ -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,
 

source/backend/api/Areas/Property/Controllers/PropertyTenureCleanupController.cs

@@ -60,12 +60,12 @@ ILogger<PropertyTenureCleanupController> logger
         [ProducesResponseType(typeof(IEnumerable<PropertyTenureCleanupModel>), 200)]
         [SwaggerOperation(Tags = new[] { "property" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult GetHistoricalNumbersForPropertyId(long propertyId)
+        public IActionResult GetTenureCleanupsForPropertyId(long propertyId)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
                 nameof(PropertyTenureCleanupController),
-                nameof(GetHistoricalNumbersForPropertyId),
+                nameof(GetTenureCleanupsForPropertyId),
                 User.GetUsername(),
                 DateTime.Now
             );

source/backend/api/Areas/Property/Models/PropertyFilterModel.cs

@@ -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,
             };

source/backend/api/Areas/Reports/Controllers/LeaseController.cs

@@ -39,7 +39,6 @@ public class LeaseController : ControllerBase
         private readonly ILookupRepository _lookupRepository;
         private readonly ILeaseService _leaseService;
         private readonly ILeaseReportsService _leaseReportService;
-        private readonly ILeasePaymentService _leasePaymentService;
         private readonly IMapper _mapper;
         private readonly IWebHostEnvironment _webHostEnvironment;
         #endregion
@@ -52,15 +51,13 @@ public class LeaseController : ControllerBase
         /// <param name="lookupRepository"></param>
         /// <param name="leaseService"></param>
         /// <param name="leaseReportService"></param>
-        /// <param name="leasePaymentService"></param>
         /// <param name="webHostEnvironment"></param>
         /// <param name="mapper"></param>
-        public LeaseController(ILookupRepository lookupRepository, ILeaseService leaseService, ILeaseReportsService leaseReportService, ILeasePaymentService leasePaymentService, IWebHostEnvironment webHostEnvironment, IMapper mapper)
+        public LeaseController(ILookupRepository lookupRepository, ILeaseService leaseService, ILeaseReportsService leaseReportService, IWebHostEnvironment webHostEnvironment, IMapper mapper)
         {
             _lookupRepository = lookupRepository;
             _leaseService = leaseService;
             _leaseReportService = leaseReportService;
-            _leasePaymentService = leasePaymentService;
             _mapper = mapper;
             _webHostEnvironment = webHostEnvironment;
         }

source/backend/api/Areas/Reports/Controllers/ManagementActivityController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -13,6 +14,7 @@
 using Pims.Core.Api.Policies;
 using Pims.Core.Extensions;
 using Pims.Core.Security;
+using Pims.Dal.Entities;
 using Pims.Dal.Entities.Models;
 using Swashbuckle.AspNetCore.Annotations;
 
@@ -30,11 +32,13 @@ namespace Pims.Api.Areas.Reports.Controllers
     public class ManagementActivityController : ControllerBase
     {
         private readonly IManagementActivityService _managementActivityService;
+        private readonly IPropertyService _propertyService;
         private readonly ILogger _logger;
 
-        public ManagementActivityController(IManagementActivityService managementActivityService, ILogger<ManagementActivityController> logger)
+        public ManagementActivityController(IManagementActivityService managementActivityService, IPropertyService propertyService, ILogger<ManagementActivityController> logger)
         {
             _managementActivityService = managementActivityService;
+            _propertyService = propertyService;
             _logger = logger;
         }
 
@@ -78,6 +82,13 @@ public IActionResult ExportManagementActivitiesOverview([FromBody] ManagementAct
                 return NoContent();
             }
 
+            // Transform all properties to lat/long for returned activities that have properties, this is required for the front end to properly display the property locations.
+            foreach (var activity in allManagementActivities)
+            {
+                var activityProperties = activity.PimsManagementActivityProperties ?? new List<PimsManagementActivityProperty>();
+                activity.PimsManagementActivityProperties = TransformAllPropertiesToLatLong(activityProperties);
+            }
+
             var reportActivities = allManagementActivities.Select(a => new ManagementActivityOverviewReportModel(a));
 
             return ReportHelper.GenerateExcel(reportActivities, "Management Activities Overview");
@@ -123,9 +134,37 @@ public IActionResult ExportManagementActivityInvoices([FromBody] ManagementActiv
                 return NoContent();
             }
 
+            // Transform all properties to lat/long for returned invoices that have properties, this is required for the front end to properly display the property locations.
+            foreach (var invoice in allInvoices)
+            {
+                var activityProperties = invoice.ManagementActivity.PimsManagementActivityProperties ?? new List<PimsManagementActivityProperty>();
+                invoice.ManagementActivity.PimsManagementActivityProperties = TransformAllPropertiesToLatLong(activityProperties);
+            }
+
             var reportInvoices = allInvoices.Select(i => new ManagementActivityInvoicesReportModel(i));
 
             return ReportHelper.GenerateExcel(reportInvoices, "Management Activity Invoices");
         }
+
+        /// <summary>
+        /// Returns the spatial location and boundary polygons in lat/long (4326) for a list of activity properties.
+        /// The spatial values will be modified in-place.
+        /// </summary>
+        /// <param name="activityProperties">The activity properties to re-project.</param>
+        /// <returns>The activity properties with transformed spatial locations.</returns>
+        private ICollection<PimsManagementActivityProperty> TransformAllPropertiesToLatLong(ICollection<PimsManagementActivityProperty> activityProperties)
+        {
+            if (activityProperties == null)
+            {
+                return activityProperties;
+            }
+
+            foreach (var activityProperty in activityProperties)
+            {
+                activityProperty.Property = _propertyService.TransformPropertyToLatLong(activityProperty.Property);
+            }
+
+            return activityProperties;
+        }
     }
 }