Update 5.6 with latest dev.

etl/PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs/PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs.dtproj.user

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataTransformationsUserConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Configurations>
+    <Configuration>
+      <Name>Development</Name>
+      <Options>
+        <AssessmentRuleSuppressionSetting />
+        <UseWinAuth>false</UseWinAuth>
+        <WinAuthUserName />
+        <WinAuthDomain />
+        <ServerName>ssistst.th.gov.bc.ca</ServerName>
+        <PathOnServer>/SSISDB/PIMS_TST/PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs</PathOnServer>
+        <UserIDs />
+        <UserPasswords />
+        <OfflineMode>false</OfflineMode>
+        <ProgressReporting>true</ProgressReporting>
+        <ParameterConfigurationSensitiveValues>
+          <ConfigurationSetting>
+            <Id>LastModifiedTime</Id>
+            <Name>LastModifiedTime</Name>
+            <Value xsi:type="xsd:dateTime">2024-08-06T21:23:40.864741Z</Value>
+          </ConfigurationSetting>
+        </ParameterConfigurationSensitiveValues>
+      </Options>
+    </Configuration>
+  </Configurations>
+</DataTransformationsUserConfiguration>

etl/PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs/PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.34729.46
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{C9674DCB-5085-4A16-B785-4C70DD1589BD}") = "PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs", "PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs.dtproj", "{CC2C02AD-C5BE-401E-84A8-E6FE4C4F3C6F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Development|Default = Development|Default
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CC2C02AD-C5BE-401E-84A8-E6FE4C4F3C6F}.Development|Default.ActiveCfg = Development
+		{CC2C02AD-C5BE-401E-84A8-E6FE4C4F3C6F}.Development|Default.Build.0 = Development
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EAEE040D-0140-4DF4-B040-43B62E31004A}
+	EndGlobalSection
+EndGlobal

etl/PIMS_PROPERTY_FIX_DUPLICATE_ADDRESSIDs/Project.params

@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<SSIS:Parameters xmlns:SSIS="www.microsoft.com/SqlServer/SSIS" />

source/backend/api/Areas/Acquisition/Controllers/AcquisitionFileController.cs

@@ -224,76 +224,6 @@ public IActionResult GetAcquisitionTeamMembers()
             return new JsonResult(_mapper.Map<IEnumerable<AcquisitionFileTeamModel>>(team));
         }
 
-        /// <summary>
-        /// Get all the compensations corresponding to the passed file id.
-        /// </summary>
-        /// <param name="id">The file to retrieve compensations for.</param>
-        /// <returns></returns>
-        [HttpGet("{id:long}/compensation-requisitions")]
-        [HasPermission(Permissions.CompensationRequisitionView)]
-        [Produces("application/json")]
-        [ProducesResponseType(typeof(List<CompensationRequisitionModel>), 200)]
-        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
-        [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult GetFileCompensations(long id)
-        {
-            var pimsCompensations = _acquisitionService.GetAcquisitionCompensations(id);
-            var compensations = _mapper.Map<List<CompensationRequisitionModel>>(pimsCompensations);
-            return new JsonResult(compensations);
-        }
-
-        /// <summary>
-        /// Gets all the compensation requisition financials for an acq file.
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("{id:long}/comp-req-h120s")]
-        [Produces("application/json")]
-        [ProducesResponseType(typeof(IEnumerable<CompensationFinancialModel>), 200)]
-        [SwaggerOperation(Tags = new[] { "comp-req-h120s" })]
-        [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult GetFileCompReqH120(long id, bool? finalOnly)
-        {
-            _logger.LogInformation(
-                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
-                nameof(AcquisitionFileController),
-                nameof(GetFileCompReqH120),
-                User.GetUsername(),
-                DateTime.Now);
-            _logger.LogInformation("Dispatching to service: {Service}", _compReqFinancialService.GetType());
-
-            var h120s = _compReqFinancialService.GetAllByAcquisitionFileId(id, finalOnly);
-
-            return new JsonResult(_mapper.Map<IEnumerable<CompensationFinancialModel>>(h120s));
-        }
-
-        /// <summary>
-        /// Add a Compensation Requisition to an Acquisition File.
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="compensationRequisition"></param>
-        /// <returns></returns>
-        [HttpPost("{id:long}/compensation-requisitions")]
-        [HasPermission(Permissions.CompensationRequisitionAdd)]
-        [Produces("application/json")]
-        [ProducesResponseType(typeof(CompensationRequisitionModel), 201)]
-        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
-        [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult AddCompensationRequisition([FromRoute] long id, [FromBody] CompensationRequisitionModel compensationRequisition)
-        {
-            _logger.LogInformation(
-                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
-                nameof(AcquisitionFileController),
-                nameof(AddCompensationRequisition),
-                User.GetUsername(),
-                DateTime.Now);
-            _logger.LogInformation($"Dispatching to service: {_acquisitionService.GetType()}");
-
-            var compensationReqEntity = _mapper.Map<PimsCompensationRequisition>(compensationRequisition);
-            var newCompensationRequisition = _acquisitionService.AddCompensationRequisition(id, compensationReqEntity);
-
-            return new JsonResult(_mapper.Map<CompensationRequisitionModel>(newCompensationRequisition));
-        }
-
         /// <summary>
         /// Get all Expropriation Payments from the Acquisition File.
         /// </summary>

source/backend/api/Areas/CompensationRequisition/Controllers/CompensationRequisitionController.cs

@@ -5,12 +5,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Pims.Api.Helpers.Exceptions;
+using Pims.Api.Models.CodeTypes;
 using Pims.Api.Models.Concepts.AcquisitionFile;
 using Pims.Api.Models.Concepts.CompensationRequisition;
+using Pims.Api.Models.Concepts.Lease;
 using Pims.Api.Policies;
 using Pims.Api.Services;
 using Pims.Core.Extensions;
 using Pims.Core.Json;
+using Pims.Dal.Entities;
 using Pims.Dal.Security;
 using Swashbuckle.AspNetCore.Annotations;
 
@@ -64,13 +67,35 @@ public IActionResult GetCompensationRequisitionById([FromRoute] long id)
             return new JsonResult(_mapper.Map<CompensationRequisitionModel>(compensationRequisition));
         }
 
-        [HttpPut("{id:long}")]
+        [HttpPost("{fileType}")]
+        [HasPermission(Permissions.CompensationRequisitionAdd)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(CompensationRequisitionModel), 201)]
+        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult AddFileCompensationRequisition([FromRoute] FileTypes fileType, [FromBody] CompensationRequisitionModel compensationRequisition)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(CompensationRequisitionController),
+                nameof(AddFileCompensationRequisition),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation($"Dispatching to service: {_compensationRequisitionService.GetType()}");
+
+            var compensationReqEntity = _mapper.Map<PimsCompensationRequisition>(compensationRequisition);
+            var newCompensationRequisition = _compensationRequisitionService.AddCompensationRequisition(fileType, compensationReqEntity);
+
+            return new JsonResult(_mapper.Map<CompensationRequisitionModel>(newCompensationRequisition));
+        }
+
+        [HttpPut("{fileType}/{id:long}")]
         [HasPermission(Permissions.CompensationRequisitionEdit)]
         [Produces("application/json")]
         [ProducesResponseType(typeof(CompensationRequisitionModel), 200)]
         [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult UpdateCompensationRequisition([FromRoute] long id, [FromBody] CompensationRequisitionModel compensationRequisition)
+        public IActionResult UpdateCompensationRequisition([FromRoute] FileTypes fileType, [FromRoute] long id, [FromBody] CompensationRequisitionModel compensationRequisition)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
@@ -85,33 +110,54 @@ public IActionResult UpdateCompensationRequisition([FromRoute] long id, [FromBod
                 throw new BadRequestException("Invalid compensationRequisitionId.");
             }
 
-            var compensationReqEntity = _mapper.Map<Dal.Entities.PimsCompensationRequisition>(compensationRequisition);
-            var compensation = _compensationRequisitionService.Update(compensationReqEntity);
+            var compensationReqEntity = _mapper.Map<PimsCompensationRequisition>(compensationRequisition);
+            var compensation = _compensationRequisitionService.Update(fileType, compensationReqEntity);
 
             return new JsonResult(_mapper.Map<CompensationRequisitionModel>(compensation));
         }
 
-        [HttpGet("{id:long}/properties")]
+        [HttpGet("acquisition/{id:long}/properties")]
         [HasPermission(Permissions.CompensationRequisitionView)]
         [Produces("application/json")]
         [ProducesResponseType(typeof(IEnumerable<AcquisitionFilePropertyModel>), 200)]
         [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult GetCompensationRequisitionProperties([FromRoute] long id)
+        public IActionResult GetAcquisitionCompensationRequisitionProperties([FromRoute] long id)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
                 nameof(CompensationRequisitionController),
-                nameof(GetCompensationRequisitionProperties),
+                nameof(GetAcquisitionCompensationRequisitionProperties),
                 User.GetUsername(),
                 DateTime.Now);
             _logger.LogInformation("Dispatching to service: {Service}", _compensationRequisitionService.GetType());
 
-            var compensationReqProperties = _compensationRequisitionService.GetProperties(id);
+            var compensationReqProperties = _compensationRequisitionService.GetAcquisitionProperties(id);
 
             return new JsonResult(_mapper.Map<IEnumerable<AcquisitionFilePropertyModel>>(compensationReqProperties));
         }
 
+        [HttpGet("lease/{id:long}/properties")]
+        [HasPermission(Permissions.CompensationRequisitionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(IEnumerable<PropertyLeaseModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetLeaseCompensationRequisitionProperties([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(CompensationRequisitionController),
+                nameof(GetLeaseCompensationRequisitionProperties),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation("Dispatching to service: {Service}", _compensationRequisitionService.GetType());
+
+            var compensationReqProperties = _compensationRequisitionService.GetLeaseProperties(id);
+
+            return new JsonResult(_mapper.Map<IEnumerable<PropertyLeaseModel>>(compensationReqProperties));
+        }
+
         /// <summary>
         /// Deletes the compensation with the matching id.
         /// </summary>
@@ -125,8 +171,59 @@ public IActionResult GetCompensationRequisitionProperties([FromRoute] long id)
         [TypeFilter(typeof(NullJsonResultFilter))]
         public IActionResult DeleteCompensation([FromRoute] long id)
         {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(CompensationRequisitionController),
+                nameof(DeleteCompensation),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation($"Dispatching to service: {_compensationRequisitionService.GetType()}");
+
             var result = _compensationRequisitionService.DeleteCompensation(id);
             return new JsonResult(result);
         }
+
+        [HttpGet("{fileType}/{fileId:long}")]
+        [HasPermission(Permissions.CompensationRequisitionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(List<CompensationRequisitionModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetFileCompensations([FromRoute]FileTypes fileType, [FromRoute]long fileId)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(CompensationRequisitionController),
+                nameof(GetFileCompensations),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation($"Dispatching to service: {_compensationRequisitionService.GetType()}");
+
+            var pimsCompensations = _compensationRequisitionService.GetFileCompensationRequisitions(fileType, fileId);
+            var compensations = _mapper.Map<List<CompensationRequisitionModel>>(pimsCompensations);
+
+            return new JsonResult(compensations);
+        }
+
+        [HttpGet("{id:long}/financials")]
+        [HasPermission(Permissions.CompensationRequisitionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(List<CompensationFinancialModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetCompensationRequisitionFinancials([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(CompensationRequisitionController),
+                nameof(GetCompensationRequisitionFinancials),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation("Dispatching to service: {Service}", _compensationRequisitionService.GetType());
+
+            var compReqFinancials = _compensationRequisitionService.GetCompensationRequisitionFinancials(id);
+
+            return new JsonResult(_mapper.Map<IEnumerable<CompensationFinancialModel>>(compReqFinancials));
+        }
     }
 }

source/backend/api/Areas/DocumentGeneration/DocumentGenerationController.cs

@@ -48,7 +48,7 @@ public DocumentGenerationController(IDocumentGenerationService documentGeneratio
 
         // [HasPermission(Permissions.GenerateDocuments)]
         [Produces("application/json")]
-        [ProducesResponseType(typeof(ExternalResponse<Models.Cdogs.FileTypes>), 200)]
+        [ProducesResponseType(typeof(ExternalResponse<Models.Cdogs.CdogsFileTypes>), 200)]
         [SwaggerOperation(Tags = new[] { "document-generation" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
         public async Task<IActionResult> GetSupportedDocumentTypes()

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using MapsterMapper;
 using Microsoft.AspNetCore.Authorization;
@@ -125,6 +126,25 @@ public async Task<IActionResult> DownloadFile(long mayanDocumentId, long mayanFi
             return new FileContentResult(fileBytes, result.Payload.Mimetype) { FileDownloadName = result.Payload.FileName };
         }
 
+        /// <summary>
+        /// Stream the file for the corresponding file and document id and return a stream.
+        /// </summary>
+        [HttpGet("storage/{mayanDocumentId}/files/{mayanFileId}/stream")]
+        [HasPermission(Permissions.DocumentView)]
+        [ProducesResponseType(typeof(File), 200)]
+        [SwaggerOperation(Tags = new[] { "storage-documents" })]
+        public async Task<IActionResult> StreamFile(long mayanDocumentId, long mayanFileId)
+        {
+            var result = await _documentService.StreamFileAsync(mayanDocumentId, mayanFileId);
+
+            if (result?.Payload == null)
+            {
+                return new NotFoundResult();
+            }
+
+            return File(result.Payload.FilePayload, "application/octet-stream", $"{result.Payload.FileName}");
+        }
+
         /// <summary>
         /// Retrieves a list of documents.
         /// </summary>
@@ -208,7 +228,7 @@ public async Task<IActionResult> DownloadWrappedFile(long mayanDocumentId)
         [ProducesResponseType(typeof(FileContentResult), 200)]
         [SwaggerOperation(Tags = new[] { "storage-documents" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
-        public async Task<IActionResult> DownloadFile(long mayanDocumentId)
+        public async Task<IActionResult> DownloadFileLatest(long mayanDocumentId)
         {
             var result = await _documentService.DownloadFileLatestAsync(mayanDocumentId);
             if (result?.Payload == null)
@@ -220,6 +240,25 @@ public async Task<IActionResult> DownloadFile(long mayanDocumentId)
             return new FileContentResult(fileBytes, result.Payload.Mimetype) { FileDownloadName = result.Payload.FileName };
         }
 
+        /// <summary>
+        /// Streams the latest file for the corresponding document id.
+        /// </summary>
+        [HttpGet("storage/{mayanDocumentId}/stream")]
+        [HasPermission(Permissions.DocumentView)]
+        [ProducesResponseType(typeof(File), 200)]
+        [SwaggerOperation(Tags = new[] { "storage-documents" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public async Task<IActionResult> StreamFileLatest(long mayanDocumentId)
+        {
+            var result = await _documentService.StreamFileLatestAsync(mayanDocumentId);
+            if (result?.Payload == null)
+            {
+                return new NotFoundResult();
+            }
+
+            return File(result.Payload.FilePayload, "application/octet-stream", $"{result.Payload.FileName}");
+        }
+
         /// <summary>
         /// Retrieves a external document metadata.
         /// </summary>