Merge remote-tracking branch 'upstream/dev' into uat-release-100

bcgov · Mar 6, 2025 · 658dae1 · 658dae1
2 parents b20cdd7 + 45d14dc
commit 658dae1
Show file tree

Hide file tree

Showing 661 changed files with 115,386 additions and 23,046 deletions.
diff --git a/source/backend/Directory.Build.props b/source/backend/Directory.Build.props
@@ -23,16 +23,6 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Net.Compilers" Version="4.2.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.8.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers;</IncludeAssets>
-        </PackageReference>
     </ItemGroup>
     <ItemGroup>
         <None Include="$(MSBuildThisFileDirectory)\..\.editorconfig" />

diff --git a/...ackend/api/Areas/CompensationRequisition/Controllers/CompensationRequisitionController.cs b/...ackend/api/Areas/CompensationRequisition/Controllers/CompensationRequisitionController.cs
@@ -226,25 +226,46 @@ public IActionResult GetCompensationRequisitionFinancials([FromRoute] long id)
             return new JsonResult(_mapper.Map<IEnumerable<CompensationFinancialModel>>(compReqFinancials));
         }
 
-        [HttpGet("{id:long}/payees")]
+        [HttpGet("{id:long}/acquisition-payees")]
         [HasPermission(Permissions.CompensationRequisitionView)]
         [Produces("application/json")]
-        [ProducesResponseType(typeof(List<CompReqPayeeModel>), 200)]
+        [ProducesResponseType(typeof(List<CompReqAcqPayeeModel>), 200)]
         [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
         [TypeFilter(typeof(NullJsonResultFilter))]
-        public IActionResult GetCompensationRequisitionPayees([FromRoute] long id)
+        public IActionResult GetCompensationRequisitionAcquisitionPayees([FromRoute] long id)
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
                 nameof(CompensationRequisitionController),
-                nameof(GetCompensationRequisitionPayees),
+                nameof(GetCompensationRequisitionAcquisitionPayees),
                 User.GetUsername(),
                 DateTime.Now);
             _logger.LogInformation("Dispatching to service: {Service}", _compensationRequisitionService.GetType());
 
-            var compReqPayees = _compensationRequisitionService.GetCompensationRequisitionPayees(id);
+            var compReqPayees = _compensationRequisitionService.GetCompensationRequisitionAcquisitionPayees(id);
 
-            return new JsonResult(_mapper.Map<IEnumerable<CompReqPayeeModel>>(compReqPayees));
+            return new JsonResult(_mapper.Map<IEnumerable<CompReqAcqPayeeModel>>(compReqPayees));
+        }
+
+        [HttpGet("{id:long}/lease-payees")]
+        [HasPermission(Permissions.CompensationRequisitionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(List<CompReqLeasePayeeModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "compensation-requisition" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetCompensationRequisitionLeasePayees([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(CompensationRequisitionController),
+                nameof(GetCompensationRequisitionLeasePayees),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation("Dispatching to service: {Service}", _compensationRequisitionService.GetType());
+
+            var compReqPayees = _compensationRequisitionService.GetCompensationRequisitionLeasePayees(id);
+
+            return new JsonResult(_mapper.Map<IEnumerable<CompReqLeasePayeeModel>>(compReqPayees));
         }
     }
 }
diff --git a/source/backend/api/Areas/Leases/Controllers/LeaseController.cs b/source/backend/api/Areas/Leases/Controllers/LeaseController.cs
@@ -121,7 +121,7 @@ public IActionResult AddLease(LeaseModel leaseModel, [FromQuery] string[] userOv
         }
 
         /// <summary>
-        /// Update the specified lease, and attached properties.
+        /// Update the specified lease.
         /// </summary>
         /// <returns></returns>
         [HttpPut("{id:long}")]
@@ -146,6 +146,30 @@ public IActionResult UpdateLease(LeaseModel leaseModel, [FromQuery] string[] use
             return new JsonResult(_mapper.Map<LeaseModel>(updatedLease));
         }
 
+        /// <summary>
+        /// Update the lease file properties.
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut("{id:long}/properties")]
+        [HasPermission(Permissions.LeaseEdit)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(LeaseModel), 200)]
+        [SwaggerOperation(Tags = new[] { "lease" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult UpdateLeaseProperties([FromBody] LeaseModel leaseModel, [FromQuery] string[] userOverrideCodes)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(LeaseController),
+                nameof(UpdateLease),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var leaseEntity = _mapper.Map<Dal.Entities.PimsLease>(leaseModel);
+            var lease = _leaseService.UpdateProperties(leaseEntity, userOverrideCodes.Select(oc => UserOverrideCode.Parse(oc)));
+            return new JsonResult(_mapper.Map<LeaseModel>(lease));
+        }
+
         /// <summary>
         /// Get the lease checklist items.
         /// </summary>

diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.8.0-99.26</Version>
-    <AssemblyVersion>5.8.0.99</AssemblyVersion>
+    <Version>5.8.0-100.21</Version>
+    <AssemblyVersion>5.8.0.100</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>{16BC0468-78F6-4C91-87DA-7403C919E646}</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>

diff --git a/source/backend/api/Services/AcquisitionFileService.cs b/source/backend/api/Services/AcquisitionFileService.cs
@@ -859,14 +859,14 @@ private void ValidatePayeeDependency(PimsAcquisitionFile acquisitionFile)
         {
             var currentAcquisitionFile = _acqFileRepository.GetById(acquisitionFile.Internal_Id);
             var compensationRequisitions = _compensationRequisitionRepository.GetAllByAcquisitionFileId(acquisitionFile.Internal_Id);
-            var compReqPayees = compensationRequisitions.SelectMany(x => x.PimsCompReqPayees).ToList();
+            var compReqAcqPayees = compensationRequisitions.SelectMany(x => x.PimsCompReqAcqPayees).ToList();
 
-            if (compReqPayees.Count == 0)
+            if (compReqAcqPayees.Count == 0)
             {
                 return;
             }
 
-            foreach (var payee in compReqPayees)
+            foreach (var payee in compReqAcqPayees)
             {
                 // Check for Acquisition File Owner removed
                 if (payee.AcquisitionOwnerId is not null
@@ -898,14 +898,14 @@ private void ValidateInterestHoldersDependency(long acquisitionFileId, List<Pims
         {
             var currentAcquisitionFile = _acqFileRepository.GetById(acquisitionFileId);
             var compensationRequisitions = _compensationRequisitionRepository.GetAllByAcquisitionFileId(acquisitionFileId);
-            var compReqPayees = compensationRequisitions.SelectMany(x => x.PimsCompReqPayees).ToList();
+            var compReqAcqPayees = compensationRequisitions.SelectMany(x => x.PimsCompReqAcqPayees).ToList();
 
-            if (compReqPayees.Count == 0)
+            if (compReqAcqPayees.Count == 0)
             {
                 return;
             }
 
-            foreach (var payee in compReqPayees)
+            foreach (var payee in compReqAcqPayees)
             {
                 // Check for Interest Holder
                 if (payee.InterestHolderId is not null

diff --git a/source/backend/api/Services/CompensationRequisitionService.cs b/source/backend/api/Services/CompensationRequisitionService.cs
@@ -171,12 +171,20 @@ public IEnumerable<PimsCompReqFinancial> GetCompensationRequisitionFinancials(lo
             return _compensationRequisitionRepository.GetCompensationRequisitionFinancials(compReqId);
         }
 
-        public IEnumerable<PimsCompReqPayee> GetCompensationRequisitionPayees(long compReqId)
+        public IEnumerable<PimsCompReqAcqPayee> GetCompensationRequisitionAcquisitionPayees(long compReqId)
         {
-            _logger.LogInformation("Getting compensations payees for id: {compReqId}", compReqId);
+            _logger.LogInformation("Getting acquisition compensations payees for id: {compReqId}", compReqId);
             _user.ThrowIfNotAuthorized(Permissions.CompensationRequisitionView);
 
-            return _compensationRequisitionRepository.GetCompensationRequisitionPayees(compReqId);
+            return _compensationRequisitionRepository.GetCompensationRequisitionAcquisitionPayees(compReqId);
+        }
+
+        public IEnumerable<PimsCompReqLeasePayee> GetCompensationRequisitionLeasePayees(long compReqId)
+        {
+            _logger.LogInformation("Getting lease compensations payees for id: {compReqId}", compReqId);
+            _user.ThrowIfNotAuthorized(Permissions.CompensationRequisitionView);
+
+            return _compensationRequisitionRepository.GetCompensationRequisitionLeasePayees(compReqId);
         }
 
         private static string GetCompensationRequisitionStatusText(bool? isDraft)

diff --git a/source/backend/api/Services/DocumentFileService.cs b/source/backend/api/Services/DocumentFileService.cs
@@ -451,10 +451,15 @@ private PimsDocument RemoveDocumentMayanID(PimsDocument doc)
         private void DeleteQueuedDocumentItem(long documentId)
         {
             var documentQueuedItem = _documentQueueRepository.GetByDocumentId(documentId);
+            if (documentQueuedItem == null)
+            {
+                Logger.LogWarning("Document Queue item not found for document {documentId}", documentId);
+                return;
+            }
             if (documentQueuedItem.DocumentQueueStatusTypeCode == DocumentQueueStatusTypes.PENDING.ToString()
                 || documentQueuedItem.DocumentQueueStatusTypeCode == DocumentQueueStatusTypes.PROCESSING.ToString())
             {
-                throw new BadRequestException("Doucment in process can not be deleted");
+                throw new BadRequestException("Document in process can not be deleted");
             }
 
             bool deleted = _documentQueueRepository.Delete(documentQueuedItem);

diff --git a/source/backend/api/Services/ICompensationRequisitionService.cs b/source/backend/api/Services/ICompensationRequisitionService.cs
@@ -22,6 +22,8 @@ public interface ICompensationRequisitionService
 
         IEnumerable<PimsCompReqFinancial> GetCompensationRequisitionFinancials(long compReqId);
 
-        IEnumerable<PimsCompReqPayee> GetCompensationRequisitionPayees(long compReqId);
+        IEnumerable<PimsCompReqAcqPayee> GetCompensationRequisitionAcquisitionPayees(long compReqId);
+
+        IEnumerable<PimsCompReqLeasePayee> GetCompensationRequisitionLeasePayees(long compReqId);
     }
 }
diff --git a/source/backend/api/Services/ILeaseService.cs b/source/backend/api/Services/ILeaseService.cs
@@ -19,6 +19,8 @@ public interface ILeaseService
 
         PimsLease Update(PimsLease lease, IEnumerable<UserOverrideCode> userOverrides);
 
+        PimsLease UpdateProperties(PimsLease lease, IEnumerable<UserOverrideCode> userOverrides);
+
         IEnumerable<PimsPropertyLease> GetPropertiesByLeaseId(long leaseId);
 
         IEnumerable<PimsInsurance> GetInsuranceByLeaseId(long leaseId);