PSP-5718 : Add view update remove form 8 expropriation

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

@@ -5,14 +5,14 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using Pims.Api.Areas.CompensationRequisition.Controllers;
 using Pims.Api.Models;
 using Pims.Api.Models.Concepts;
 using Pims.Api.Policies;
 using Pims.Api.Services;
 using Pims.Core.Exceptions;
 using Pims.Core.Extensions;
 using Pims.Core.Json;
+using Pims.Dal.Entities;
 using Pims.Dal.Exceptions;
 using Pims.Dal.Security;
 using Swashbuckle.AspNetCore.Annotations;
@@ -240,7 +240,7 @@
         {
             _logger.LogInformation(
                 "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
-                nameof(CompensationRequisitionController),
+                nameof(AcquisitionFileController),
                 nameof(AddCompensationRequisition),
                 User.GetUsername(),
                 DateTime.Now);
@@ -252,6 +252,60 @@
             return new JsonResult(_mapper.Map<CompensationRequisitionModel>(newCompensationRequisition));
         }
 
+        /// <summary>
+        /// Get all Expropriation Payments from the Acquisition File.
+        /// </summary>
+        /// <param name="id">Acquisition File Id.</param>
+        /// <returns>List of all Expropriation Payments created for the acquisition file.</returns>
+        [HttpGet("{id:long}/expropriation-payments")]
+        [HasPermission(Permissions.AcquisitionFileView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(List<ExpropriationPaymentModel>), 200)]
+        [SwaggerOperation(Tags = new[] { "expropriation-payments" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetAcquisitionFileExpropriationPayments([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(AcquisitionFileController),
+                nameof(GetAcquisitionFileExpropriationPayments),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation($"Dispatching to service: {_acquisitionService.GetType()}");
+
+            var pimsForm8s = _acquisitionService.GetAcquisitionExpropriationPayments(id);
+            var form8s = _mapper.Map<List<ExpropriationPaymentModel>>(pimsForm8s);
+
+            return new JsonResult(form8s);
+        }
+
+        /// <summary>
+        /// Creates a new Form8 for the acquisition file.
+        /// </summary>
+        /// <param name="id">Acquisition File Id.</param>
+        /// <param name="expropriationPayment">Form8 Data Model.</param>
+        /// <returns></returns>
+        [HttpPost("{id:long}/expropriation-payments")]
+        [HasPermission(Permissions.AcquisitionFileEdit)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(ExpropriationPaymentModel), 201)]
+        [SwaggerOperation(Tags = new[] { "expropriation-payments" })]
+        public IActionResult AddExpropriationPayment([FromRoute] long id, [FromBody] ExpropriationPaymentModel expropriationPayment)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(AcquisitionFileController),
+                nameof(AddExpropriationPayment),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation($"Dispatching to service: {_acquisitionService.GetType()}");
+
+            var expPaymentEntity = _mapper.Map<PimsExpropriationPayment>(expropriationPayment);
+            var newExpPaymentEntity = _acquisitionService.AddExpropriationPayment(id, expPaymentEntity);
+
+            return new JsonResult(_mapper.Map<ExpropriationPaymentModel>(newExpPaymentEntity));
+        }
+
         #endregion
     }
 }

source/backend/api/Areas/ExpropriationPayment/ExpropriationPaymentController.cs

@@ -0,0 +1,122 @@
+using System;
+using MapsterMapper;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Pims.Api.Helpers.Exceptions;
+using Pims.Api.Models.Concepts;
+using Pims.Api.Policies;
+using Pims.Api.Services;
+using Pims.Core.Extensions;
+using Pims.Core.Json;
+using Pims.Dal.Security;
+using Swashbuckle.AspNetCore.Annotations;
+
+namespace Pims.Api.Areas.ExpropriationPayment
+{
+    /// <summary>
+    /// ExpropriationPaymentController class, provides endpoints to handle expropriation payments.
+    /// </summary>
+    [Authorize]
+    [ApiController]
+    [ApiVersion("1.0")]
+    [Area("expropriation-payments")]
+    [Route("v{version:apiVersion}/[area]")]
+    [Route("[area]")]
+    public class ExpropriationPaymentController : ControllerBase
+    {
+        private readonly IMapper _mapper;
+        private readonly ILogger _logger;
+        private readonly IExpropriationPaymentService _expropriationPaymentService;
+
+        public ExpropriationPaymentController(IMapper mapper, ILogger<ExpropriationPaymentController> logger, IExpropriationPaymentService expropriationPaymentService)
+        {
+            _mapper = mapper;
+            _logger = logger;
+            _expropriationPaymentService = expropriationPaymentService;
+        }
+
+        /// <summary>
+        /// Get The Expropriation Payment (Form8) by Id.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet("{id:long}")]
+        [HasPermission(Permissions.AcquisitionFileView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(ExpropriationPaymentModel), 200)]
+        [SwaggerOperation(Tags = new[] { "expropriation-payments" })]
+        public IActionResult GetExpropriationPaymentById([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(ExpropriationPaymentController),
+                nameof(GetExpropriationPaymentById),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation("Dispatching to service: {Service}", _expropriationPaymentService.GetType());
+
+            var expropriationPayment = _expropriationPaymentService.GetById(id);
+
+            return new JsonResult(_mapper.Map<ExpropriationPaymentModel>(expropriationPayment));
+        }
+
+        /// <summary>
+        /// Update the Expropriation Payment instance.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="expropriationPayment"></param>
+        /// <returns></returns>
+        /// <exception cref="BadRequestException">Validate id matching</exception>
+        [HttpPut("{id:long}")]
+        [HasPermission(Permissions.AcquisitionFileEdit)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(ExpropriationPaymentModel), 200)]
+        [SwaggerOperation(Tags = new[] { "expropriation-payments" })]
+        public IActionResult UpdateExpropriationPayment([FromRoute] long id, [FromBody] ExpropriationPaymentModel expropriationPayment)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(ExpropriationPaymentController),
+                nameof(UpdateExpropriationPayment),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation("Dispatching to service: {Service}", _expropriationPaymentService.GetType());
+
+            if (id != expropriationPayment.Id)
+            {
+                throw new BadRequestException("Invalid expropriationPaymentId.");
+            }
+
+            var expPaymentEntity = _mapper.Map<Dal.Entities.PimsExpropriationPayment>(expropriationPayment);
+            var compensation = _expropriationPaymentService.Update(expPaymentEntity);
+
+            return new JsonResult(_mapper.Map<ExpropriationPaymentModel>(compensation));
+        }
+
+        /// <summary>
+        /// Deletes the Expropriation Payment with the matching id.
+        /// </summary>
+        /// <param name="id">Used to identify the entity to delete.</param>
+        /// <returns></returns>
+        [HttpDelete("{id:long}")]
+        [Produces("application/json")]
+        [HasPermission(Permissions.AcquisitionFileEdit)]
+        [ProducesResponseType(typeof(bool), 200)]
+        [SwaggerOperation(Tags = new[] { "expropriation-payments" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult DeleteExpropriationPayment([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(ExpropriationPaymentController),
+                nameof(DeleteExpropriationPayment),
+                User.GetUsername(),
+                DateTime.Now);
+            _logger.LogInformation($"Dispatching to service: {_expropriationPaymentService.GetType()}");
+
+            var result = _expropriationPaymentService.Delete(id);
+            return new JsonResult(result);
+        }
+    }
+}

source/backend/api/Controllers/LookupController.cs

@@ -145,6 +145,7 @@ public IActionResult GetAll()
                 var acqChecklistItemStatusTypes = _mapper.Map<Model.LookupModel[]>(_lookupRepository.GetAllAcquisitionChecklistItemStatusTypes());
                 var agreementTypes = _mapper.Map<Model.LookupModel[]>(_lookupRepository.GetAllAgreementTypes());
                 var interestHolderInterestTypes = _mapper.Map<Model.LookupModel[]>(_lookupRepository.GetAllInterestHolderInterestTypes());
+                var expropriationPaymentItemTypes = _mapper.Map<Model.LookupModel[]>(_lookupRepository.GetAllExpropriationPaymentItemTypes());
 
                 var codes = new List<object>();
                 codes.AddRange(areaUnitTypes);
@@ -204,6 +205,7 @@ public IActionResult GetAll()
                 codes.AddRange(acqChecklistItemStatusTypes);
                 codes.AddRange(agreementTypes);
                 codes.AddRange(interestHolderInterestTypes);
+                codes.AddRange(expropriationPaymentItemTypes);
 
                 var response = new JsonResult(codes);
 

source/backend/api/Models/Concepts/ExpropriationPayment/ExpropriationPaymentItemMap.cs

@@ -0,0 +1,38 @@
+using Mapster;
+using Pims.Api.Models.Concepts.ExpropriationPayment;
+using Pims.Dal.Entities;
+using Entity = Pims.Dal.Entities;
+
+namespace Pims.Api.Models.Concepts
+{
+    public class ExpropriationPaymentItemMap : IRegister
+    {
+        public void Register(TypeAdapterConfig config)
+        {
+            config.NewConfig<PimsExpropPmtPmtItem, ExpropriationPaymentItemModel>()
+                .Map(dest => dest.Id, src => src.Internal_Id)
+                .Map(dest => dest.ExpropriationPaymentId, src => src.ExpropriationPaymentId)
+                .Map(dest => dest.PaymentItemTypeCode, src => src.PaymentItemTypeCode)
+                .Map(dest => dest.PaymentItemType, src => src.PaymentItemTypeCodeNavigation)
+                .Map(dest => dest.IsGstRequired, src => src.IsGstRequired)
+                .Map(dest => dest.PretaxAmount, src => src.PretaxAmt)
+                .Map(dest => dest.TaxAmount, src => src.TaxAmt)
+                .Map(dest => dest.TotalAmount, src => src.TotalAmt)
+                .Map(dest => dest.IsDisabled, src => src.IsDisabled)
+                .Map(dest => dest.RowVersion, src => src.ConcurrencyControlNumber)
+                .Inherits<Entity.IBaseEntity, BaseModel>();
+
+            config.NewConfig<ExpropriationPaymentItemModel, PimsExpropPmtPmtItem>()
+                .Map(dest => dest.Internal_Id, src => src.Id)
+                .Map(dest => dest.ExpropriationPaymentId, src => src.ExpropriationPaymentId)
+                .Map(dest => dest.PaymentItemTypeCode, src => src.PaymentItemTypeCode)
+                .Map(dest => dest.IsGstRequired, src => src.IsGstRequired)
+                .Map(dest => dest.PretaxAmt, src => src.PretaxAmount)
+                .Map(dest => dest.TaxAmt, src => src.TaxAmount)
+                .Map(dest => dest.TotalAmt, src => src.TotalAmount)
+                .Map(dest => dest.IsDisabled, src => src.IsDisabled)
+                .Map(dest => dest.ConcurrencyControlNumber, src => src.RowVersion)
+                .Inherits<BaseModel, IBaseEntity>();
+        }
+    }
+}

source/backend/api/Models/Concepts/ExpropriationPayment/ExpropriationPaymentItemModel.cs

@@ -0,0 +1,23 @@
+namespace Pims.Api.Models.Concepts.ExpropriationPayment
+{
+    public class ExpropriationPaymentItemModel : BaseAppModel
+    {
+        public long? Id { get; set; }
+
+        public long? ExpropriationPaymentId { get; set; }
+
+        public string PaymentItemTypeCode { get; set; }
+
+        public TypeModel<string> PaymentItemType { get; set; }
+
+        public bool? IsGstRequired { get; set; }
+
+        public decimal? PretaxAmount { get; set; }
+
+        public decimal? TaxAmount { get; set; }
+
+        public decimal? TotalAmount { get; set; }
+
+        public bool? IsDisabled { get; set; }
+    }
+}

source/backend/api/Models/Concepts/ExpropriationPayment/ExpropriationPaymentMap.cs

@@ -0,0 +1,38 @@
+using Mapster;
+using Pims.Dal.Entities;
+
+namespace Pims.Api.Models.Concepts
+{
+    public class ExpropriationPaymentMap : IRegister
+    {
+        public void Register(TypeAdapterConfig config)
+        {
+            config.NewConfig<PimsExpropriationPayment, ExpropriationPaymentModel>()
+                .Map(dest => dest.Id, src => src.Internal_Id)
+                .Map(dest => dest.AcquisitionFileId, src => src.AcquisitionFileId)
+                .Map(dest => dest.AcquisitionOwnerId, src => src.AcquisitionOwnerId)
+                .Map(dest => dest.AcquisitionOwner, src => src.AcquisitionOwner)
+                .Map(dest => dest.InterestHolderId, src => src.InterestHolderId)
+                .Map(dest => dest.InterestHolder, src => src.InterestHolder)
+                .Map(dest => dest.ExpropriatingAuthorityId, src => src.ExpropriatingAuthority)
+                .Map(dest => dest.ExpropriatingAuthority, src => src.ExpropriatingAuthorityNavigation)
+                .Map(dest => dest.Description, src => src.Description)
+                .Map(dest => dest.IsDisabled, src => src.IsDisabled)
+                .Map(dest => dest.RowVersion, src => src.ConcurrencyControlNumber)
+                .Map(dest => dest.PaymentItems, src => src.PimsExpropPmtPmtItems)
+                .Inherits<IBaseEntity, BaseModel>();
+
+            config.NewConfig<ExpropriationPaymentModel, PimsExpropriationPayment>()
+                .Map(dest => dest.Internal_Id, src => src.Id)
+                .Map(dest => dest.AcquisitionFileId, src => src.AcquisitionFileId)
+                .Map(dest => dest.AcquisitionOwnerId, src => src.AcquisitionOwnerId)
+                .Map(dest => dest.InterestHolderId, src => src.InterestHolderId)
+                .Map(dest => dest.ExpropriatingAuthority, src => src.ExpropriatingAuthorityId)
+                .Map(dest => dest.Description, src => src.Description)
+                .Map(dest => dest.IsDisabled, src => src.IsDisabled)
+                .Map(dest => dest.ConcurrencyControlNumber, src => src.RowVersion)
+                .Map(dest => dest.PimsExpropPmtPmtItems, src => src.PaymentItems)
+                .Inherits<BaseModel, IBaseEntity>();
+        }
+    }
+}

source/backend/api/Models/Concepts/ExpropriationPayment/ExpropriationPaymentModel.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using Pims.Api.Models.Concepts.ExpropriationPayment;
+
+namespace Pims.Api.Models.Concepts
+{
+    public class ExpropriationPaymentModel : BaseAppModel
+    {
+        public long? Id { get; set; }
+
+        public long AcquisitionFileId { get; set; }
+
+        public long? AcquisitionOwnerId { get; set; }
+
+        public AcquisitionFileOwnerModel AcquisitionOwner { get; set; }
+
+        public long? InterestHolderId { get; set; }
+
+        public InterestHolderModel InterestHolder { get; set; }
+
+        public long? ExpropriatingAuthorityId { get; set; }
+
+        public OrganizationModel ExpropriatingAuthority { get; set; }
+
+        public string Description { get; set; }
+
+        public bool? IsDisabled { get; set; }
+
+        public List<ExpropriationPaymentItemModel> PaymentItems { get; set; }
+
+    }
+}

source/backend/api/Models/Concepts/Take/TakeModel.cs

@@ -34,7 +34,6 @@ public class TakeModel : BaseAppModel
 
         public float? LandActArea { get; set; }
 
-
         public DateTime? LandActEndDt { get; set; }
 
         public AcquisitionFileModel PropertyAcquisitionFile { get; set; }