PSP-7295 : Create/Edit Appraisal and Assessment

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

@@ -323,6 +323,80 @@
             return new JsonResult(_mapper.Map<DispositionFileSaleModel>(dispositionSale));
         }
 
+        [HttpGet("{id:long}/appraisal")]
+        [HasPermission(Permissions.DispositionView)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileAppraisalModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult GetDispositionFileAppraisal([FromRoute] long id)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(GetDispositionFileAppraisal),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionSale = _dispositionService.GetDispositionFileAppraisal(id);
+            return new JsonResult(_mapper.Map<DispositionFileAppraisalModel>(dispositionSale));
+        }
+
+        [HttpPost("{id:long}/appraisal")]
+        [HasPermission(Permissions.DispositionEdit)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileAppraisalModel), 201)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult AddDispositionFileAppraisal([FromRoute] long id, [FromBody] DispositionFileAppraisalModel dispositionFileAppraisal)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(AddDispositionFileAppraisal),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            try
+            {
+                var dispositionAppraisalEntity = _mapper.Map<Dal.Entities.PimsDispositionAppraisal>(dispositionFileAppraisal);
+                var newDispositionAppraisal = _dispositionService.AddDispositionFileAppraisal(id, dispositionAppraisalEntity);
+
+                return new JsonResult(_mapper.Map<DispositionFileAppraisalModel>(newDispositionAppraisal));
+            }
+            catch (DuplicateEntityException e)
+            {
+                return Conflict(e.Message);
+            }
+        }
+
+        [HttpPut("{id:long}/appraisal/{appraisalId:long}")]
+        [HasPermission(Permissions.DispositionEdit)]
+        [Produces("application/json")]
+        [ProducesResponseType(typeof(DispositionFileAppraisalModel), 200)]
+        [SwaggerOperation(Tags = new[] { "dispositionfile" })]
+        [TypeFilter(typeof(NullJsonResultFilter))]
+        public IActionResult UpdateDispositionFileAppraisal([FromRoute] long id, [FromRoute] long appraisalId, [FromBody] DispositionFileAppraisalModel dispositionFileAppraisal)
+        {
+            _logger.LogInformation(
+                "Request received by Controller: {Controller}, Action: {ControllerAction}, User: {User}, DateTime: {DateTime}",
+                nameof(DispositionFileController),
+                nameof(UpdateDispositionFileAppraisal),
+                User.GetUsername(),
+                DateTime.Now);
+
+            _logger.LogInformation("Dispatching to service: {Service}", _dispositionService.GetType());
+
+            var dispositionAppraisalEntity = _mapper.Map<Dal.Entities.PimsDispositionAppraisal>(dispositionFileAppraisal);
+            var updatedOffer = _dispositionService.UpdateDispositionFileAppraisal(id, appraisalId, dispositionAppraisalEntity);
+
+            return new JsonResult(_mapper.Map<DispositionFileAppraisalModel>(updatedOffer));
+        }
+
         #endregion
     }
 }

source/backend/api/Program.cs

@@ -2,7 +2,6 @@
 using System.Diagnostics.CodeAnalysis;
 using CommandLine;
 using CommandLine.Text;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;

source/backend/api/Services/DispositionFileService.cs

@@ -5,19 +5,17 @@
 using Microsoft.Extensions.Logging;
 using Pims.Api.Constants;
 using Pims.Api.Helpers.Exceptions;
-using Pims.Core.Extensions;
+using Pims.Api.Models.CodeTypes;
 using Pims.Core.Exceptions;
 using Pims.Core.Extensions;
-using Pims.Dal.Constants;
 using Pims.Dal.Entities;
+using Pims.Dal.Entities.Extensions;
 using Pims.Dal.Entities.Models;
 using Pims.Dal.Exceptions;
 using Pims.Dal.Helpers;
 using Pims.Dal.Helpers.Extensions;
 using Pims.Dal.Repositories;
 using Pims.Dal.Security;
-using Pims.Dal.Entities.Extensions;
-using Pims.Api.Models.CodeTypes;
 
 namespace Pims.Api.Services
 {
@@ -209,6 +207,53 @@
             return _dispositionFileRepository.GetDispositionFileSale(dispositionFileId);
         }
 
+        public PimsDispositionAppraisal GetDispositionFileAppraisal(long dispositionFileId)
+        {
+            _logger.LogInformation("Getting disposition file appraisal with DispositionFileId: {id}", dispositionFileId);
+            _user.ThrowIfNotAuthorized(Permissions.DispositionView);
+
+            return _dispositionFileRepository.GetDispositionFileAppraisal(dispositionFileId);
+        }
+
+        public PimsDispositionAppraisal AddDispositionFileAppraisal(long dispositionFileId, PimsDispositionAppraisal dispositionAppraisal)
+        {
+            _logger.LogInformation("Adding disposition file offer to Disposition File with Id: {id}", dispositionFileId);
+            _user.ThrowIfNotAuthorized(Permissions.DispositionEdit);
+
+            var dispositionFileParent = _dispositionFileRepository.GetById(dispositionFileId);
+            if (dispositionFileId != dispositionAppraisal.DispositionFileId || dispositionFileParent is null)
+            {
+                throw new BadRequestException("Invalid dispositionFileId.");
+            }
+
+            if(dispositionFileParent.PimsDispositionAppraisals.Count > 0)
+            {
+                throw new DuplicateEntityException("Invalid Disposition Appraisal. An Appraisal has been already created for this Disposition File");
+            }
+
+            var newAppraisal = _dispositionFileRepository.AddDispositionFileAppraisal(dispositionAppraisal);
+            _dispositionFileRepository.CommitTransaction();
+
+            return newAppraisal;
+        }
+
+        public PimsDispositionAppraisal UpdateDispositionFileAppraisal(long dispositionFileId, long appraisalId, PimsDispositionAppraisal dispositionAppraisal)
+        {
+            _logger.LogInformation("Updating disposition file Appraisal with DispositionFileId: {id}", dispositionFileId);
+            _user.ThrowIfNotAuthorized(Permissions.DispositionEdit);
+
+            var dispositionFileParent = _dispositionFileRepository.GetById(dispositionFileId);
+            if (dispositionFileId != dispositionAppraisal.DispositionFileId || dispositionAppraisal.DispositionAppraisalId != appraisalId || dispositionFileParent is null)
+            {
+                throw new BadRequestException("Invalid dispositionFileId.");
+            }
+
+            var updatedAppraisal = _dispositionFileRepository.UpdateDispositionFileAppraisal(appraisalId, dispositionAppraisal);
+            _dispositionFileRepository.CommitTransaction();
+
+            return updatedAppraisal;
+        }
+
         public IEnumerable<PimsDispositionChecklistItem> GetChecklistItems(long id)
         {
             _logger.LogInformation("Getting disposition file checklist with DispositionFile id: {id}", id);

source/backend/api/Services/IDispositionFileService.cs

@@ -2,7 +2,6 @@
 using Pims.Dal.Entities;
 using Pims.Dal.Entities.Models;
 using Pims.Dal.Exceptions;
-using Pims.Dal.Security;
 
 namespace Pims.Api.Services
 {
@@ -32,6 +31,12 @@ public interface IDispositionFileService
 
         PimsDispositionSale GetDispositionFileSale(long dispositionFileId);
 
+        PimsDispositionAppraisal GetDispositionFileAppraisal(long dispositionFileId);
+
+        PimsDispositionAppraisal AddDispositionFileAppraisal(long dispositionFileId, PimsDispositionAppraisal dispositionAppraisal);
+
+        PimsDispositionAppraisal UpdateDispositionFileAppraisal(long dispositionFileId,long appraisalId, PimsDispositionAppraisal dispositionAppraisal);
+
         IEnumerable<PimsDispositionChecklistItem> GetChecklistItems(long id);
 
         List<DispositionFileExportModel> GetDispositionFileExport(DispositionFilter filter);

source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFileAppraisalMap.cs

@@ -1,6 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
 using Mapster;
+using Pims.Api.Models.Base;
 using Entity = Pims.Dal.Entities;
 
 namespace Pims.Api.Models.Concepts.DispositionFile
@@ -11,19 +10,23 @@ public void Register(TypeAdapterConfig config)
         {
             config.NewConfig<Entity.PimsDispositionAppraisal, DispositionFileAppraisalModel>()
                 .Map(dest => dest.Id, src => src.DispositionAppraisalId)
+                .Map(dest => dest.DispositionFileId, src => src.DispositionFileId)
                 .Map(dest => dest.AppraisedAmount, src => src.AppraisedAmt)
                 .Map(dest => dest.AppraisalDate, src => src.AppraisalDt)
                 .Map(dest => dest.BcaValueAmount, src => src.BcaValueAmt)
                 .Map(dest => dest.BcaRollYear, src => src.BcaRollYear)
-                .Map(dest => dest.ListPriceAmount, src => src.ListPriceAmt);
+                .Map(dest => dest.ListPriceAmount, src => src.ListPriceAmt)
+                .Inherits<Entity.IBaseEntity, BaseConcurrentModel>();
 
             config.NewConfig<DispositionFileAppraisalModel, Entity.PimsDispositionAppraisal>()
                 .Map(dest => dest.DispositionAppraisalId, src => src.Id)
+                .Map(dest => dest.DispositionFileId, src => src.DispositionFileId)
                 .Map(dest => dest.AppraisedAmt, src => src.AppraisedAmount)
                 .Map(dest => dest.AppraisalDt, src => src.AppraisalDate)
                 .Map(dest => dest.BcaValueAmt, src => src.BcaValueAmount)
                 .Map(dest => dest.BcaRollYear, src => src.BcaRollYear)
-                .Map(dest => dest.ListPriceAmt, src => src.ListPriceAmount);
+                .Map(dest => dest.ListPriceAmt, src => src.ListPriceAmount)
+                .Inherits<BaseConcurrentModel, Entity.IBaseEntity>();
         }
     }
 }

source/backend/apimodels/Models/Concepts/DispositionFile/DispositionFileAppraisalModel.cs

@@ -1,18 +1,19 @@
 using System;
-using System.Collections.Generic;
 using Pims.Api.Models.Base;
-using Pims.Api.Models.Concepts.File;
-using Pims.Api.Models.Concepts.DispositionFile;
 
-/*
-* Frontend model
-* LINK @frontend/src\models\api\DispositionFile.ts:14
-*/
 namespace Pims.Api.Models.Concepts.DispositionFile
 {
-    public class DispositionFileAppraisalModel : FileModel
+    public class DispositionFileAppraisalModel : BaseConcurrentModel
     {
-        #region Properties
+        /// <summary>
+        /// get/set - The relationship id.
+        /// </summary>
+        public long? Id { get; set; }
+
+        /// <summary>
+        /// Parent Disposition File.
+        /// </summary>
+        public long DispositionFileId { get; set; }
 
         /// <summary>
         /// PIMS_DISPOSITION_APPRAISAL => get/set - The Disposition Apprasided Value amount.
@@ -38,7 +39,5 @@ public class DispositionFileAppraisalModel : FileModel
         /// PIMS_DISPOSITION_APPRAISAL => get/set - BCA list price amount.
         /// </summary>
         public decimal? ListPriceAmount { get; set; }
-
-        #endregion
     }
 }

source/backend/dal/Repositories/DispositionFileRepository.cs

@@ -294,6 +294,48 @@
                 .Where(x => x.DispositionFileId == dispositionId).FirstOrDefault();
         }
 
+        public PimsDispositionAppraisal GetDispositionFileAppraisal(long dispositionId)
+        {
+            return Context.PimsDispositionAppraisals.AsNoTracking()
+                    .Where(x => x.DispositionFileId == dispositionId).FirstOrDefault();
+        }
+
+        public PimsDispositionAppraisal AddDispositionFileAppraisal(PimsDispositionAppraisal dispositionAppraisal)
+        {
+            Context.PimsDispositionAppraisals.Add(dispositionAppraisal);
+
+            return dispositionAppraisal;
+        }
+
+        public PimsDispositionAppraisal UpdateDispositionFileAppraisal(long id, PimsDispositionAppraisal dispositionAppraisal)
+        {
+            var existingAppraisal = Context.PimsDispositionAppraisals
+                .FirstOrDefault(x => x.DispositionAppraisalId.Equals(id)) ?? throw new KeyNotFoundException();
+
+            Context.Entry(existingAppraisal).CurrentValues.SetValues(dispositionAppraisal);
+
+            return existingAppraisal;
+        }
+
+        /// <summary>
+        /// Get Disposition Files for Export.
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public List<PimsDispositionFile> GetDispositionFileExportDeep(DispositionFilter filter)
+        {
+            // RECOMMENDED - use a log scope to group all potential SQL statements generated by EF for this method call
+            using var scope = Logger.QueryScope();
+
+            filter.ThrowIfNull(nameof(filter));
+            if (!filter.IsValid())
+            {
+                throw new ArgumentException("Argument must have a valid filter", nameof(filter));
+            }
+
+            return GetCommonDispositionFileQueryDeep(filter).ToList();
+        }
+
         /// <summary>
         /// Generate a Common IQueryable for Disposition Files.
         /// </summary>
@@ -395,26 +437,6 @@
 
             return query;
         }
-
-        /// <summary>
-        /// Get Disposition Files for Export.
-        /// </summary>
-        /// <param name="filter"></param>
-        /// <returns></returns>
-        public List<PimsDispositionFile> GetDispositionFileExportDeep(DispositionFilter filter)
-        {
-            // RECOMMENDED - use a log scope to group all potential SQL statements generated by EF for this method call
-            using var scope = Logger.QueryScope();
-
-            filter.ThrowIfNull(nameof(filter));
-            if (!filter.IsValid())
-            {
-                throw new ArgumentException("Argument must have a valid filter", nameof(filter));
-            }
-
-            return GetCommonDispositionFileQueryDeep(filter).ToList();
-        }
-
         #endregion
     }
 }

source/backend/dal/Repositories/Interfaces/IDispositionFileRepository.cs

@@ -28,6 +28,12 @@ public interface IDispositionFileRepository : IRepository
 
         PimsDispositionSale GetDispositionFileSale(long dispositionId);
 
+        PimsDispositionAppraisal GetDispositionFileAppraisal(long dispositionId);
+
+        PimsDispositionAppraisal AddDispositionFileAppraisal(PimsDispositionAppraisal dispositionAppraisal);
+
+        PimsDispositionAppraisal UpdateDispositionFileAppraisal(long id, PimsDispositionAppraisal dispositionAppraisal);
+
         long GetRowVersion(long id);
 
         List<PimsDispositionFile> GetDispositionFileExportDeep(DispositionFilter filter);

source/backend/entities/Partials/DispositionFileAppraisal.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Pims.Dal.Entities
+{
+    /// <summary>
+    /// PimsDispositionAppraisal class, provides an entity for the datamodel.
+    /// </summary>
+    public partial class PimsDispositionAppraisal : StandardIdentityBaseAppEntity<long>, IBaseAppEntity
+    {
+        [NotMapped]
+        public override long Internal_Id { get => this.DispositionAppraisalId; set => this.DispositionAppraisalId = value; }
+    }
+}