psp-7598 | Properties list view filter by ownership

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

@@ -8,6 +8,7 @@
 using Pims.Api.Helpers.Exceptions;
 using Pims.Api.Helpers.Extensions;
 using Pims.Api.Models.Base;
+using Pims.Api.Models.Concepts.Property;
 using Pims.Api.Policies;
 using Pims.Dal.Entities.Models;
 using Pims.Dal.Repositories;
@@ -57,7 +58,7 @@ public SearchController(IPropertyRepository propertyRepository, IMapper mapper)
         [HttpGet]
         [HasPermission(Permissions.PropertyView)]
         [Produces("application/json")]
-        [ProducesResponseType(typeof(PageModel<Models.Search.PropertyModel>), 200)]
+        [ProducesResponseType(typeof(PageModel<PropertyModel>), 200)]
         [SwaggerOperation(Tags = new[] { "property" })]
         public IActionResult GetProperties()
         {
@@ -74,7 +75,7 @@ public IActionResult GetProperties()
         [HttpPost("filter")]
         [HasPermission(Permissions.PropertyView)]
         [Produces("application/json")]
-        [ProducesResponseType(typeof(PageModel<Models.Search.PropertyModel>), 200)]
+        [ProducesResponseType(typeof(PageModel<PropertyModel>), 200)]
         [SwaggerOperation(Tags = new[] { "property" })]
         public IActionResult GetProperties([FromBody] PropertyFilterModel filter)
         {
@@ -85,7 +86,7 @@ public IActionResult GetProperties([FromBody] PropertyFilterModel filter)
             }
 
             var page = _propertyRepository.GetPage((PropertyFilter)filter);
-            var result = _mapper.Map<PageModel<Models.Search.PropertyModel>>(page);
+            var result = _mapper.Map<PageModel<PropertyModel>>(page);
             return new JsonResult(result);
         }
 

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Pims.Core.Extensions;
 using Pims.Dal.Entities.Models;
 
@@ -27,6 +28,11 @@ public class PropertyFilterModel : PageFilter
         /// </summary>
         public string PlanNumber { get; set; }
 
+        /// <summary>
+        /// get/set - The property ownership status.
+        /// </summary>
+        public IList<string> Ownership { get; set; }
+
         #endregion
 
         #region Constructors
@@ -49,10 +55,32 @@ public PropertyFilterModel(Dictionary<string, Microsoft.Extensions.Primitives.St
             var filter = new Dictionary<string, Microsoft.Extensions.Primitives.StringValues>(query, StringComparer.OrdinalIgnoreCase);
 
             this.Sort = filter.GetStringArrayValue(nameof(this.Sort));
+            var tempSort = this.Sort.ToList();
+
+            // Convert sort to db format
+            for (int i = 0; i < this.Sort.Length; i++)
+            {
+                if (tempSort[i].StartsWith("Location"))
+                {
+                    tempSort[i] = tempSort[i].Replace("Location", "Address.MunicipalityName");
+                }
+                if (tempSort[i].StartsWith("Ownership"))
+                {
+                    // The order will affect the display in the frontend. For now in alphabetical order.
+                    // i.e. [Core Inventory, Disposed, Other Interest, Property of Interest]
+                    var direction = this.Sort[i].Split(' ')[1];
+                    tempSort[i] = this.Sort[i].Replace("Ownership", "IsOwned");
+                    tempSort.Add($"IsDisposed {direction}");
+                    tempSort.Add($"IsOtherInterest {direction}");
+                    tempSort.Add($"IsPropertyOfInterest {direction}");
+                }
+            }
+            this.Sort = tempSort.ToArray();
 
             this.PinOrPid = filter.GetStringValue(nameof(this.PinOrPid));
             this.Address = filter.GetStringValue(nameof(this.Address));
             this.PlanNumber = filter.GetStringValue(nameof(this.PlanNumber));
+            this.Ownership = filter.GetStringArrayValue(nameof(this.Ownership));
         }
         #endregion
 
@@ -73,6 +101,7 @@ public static explicit operator PropertyFilter(PropertyFilterModel model)
                 PinOrPid = model.PinOrPid,
                 Address = model.Address,
                 PlanNumber = model.PlanNumber,
+                Ownership = model.Ownership,
             };
 
             return filter;