Release 6.0

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

@@ -122,7 +122,7 @@ public IActionResult AddAcquisitionFile([FromBody] AcquisitionFileModel model, [
 
             _logger.LogInformation("Dispatching to service: {Service}", _acquisitionService.GetType());
 
-            var acqFileEntity = _mapper.Map<Dal.Entities.PimsAcquisitionFile>(model);
+            var acqFileEntity = _mapper.Map<PimsAcquisitionFile>(model);
             var acquisitionFile = _acquisitionService.Add(acqFileEntity, userOverrideCodes.Select(oc => UserOverrideCode.Parse(oc)));
 
             return new JsonResult(_mapper.Map<AcquisitionFileModel>(acquisitionFile));
@@ -150,7 +150,7 @@ public IActionResult UpdateAcquisitionFile(long id, [FromBody] AcquisitionFileMo
 
             _logger.LogInformation("Dispatching to service: {Service}", _acquisitionService.GetType());
 
-            var acqFileEntity = _mapper.Map<Dal.Entities.PimsAcquisitionFile>(model);
+            var acqFileEntity = _mapper.Map<PimsAcquisitionFile>(model);
             var acquisitionFile = _acquisitionService.Update(acqFileEntity, userOverrideCodes.Select(oc => UserOverrideCode.Parse(oc)));
             return new JsonResult(_mapper.Map<AcquisitionFileModel>(acquisitionFile));
         }
@@ -167,7 +167,7 @@ public IActionResult UpdateAcquisitionFile(long id, [FromBody] AcquisitionFileMo
         [TypeFilter(typeof(NullJsonResultFilter))]
         public IActionResult UpdateAcquisitionFileProperties([FromBody] AcquisitionFileModel acquisitionFileModel, [FromQuery] string[] userOverrideCodes)
         {
-            var acquisitionFileEntity = _mapper.Map<Dal.Entities.PimsAcquisitionFile>(acquisitionFileModel);
+            var acquisitionFileEntity = _mapper.Map<PimsAcquisitionFile>(acquisitionFileModel);
             var acquisitionFile = _acquisitionService.UpdateProperties(acquisitionFileEntity, userOverrideCodes.Select(oc => UserOverrideCode.Parse(oc)));
             return new JsonResult(_mapper.Map<AcquisitionFileModel>(acquisitionFile));
         }

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

@@ -92,7 +92,7 @@ public IActionResult AddAcquisitionFileAgreement([FromRoute] long id, [FromBody]
                 User.GetUsername(),
                 DateTime.Now);
 
-            if (id != agreement.AcquisitionFileId)
+            if (id != agreement.FileId)
             {
                 throw new BadRequestException("Invalid AcquisitionFileId.");
             }
@@ -144,7 +144,7 @@ public IActionResult UpdateAcquisitionFileAgreement([FromRoute] long id, [FromRo
                 User.GetUsername(),
                 DateTime.Now);
 
-            if (id != agreement.AcquisitionFileId)
+            if (id != agreement.FileId)
             {
                 throw new BadRequestException("Invalid AcquisitionFileId.");
             }

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

@@ -53,6 +53,12 @@ public class AcquisitionFilterModel : PageFilter
         /// get/set - The MOTI Organization id to search by for acquisition team members.
         /// </summary>
         public string AcquisitionTeamMemberOrganizationId { get; set; }
+
+        /// <summary>
+        /// get/set - Get the Acquisition files that has NOC.
+        /// </summary>
+        public bool HasNoticeOfClaim { get; set; }
+
         #endregion
 
         #region Constructors
@@ -74,17 +80,18 @@ public AcquisitionFilterModel(Dictionary<string, Microsoft.Extensions.Primitives
             // We want case-insensitive query parameter properties.
             var filter = new Dictionary<string, Microsoft.Extensions.Primitives.StringValues>(query, StringComparer.OrdinalIgnoreCase);
 
-            this.Pid = filter.GetStringValue(nameof(this.Pid));
-            this.Pin = filter.GetStringValue(nameof(this.Pin));
-            this.Address = filter.GetStringValue(nameof(this.Address));
-            this.AcquisitionFileStatusTypeCode = filter.GetStringValue(nameof(this.AcquisitionFileStatusTypeCode));
-            this.AcquisitionFileNameOrNumber = filter.GetStringValue(nameof(this.AcquisitionFileNameOrNumber));
-            this.ProjectNameOrNumber = filter.GetStringValue(nameof(this.ProjectNameOrNumber));
-            this.OwnerName = filter.GetStringValue(nameof(this.OwnerName));
-            this.AcquisitionTeamMemberPersonId = filter.GetStringValue(nameof(this.AcquisitionTeamMemberPersonId));
-            this.AcquisitionTeamMemberOrganizationId = filter.GetStringValue(nameof(this.AcquisitionTeamMemberOrganizationId));
-
-            this.Sort = filter.GetStringArrayValue(nameof(this.Sort));
+            Pid = filter.GetStringValue(nameof(Pid));
+            Pin = filter.GetStringValue(nameof(Pin));
+            Address = filter.GetStringValue(nameof(Address));
+            AcquisitionFileStatusTypeCode = filter.GetStringValue(nameof(AcquisitionFileStatusTypeCode));
+            AcquisitionFileNameOrNumber = filter.GetStringValue(nameof(AcquisitionFileNameOrNumber));
+            ProjectNameOrNumber = filter.GetStringValue(nameof(ProjectNameOrNumber));
+            OwnerName = filter.GetStringValue(nameof(OwnerName));
+            AcquisitionTeamMemberPersonId = filter.GetStringValue(nameof(AcquisitionTeamMemberPersonId));
+            AcquisitionTeamMemberOrganizationId = filter.GetStringValue(nameof(AcquisitionTeamMemberOrganizationId));
+            HasNoticeOfClaim = filter.GetBoolValue(nameof(HasNoticeOfClaim));
+
+            Sort = filter.GetStringArrayValue(nameof(Sort));
         }
         #endregion
 
@@ -110,6 +117,7 @@ public static explicit operator AcquisitionFilter(AcquisitionFilterModel model)
                 OwnerName = model.OwnerName,
                 AcquisitionTeamMemberPersonId = model.AcquisitionTeamMemberPersonId,
                 AcquisitionTeamMemberOrganizationId = model.AcquisitionTeamMemberOrganizationId,
+                HasNoticeOfClaim = model.HasNoticeOfClaim,
 
                 Sort = model.Sort,
             };

source/backend/api/Areas/Disposition/Controllers/DispositionFileController.cs

@@ -79,6 +79,31 @@ public IActionResult GetDispositionFile(long id)
             return new JsonResult(_mapper.Map<DispositionFileModel>(dispositionFile));
         }
 
+        /// <summary>
+        /// Gets the specified disposition file with all related entities.
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("{id:long}/deep")]
+        [HasPermission(Permissions.DispositionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFileDeep(long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileDeep),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionFile = _dispositionService.GetDeepById(id);
+            return new JsonResult(_mapper.Map<DispositionFileModel>(dispositionFile));
+        }
+
         /// <summary>
         /// Creates a new Disposition File entity.
         /// </summary>
@@ -501,6 +526,129 @@ public IActionResult UpdateDispositionFileProperties([FromBody] DispositionFileM
             return new JsonResult(_mapper.Map<DispositionFileModel>(dispositionFile));
         }
 
+        [HttpGet("{id:long}/agreements")]
+        [HasPermission(Permissions.AgreementView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(IEnumerable<DispositionAgreementModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFileAgreements(long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileAgreements),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var agreements = _dispositionService.GetAgreements(id);
+            return new JsonResult(_mapper.Map<IEnumerable<DispositionAgreementModel>>(agreements));
+        }
+
+        /// <summary>
+        /// Create the disposition file agreement to the disposition file.
+        /// </summary>
+        /// <returns>The agreements items.</returns>
+        [HttpPost("{id:long}/agreements")]
+        [HasPermission(Permissions.AgreementView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionAgreementModel), 200)]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        public IActionResult AddDispositionFileAgreement([FromRoute] long id, [FromBody] DispositionAgreementModel agreement)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(AddDispositionFileAgreement),
+                User.GetUsername(),
+                DateTime.Now);
+
+            if (id != agreement.FileId)
+            {
+                throw new BadRequestException("Invalid DispositionFileId.");
+            }
+
+            var newAgreement = _dispositionService.AddDispositionFileAgreement(id, _mapper.Map<Dal.Entities.PimsDispositionAgreement>(agreement));
+
+            return new JsonResult(_mapper.Map<DispositionAgreementModel>(newAgreement));
+        }
+
+        /// <summary>
+        /// Get the disposition file agreement by Id.
+        /// </summary>
+        /// <returns>The agreements items.</returns>
+        [HttpGet("{id:long}/agreements/{agreementId:long}")]
+        [HasPermission(Permissions.AgreementView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionAgreementModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        public IActionResult GetDispositionFileAgreementById([FromRoute] long id, [FromRoute] long agreementId)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileAgreementById),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var agreement = _dispositionService.GetAgreementById(id, agreementId);
+
+            return new JsonResult(_mapper.Map<DispositionAgreementModel>(agreement));
+        }
+
+        /// <summary>
+        /// Update the disposition file agreement by Id.
+        /// </summary>
+        /// <returns>The agreements item updated.</returns>
+        [HttpPut("{id:long}/agreements/{agreementId:long}")]
+        [HasPermission(Permissions.AgreementView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionAgreementModel), 200)]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        public IActionResult UpdateDispositionFileAgreement([FromRoute] long id, [FromRoute] long agreementId, [FromBody] DispositionAgreementModel agreement)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(UpdateDispositionFileAgreement),
+                User.GetUsername(),
+                DateTime.Now);
+
+            if (id != agreement.FileId)
+            {
+                throw new BadRequestException("Invalid DispositionFileId.");
+            }
+
+            var updatedAgreement = _dispositionService.UpdateDispositionFileAgreement(id, _mapper.Map<Dal.Entities.PimsDispositionAgreement>(agreement));
+
+            return new JsonResult(_mapper.Map<DispositionAgreementModel>(updatedAgreement));
+        }
+
+        /// <summary>
+        /// Delete the disposition file agreement by Id.
+        /// </summary>
+        /// <returns>The agreements item updated.</returns>
+        [HttpDelete("{id:long}/agreements/{agreementId:long}")]
+        [HasPermission(Permissions.AgreementView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(bool), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        public IActionResult DeleteDispositionFileAgreement([FromRoute] long id, [FromRoute] long agreementId)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(DeleteDispositionFileAgreement),
+                User.GetUsername(),
+                DateTime.Now);
+
+            var result = _dispositionService.DeleteDispositionFileAgreement(id, agreementId);
+
+            return new JsonResult(result);
+        }
+
         #endregion
     }
 }

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

@@ -63,6 +63,12 @@ public class ManagementFilterModel : PageFilter
         /// get/set - The ministry region of the file.
         /// </summary>
         public long? ManagementRegionCd { get; set; }
+
+        /// <summary>
+        /// get/set - Get the Management File that has NOC.
+        /// </summary>
+        public bool HasNoticeOfClaim { get; set; }
+
         #endregion
 
         #region Constructors
@@ -84,18 +90,19 @@ public ManagementFilterModel(Dictionary<string, Microsoft.Extensions.Primitives.
             // We want case-insensitive query parameter properties.
             var filter = new Dictionary<string, Microsoft.Extensions.Primitives.StringValues>(query, StringComparer.OrdinalIgnoreCase);
 
-            this.Pid = filter.GetStringValue(nameof(this.Pid));
-            this.Pin = filter.GetStringValue(nameof(this.Pin));
-            this.RegionCode = filter.GetStringValue(nameof(this.RegionCode));
-            this.Address = filter.GetStringValue(nameof(this.Address));
-            this.FileNameOrNumberOrReference = filter.GetStringValue(nameof(this.FileNameOrNumberOrReference));
-            this.ManagementFileStatusCode = filter.GetStringValue(nameof(this.ManagementFileStatusCode));
-            this.ProjectNameOrNumber = filter.GetStringValue(nameof(this.ProjectNameOrNumber));
-            this.ManagementFilePurposeCode = filter.GetStringValue(nameof(this.ManagementFilePurposeCode));
-            this.TeamMemberPersonId = filter.GetLongNullValue(nameof(this.TeamMemberPersonId));
-            this.TeamMemberOrganizationId = filter.GetLongNullValue(nameof(this.TeamMemberOrganizationId));
-
-            this.Sort = filter.GetStringArrayValue(nameof(this.Sort));
+            Pid = filter.GetStringValue(nameof(Pid));
+            Pin = filter.GetStringValue(nameof(Pin));
+            RegionCode = filter.GetStringValue(nameof(RegionCode));
+            Address = filter.GetStringValue(nameof(Address));
+            FileNameOrNumberOrReference = filter.GetStringValue(nameof(FileNameOrNumberOrReference));
+            ManagementFileStatusCode = filter.GetStringValue(nameof(ManagementFileStatusCode));
+            ProjectNameOrNumber = filter.GetStringValue(nameof(ProjectNameOrNumber));
+            ManagementFilePurposeCode = filter.GetStringValue(nameof(ManagementFilePurposeCode));
+            TeamMemberPersonId = filter.GetLongNullValue(nameof(TeamMemberPersonId));
+            TeamMemberOrganizationId = filter.GetLongNullValue(nameof(TeamMemberOrganizationId));
+            HasNoticeOfClaim = filter.GetBoolValue(nameof(HasNoticeOfClaim));
+
+            Sort = filter.GetStringArrayValue(nameof(Sort));
         }
         #endregion
 
@@ -122,6 +129,7 @@ public static explicit operator ManagementFilter(ManagementFilterModel model)
                 ManagementFilePurposeCode = model.ManagementFilePurposeCode,
                 TeamMemberPersonId = model.TeamMemberPersonId,
                 TeamMemberOrganizationId = model.TeamMemberOrganizationId,
+                HasNoticeOfClaim = model.HasNoticeOfClaim,
 
                 Sort = model.Sort,
             };

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

@@ -57,7 +57,7 @@ public PropertyImprovementController(IPropertyService propertyService, IMapper m
         /// </summary>
         /// <returns></returns>
         [HttpGet("{propertyId:long}/improvements")]
-        [HasPermission(Permissions.LeaseView)]
+        [HasPermission(Permissions.PropertyView)]
         [Produces("application/json")]
         [ProducesResponseType(typeof(IEnumerable<PropertyImprovementModel>), 200)]
         [SwaggerOperation(Tags = new[] { "property" })]

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

@@ -16,7 +16,6 @@
 using Pims.Api.Services;
 using Pims.Core.Api.Exceptions;
 using Pims.Core.Api.Policies;
-using Pims.Core.Extensions;
 using Pims.Core.Security;
 using Pims.Dal.Entities;
 using Pims.Dal.Entities.Models;
@@ -174,28 +173,20 @@ public IActionResult ExportAggregatedLeases(int fiscalYearStart)
         [SwaggerOperation(Tags = new[] { "lease", "payments", "report" })]
         public IActionResult ExportLeasePayments(int fiscalYearStart)
         {
-            var acceptHeader = (string)this.Request.Headers["Accept"];
+            var acceptHeader = (string)Request.Headers["Accept"];
 
             if (acceptHeader != ContentTypes.CONTENTTYPEEXCEL && acceptHeader != ContentTypes.CONTENTTYPEEXCELX)
             {
                 throw new BadRequestException($"Invalid HTTP request header 'Accept:{acceptHeader}'.");
             }
 
-            DateTime startDate = fiscalYearStart.ToFiscalYearDate();
-            var allPayments = _leasePaymentService.GetAllByDateRange(startDate, startDate.AddYears(1).AddDays(-1)); // Add years will give you the equivalent month, except for 29th/ 28th of leap years which is not the case here.
-            var leaseIds = allPayments.Select(payment => payment.LeasePeriod.LeaseId);
-            var paymentLeases = _leaseService.GetAllByIds(leaseIds);
-
-            // Required to display the latest payment on the lease, which may not be part of the current date range filter of payments. This ensures that all payments for a lease associated to one of the payments in the date range are included.
-            allPayments.ForEach(payment =>
-            {
-                payment.LeasePeriod.Lease = paymentLeases.FirstOrDefault(lease => lease.LeaseId == payment.LeasePeriod.LeaseId);
-            });
-            var paymentItems = _mapper.Map<IEnumerable<LeasePaymentReportModel>>(allPayments.OrderBy(p => p?.LeasePeriod?.Lease?.RegionCode).ThenBy(p => p?.LeasePeriod?.Lease?.LFileNo).ThenByDescending(p => p.PaymentReceivedDate));
+            IEnumerable<PimsLeasePayment> paymentsForFiscal = _leaseReportService.GetLeasePaymentsReport(fiscalYearStart);
+            var sortedPayments = paymentsForFiscal.OrderBy(p => p?.LeasePeriod?.Lease?.RegionCode).ThenBy(p => p?.LeasePeriod?.Lease?.LFileNo).ThenByDescending(p => p.PaymentReceivedDate).ToList();
+            var paymentItems = sortedPayments.Select(p => LeasePaymentReportModel.MapFrom(p)).ToList();
 
             return acceptHeader.ToString() switch
             {
-                ContentTypes.CONTENTTYPECSV => ReportHelper.GenerateCsv<LeasePaymentReportModel>(paymentItems),
+                ContentTypes.CONTENTTYPECSV => ReportHelper.GenerateCsv(paymentItems),
                 _ => ReportHelper.GenerateExcel(paymentItems, $"LeaseLicense_Payments")
             };
         }