Merge dev into POC branch

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

@@ -62,7 +62,7 @@ public DocumentQueueController(IDocumentQueueService documentQueueService, IMapp
         [ProducesResponseType(typeof(List<DocumentTypeModel>), 200)]
         [SwaggerOperation(Tags = new[] { "document-types" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult Update(long documentQueueId, [FromBody] DocumentQueueModel documentQueue)
+        public async Task<IActionResult> Update(long documentQueueId, [FromBody] DocumentQueueModel documentQueue)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
@@ -77,7 +77,7 @@ public IActionResult Update(long documentQueueId, [FromBody] DocumentQueueModel
                 throw new BadRequestException("Invalid document queue id.");
             }
 
-            var queuedDocuments = _documentQueueService.Update(_mapper.Map<PimsDocumentQueue>(documentQueue));
+            var queuedDocuments = await _documentQueueService.Update(_mapper.Map<PimsDocumentQueue>(documentQueue));
             var updatedDocumentQueue = _mapper.Map<DocumentQueueModel>(queuedDocuments);
             return new JsonResult(updatedDocumentQueue);
         }

source/backend/api/Areas/Tools/Controllers/GeocoderController.cs

@@ -63,7 +63,7 @@ public GeocoderController(IGeocoderService geocoderService, IMapper mapper)
         [HasPermission(Permissions.PropertyEdit)]
         public async Task<IActionResult> FindAddressesAsync(string address)
         {
-            var parameters = this.Request.QueryString.ParseQueryString<AddressesParameters>();
+            var parameters = Request.QueryString.ParseQueryString<AddressesParameters>();
             parameters.AddressString = address;
             var result = await _geocoderService.GetSiteAddressesAsync(parameters);
             return new JsonResult(_mapper.Map<GeoAddressResponse[]>(result.Features));
@@ -99,7 +99,7 @@ public async Task<IActionResult> FindPidsAsync(Guid siteId)
         [HasPermission(Permissions.PropertyEdit)]
         public async Task<IActionResult> FindNearestAddressAsync(string point)
         {
-            var parameters = this.Request.QueryString.ParseQueryString<NearestParameters>();
+            var parameters = Request.QueryString.ParseQueryString<NearestParameters>();
             parameters.Point = point;
             var result = await _geocoderService.GetNearestSiteAsync(parameters);
             return new JsonResult(_mapper.Map<GeoAddressResponse>(result));
@@ -118,7 +118,7 @@ public async Task<IActionResult> FindNearestAddressAsync(string point)
         [HasPermission(Permissions.PropertyEdit)]
         public async Task<IActionResult> FindNearAddressesAsync(string point)
         {
-            var parameters = this.Request.QueryString.ParseQueryString<NearParameters>();
+            var parameters = Request.QueryString.ParseQueryString<NearParameters>();
             parameters.Point = point;
             var result = await _geocoderService.GetNearSitesAsync(parameters);
             return new JsonResult(_mapper.Map<GeoAddressResponse[]>(result.Features));

source/backend/api/Areas/Tools/Controllers/LtsaController.cs

@@ -134,17 +134,17 @@ public async Task<IActionResult> PostParcelInfoOrderAsync(string pid)
         }
 
         /// <summary>
-        /// Post a new order using default parameters and the passed in titleNumber.
+        /// Post a new order using default parameters and the passed in strataPlanNumber.
         /// </summary>
         /// <param name="strataPlanNumber">the title number to create the order for.</param>
         /// <returns>The order created within LTSA.</returns>
         [HttpPost("order/spcp")]
         [Produces("application/json")]
         [ProducesResponseType(typeof(Model.OrderWrapper<Model.SpcpOrder>), 200)]
-        [ProducesResponseType(typeof(Pims.Api.Models.ErrorResponseModel), 400)]
+        [ProducesResponseType(typeof(Models.ErrorResponseModel), 400)]
         [SwaggerOperation(Tags = new[] { "tools-ltsa" })]
         [HasPermission(Permissions.PropertyView)]
-        public async Task<IActionResult> PostSpcpOrderAsync(string strataPlanNumber)
+        public async Task<IActionResult> PostSpcpOrderAsync([FromQuery]string strataPlanNumber)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
@@ -154,6 +154,7 @@ public async Task<IActionResult> PostSpcpOrderAsync(string strataPlanNumber)
                 DateTime.Now);
 
             var result = await _ltsaService.PostSpcpOrder(strataPlanNumber);
+
             return new JsonResult(result?.Order);
         }
 

source/backend/api/Pims.Api.csproj

@@ -2,11 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.11.0-106.2</Version>
+    <Version>5.11.0-106.25</Version>
     <AssemblyVersion>5.11.0.106</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>{16BC0468-78F6-4C91-87DA-7403C919E646}</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
   </PropertyGroup>
   <ItemGroup>
     <None Remove=".env" />
@@ -17,6 +19,7 @@
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="7.0.0" />
     <PackageReference Include="AspNetCore.HealthChecks.UI" Version="7.0.2" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
     <PackageReference Include="DotNetEnv" Version="2.5.0" />
     <PackageReference Include="Mapster" Version="7.4.0" />
     <PackageReference Include="Mapster.DependencyInjection" Version="1.0.1" />

source/backend/api/Repositories/Mayan/MayanDocumentRepository.cs

@@ -257,8 +257,9 @@ public async Task<ExternalResponse<DocumentDetailModel>> TryUploadDocumentAsync(
             string authenticationToken = await _authRepository.GetTokenAsync();
 
             byte[] fileData;
-            using var byteReader = new BinaryReader(file.OpenReadStream());
-            fileData = byteReader.ReadBytes((int)file.OpenReadStream().Length);
+            using Stream stream = file.OpenReadStream();
+            using var byteReader = new BinaryReader(stream);
+            fileData = byteReader.ReadBytes((int)stream.Length);
 
             // Add the file data to the content
             using ByteArrayContent fileBytes = new(fileData);