Scaffold S100 (#4659)

* Generated scaffold

* Fixed compilation and tests

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

@@ -229,22 +229,22 @@ public IActionResult GetCompensationRequisitionFinancials([FromRoute] long id)
         [HttpGet("{id:long}/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));
         }
     }
 }

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

source/backend/api/Services/CompensationRequisitionService.cs

@@ -171,12 +171,12 @@ 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);
             _user.ThrowIfNotAuthorized(Permissions.CompensationRequisitionView);
 
-            return _compensationRequisitionRepository.GetCompensationRequisitionPayees(compReqId);
+            return _compensationRequisitionRepository.GetCompensationRequisitionAcquisitionPayees(compReqId);
         }
 
         private static string GetCompensationRequisitionStatusText(bool? isDraft)

source/backend/api/Services/ICompensationRequisitionService.cs

@@ -22,6 +22,6 @@ public interface ICompensationRequisitionService
 
         IEnumerable<PimsCompReqFinancial> GetCompensationRequisitionFinancials(long compReqId);
 
-        IEnumerable<PimsCompReqPayee> GetCompensationRequisitionPayees(long compReqId);
+        IEnumerable<PimsCompReqAcqPayee> GetCompensationRequisitionAcquisitionPayees(long compReqId);
     }
 }

source/backend/api/Services/LeaseService.cs

@@ -768,17 +768,17 @@ private void ValidateStakeholdersDependency(long leaseId, IEnumerable<PimsLeaseS
 
             foreach (var compReq in compensationRequisitions)
             {
-                var leaseStakeholderCompensationRequisitions = compReq.PimsLeaseStakeholderCompReqs;
-                if (leaseStakeholderCompensationRequisitions is null || leaseStakeholderCompensationRequisitions.Count == 0)
+                var leasePayeesCompensationRequisitions = compReq.PimsCompReqLeasePayees;
+                if (leasePayeesCompensationRequisitions is null || leasePayeesCompensationRequisitions.Count == 0)
                 {
                     continue;
                 }
 
-                // Check for lease stakeholders
-                foreach (var leaseStakeholderCompReq in leaseStakeholderCompensationRequisitions)
+                // Check for lease payees
+                foreach (var leasePayeeCompReq in leasePayeesCompensationRequisitions)
                 {
-                    if (!stakeholders.Any(x => x.Internal_Id.Equals(leaseStakeholderCompReq.LeaseStakeholderId))
-                        && currentLease.PimsLeaseStakeholders.Any(x => x.Internal_Id.Equals(leaseStakeholderCompReq.LeaseStakeholderId)))
+                    if (!stakeholders.Any(x => x.Internal_Id.Equals(leasePayeeCompReq.LeaseStakeholderId))
+                        && currentLease.PimsLeaseStakeholders.Any(x => x.Internal_Id.Equals(leasePayeeCompReq.LeaseStakeholderId)))
                     {
                         throw new ForeignKeyDependencyException("Lease File Stakeholder can not be removed since it's assigned as a payee for a compensation requisition");
                     }

source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqPayeeMap.cs → source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqAcqPayeeMap.cs

@@ -4,12 +4,12 @@
 
 namespace Pims.Api.Models.Concepts.CompensationRequisition
 {
-    public class CompReqPayeeMap : IRegister
+    public class CompReqAcqPayeeMap : IRegister
     {
         public void Register(TypeAdapterConfig config)
         {
-            config.NewConfig<Entity.PimsCompReqPayee, CompReqPayeeModel>()
-                .Map(dest => dest.CompReqPayeeId, src => src.CompReqPayeeId)
+            config.NewConfig<Entity.PimsCompReqAcqPayee, CompReqAcqPayeeModel>()
+                .Map(dest => dest.CompReqAcqPayeeId, src => src.CompReqAcqPayeeId)
                 .Map(dest => dest.CompensationRequisitionId, src => src.CompensationRequisitionId)
                 .Map(dest => dest.AcquisitionFileTeamId, src => src.AcquisitionFileTeamId)
                 .Map(dest => dest.AcquisitionFileTeam, src => src.AcquisitionFileTeam)
@@ -20,8 +20,8 @@ public void Register(TypeAdapterConfig config)
                 .Map(dest => dest.LegacyPayee, src => src.LegacyPayee)
                 .Inherits<Entity.IBaseEntity, BaseConcurrentModel>();
 
-            config.NewConfig<CompReqPayeeModel, Entity.PimsCompReqPayee>()
-                .Map(dest => dest.CompReqPayeeId, src => src.CompReqPayeeId)
+            config.NewConfig<CompReqAcqPayeeModel, Entity.PimsCompReqAcqPayee>()
+                .Map(dest => dest.CompReqAcqPayeeId, src => src.CompReqAcqPayeeId)
                 .Map(dest => dest.CompensationRequisitionId, src => src.CompensationRequisitionId)
                 .Map(dest => dest.AcquisitionFileTeamId, src => src.AcquisitionFileTeamId)
                 .Map(dest => dest.AcquisitionOwnerId, src => src.AcquisitionOwnerId)

source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqPayeeModel.cs → source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqAcqPayeeModel.cs

@@ -4,9 +4,9 @@
 
 namespace Pims.Api.Models.Concepts.CompensationRequisition
 {
-    public class CompReqPayeeModel : BaseAuditModel
+    public class CompReqAcqPayeeModel : BaseAuditModel
     {
-        public long? CompReqPayeeId { get; set; }
+        public long? CompReqAcqPayeeId { get; set; }
 
         public long? CompensationRequisitionId { get; set; }
 

source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqLeaseStakeholderMap.cs → source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqLeasePayeeMap.cs

@@ -8,15 +8,15 @@ public class CompReqLeaseStakeholderMap : IRegister
     {
         public void Register(TypeAdapterConfig config)
         {
-            config.NewConfig<Entity.PimsLeaseStakeholderCompReq, CompReqLeaseStakeholderModel>()
-                .Map(dest => dest.CompReqLeaseStakeholderId, src => src.LeaseStakeholderCompReqId)
+            config.NewConfig<Entity.PimsCompReqLeasePayee, CompReqLeasePayeeModel>()
+                .Map(dest => dest.CompReqLeasePayeeId, src => src.CompReqLeasePayeeId)
                 .Map(dest => dest.CompensationRequisitionId, src => src.CompensationRequisitionId)
                 .Map(dest => dest.LeaseStakeholderId, src => src.LeaseStakeholderId)
                 .Map(dest => dest.LeaseStakeholder, src => src.LeaseStakeholder)
                 .Inherits<Entity.IBaseAppEntity, BaseAuditModel>();
 
-            config.NewConfig<CompReqLeaseStakeholderModel,  Entity.PimsLeaseStakeholderCompReq>()
-                .Map(dest => dest.LeaseStakeholderCompReqId, src => src.CompReqLeaseStakeholderId)
+            config.NewConfig<CompReqLeasePayeeModel,  Entity.PimsCompReqLeasePayee>()
+                .Map(dest => dest.CompReqLeasePayeeId, src => src.CompReqLeasePayeeId)
                 .Map(dest => dest.CompensationRequisitionId, src => src.CompensationRequisitionId)
                 .Map(dest => dest.LeaseStakeholderId, src => src.LeaseStakeholderId)
                 .Inherits<BaseAuditModel, Entity.IBaseAppEntity>();

source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqLeaseStakeholderModel.cs → source/backend/apimodels/Models/Concepts/CompensationRequisition/CompReqLeasePayeeModel.cs

@@ -3,9 +3,9 @@
 
 namespace Pims.Api.Models.Concepts.CompensationRequisition
 {
-    public class CompReqLeaseStakeholderModel : BaseAuditModel
+    public class CompReqLeasePayeeModel : BaseAuditModel
     {
-        public long? CompReqLeaseStakeholderId { get; set; }
+        public long? CompReqLeasePayeeId { get; set; }
 
         public long CompensationRequisitionId { get; set; }
 

source/backend/apimodels/Models/Concepts/CompensationRequisition/CompensationRequisitionMap.cs

@@ -8,7 +8,8 @@ public class CompensationRequisitionMap : IRegister
     {
         public void Register(TypeAdapterConfig config)
         {
-            config.NewConfig<Entity.PimsCompensationRequisition, CompensationRequisitionModel>()
+            config
+                .NewConfig<Entity.PimsCompensationRequisition, CompensationRequisitionModel>()
                 .Map(dest => dest.Id, src => src.CompensationRequisitionId)
                 .Map(dest => dest.AcquisitionFileId, src => src.AcquisitionFileId)
                 .Map(dest => dest.AcquisitionFile, src => src.AcquisitionFile)
@@ -32,13 +33,14 @@ public void Register(TypeAdapterConfig config)
                 .Map(dest => dest.DetailedRemarks, src => src.DetailedRemarks)
                 .Map(dest => dest.AlternateProjectId, src => src.AlternateProjectId)
                 .Map(dest => dest.AlternateProject, src => src.AlternateProject)
-                .Map(dest => dest.CompReqLeaseStakeholders, src => src.PimsLeaseStakeholderCompReqs)
+                //.Map(dest => dest.CompReqLeaseStakeholders, src => src.PimsLeaseStakeholderCompReqs) TODO: Needs fixing
                 .Map(dest => dest.CompReqAcquisitionProperties, src => src.PimsPropAcqFlCompReqs)
                 .Map(dest => dest.CompReqLeaseProperties, src => src.PimsPropLeaseCompReqs)
-                .Map(dest => dest.CompReqPayees, src => src.PimsCompReqPayees)
+                //.Map(dest => dest.CompReqPayees, src => src.PimsCompReqPayees) TODO: Needs fixing
                 .Inherits<Entity.IBaseAppEntity, BaseAuditModel>();
 
-            config.NewConfig<CompensationRequisitionModel, Entity.PimsCompensationRequisition>()
+            config
+                .NewConfig<CompensationRequisitionModel, Entity.PimsCompensationRequisition>()
                 .Map(dest => dest.CompensationRequisitionId, src => src.Id)
                 .Map(dest => dest.AcquisitionFileId, src => src.AcquisitionFileId)
                 .Map(dest => dest.LeaseId, src => src.LeaseId)
@@ -58,10 +60,10 @@ public void Register(TypeAdapterConfig config)
                 .Map(dest => dest.DetailedRemarks, src => src.DetailedRemarks)
                 .Map(dest => dest.AlternateProjectId, src => src.AlternateProjectId)
                 .Map(dest => dest.AlternateProject, src => src.AlternateProject)
-                .Map(dest => dest.PimsLeaseStakeholderCompReqs, src => src.CompReqLeaseStakeholders)
+                //.Map(dest => dest.PimsLeaseStakeholderCompReqs, src => src.CompReqLeaseStakeholders) TODO: Needs fixing
                 .Map(dest => dest.PimsPropAcqFlCompReqs, src => src.CompReqAcquisitionProperties)
                 .Map(dest => dest.PimsPropLeaseCompReqs, src => src.CompReqLeaseProperties)
-                .Map(dest => dest.PimsCompReqPayees, src => src.CompReqPayees)
+                //.Map(dest => dest.PimsCompReqPayees, src => src.CompReqPayees) TODO: Needs fixing
                 .Inherits<BaseAuditModel, Entity.IBaseAppEntity>();
         }
     }

source/backend/apimodels/Models/Concepts/CompensationRequisition/CompensationRequisitionModel.cs

@@ -53,9 +53,9 @@ public class CompensationRequisitionModel : BaseAuditModel
 
         public ProjectModel AlternateProject { get; set; }
 
-        public IEnumerable<CompReqPayeeModel> CompReqPayees { get; set; }
+        public IEnumerable<CompReqAcqPayeeModel> CompReqAcqPayees { get; set; }
 
-        public IEnumerable<CompReqLeaseStakeholderModel> CompReqLeaseStakeholders { get; set; }
+        public IEnumerable<CompReqLeasePayeeModel> CompReqLeasePayees { get; set; }
 
         public IEnumerable<CompReqAcquisitionPropertyModel> CompReqAcquisitionProperties { get; set; }
 

source/backend/dal/Repositories/CompensationRequisitionRepository.cs

@@ -31,7 +31,7 @@ public IList<PimsCompensationRequisition> GetAllByAcquisitionFileId(long acquisi
         {
             return Context.PimsCompensationRequisitions
                 .Include(c => c.PimsCompReqFinancials)
-                .Include(p => p.PimsCompReqPayees)
+                .Include(p => p.PimsCompReqAcqPayees)
                 .AsNoTracking()
                 .Where(c => c.AcquisitionFileId == acquisitionFileId).ToList();
         }
@@ -40,7 +40,7 @@ public IList<PimsCompensationRequisition> GetAllByLeaseFileId(long leaseFileId)
         {
             return Context.PimsCompensationRequisitions
                 .Include(c => c.PimsCompReqFinancials)
-                .Include(c => c.PimsLeaseStakeholderCompReqs)
+                .Include(c => c.PimsCompReqLeasePayees)
                 .AsNoTracking()
                 .Where(c => c.LeaseId == leaseFileId).ToList();
         }
@@ -60,12 +60,12 @@ public PimsCompensationRequisition GetById(long compensationRequisitionId)
                 .Include(x => x.Responsibility)
                 .Include(c => c.PimsCompReqFinancials)
                     .ThenInclude(y => y.FinancialActivityCode)
-                .Include(c => c.PimsCompReqPayees)
+                .Include(c => c.PimsCompReqAcqPayees)
                 .Include(x => x.AlternateProject)
-                .Include(x => x.PimsLeaseStakeholderCompReqs)
+                .Include(x => x.PimsCompReqLeasePayees)
                     .ThenInclude(y => y.LeaseStakeholder)
                         .ThenInclude(z => z.LeaseStakeholderTypeCodeNavigation)
-                .Include(x => x.PimsLeaseStakeholderCompReqs)
+                .Include(x => x.PimsCompReqLeasePayees)
                     .ThenInclude(y => y.LeaseStakeholder)
                         .ThenInclude(z => z.LessorTypeCodeNavigation)
                 .Include(x => x.PimsPropAcqFlCompReqs)
@@ -89,8 +89,8 @@ public PimsCompensationRequisition Update(PimsCompensationRequisition compensati
             Context.UpdateChild<PimsCompensationRequisition, long, PimsCompReqFinancial, long>(a => a.PimsCompReqFinancials, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsCompReqFinancials.ToArray(), true);
             Context.UpdateChild<PimsCompensationRequisition, long, PimsPropAcqFlCompReq, long>(a => a.PimsPropAcqFlCompReqs, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsPropAcqFlCompReqs.ToArray(), true);
             Context.UpdateChild<PimsCompensationRequisition, long, PimsPropLeaseCompReq, long>(a => a.PimsPropLeaseCompReqs, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsPropLeaseCompReqs.ToArray(), true);
-            Context.UpdateChild<PimsCompensationRequisition, long, PimsLeaseStakeholderCompReq, long>(a => a.PimsLeaseStakeholderCompReqs, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsLeaseStakeholderCompReqs.ToArray(), true);
-            Context.UpdateChild<PimsCompensationRequisition, long, PimsCompReqPayee, long>(a => a.PimsCompReqPayees, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsCompReqPayees.ToArray(), true);
+            Context.UpdateChild<PimsCompensationRequisition, long, PimsCompReqLeasePayee, long>(a => a.PimsCompReqLeasePayees, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsCompReqLeasePayees.ToArray(), true);
+            Context.UpdateChild<PimsCompensationRequisition, long, PimsCompReqAcqPayee, long>(a => a.PimsCompReqLeasePayees, compensationRequisition.CompensationRequisitionId, compensationRequisition.PimsCompReqAcqPayees.ToArray(), true);
 
             return compensationRequisition;
         }
@@ -101,8 +101,8 @@ public bool TryDelete(long compensationId)
                 .Include(fa => fa.PimsCompReqFinancials)
                 .Include(p => p.PimsPropAcqFlCompReqs)
                 .Include(l => l.PimsPropLeaseCompReqs)
-                .Include(s => s.PimsLeaseStakeholderCompReqs)
-                .Include(ap => ap.PimsCompReqPayees)
+                .Include(s => s.PimsCompReqLeasePayees)
+                .Include(ap => ap.PimsCompReqAcqPayees)
                 .AsNoTracking()
                 .FirstOrDefault(c => c.CompensationRequisitionId == compensationId);
 
@@ -123,14 +123,14 @@ public bool TryDelete(long compensationId)
                     Context.PimsPropLeaseCompReqs.Remove(new PimsPropLeaseCompReq() { PropLeaseCompReqId = propLeaseFile.PropLeaseCompReqId });
                 }
 
-                foreach (var compReqLeaseStakeholder in deletedEntity.PimsLeaseStakeholderCompReqs)
+                foreach (var compReqLeaseStakeholder in deletedEntity.PimsCompReqLeasePayees)
                 {
-                    Context.PimsLeaseStakeholderCompReqs.Remove(new PimsLeaseStakeholderCompReq() { LeaseStakeholderCompReqId = compReqLeaseStakeholder.LeaseStakeholderCompReqId });
+                    Context.PimsCompReqLeasePayees.Remove(new PimsCompReqLeasePayee() { CompReqLeasePayeeId = compReqLeaseStakeholder.CompReqLeasePayeeId });
                 }
 
-                foreach (var compReqAcqPayee in deletedEntity.PimsCompReqPayees)
+                foreach (var compReqAcqPayee in deletedEntity.PimsCompReqAcqPayees)
                 {
-                    Context.PimsCompReqPayees.Remove(new() { CompReqPayeeId = compReqAcqPayee.CompReqPayeeId });
+                    Context.PimsCompReqAcqPayees.Remove(new() { CompReqAcqPayeeId = compReqAcqPayee.CompReqAcqPayeeId });
                 }
 
                 Context.CommitTransaction(); // TODO: required to enforce delete order. Can be removed when cascade deletes are implemented.
@@ -196,9 +196,9 @@ public IEnumerable<PimsCompReqFinancial> GetCompensationRequisitionFinancials(lo
                 .ToList();
         }
 
-        public IEnumerable<PimsCompReqPayee> GetCompensationRequisitionPayees(long compReqId)
+        public IEnumerable<PimsCompReqAcqPayee> GetCompensationRequisitionAcquisitionPayees(long compReqId)
         {
-            return Context.PimsCompReqPayees
+            return Context.PimsCompReqAcqPayees
                 .AsNoTracking()
                 .Include(x => x.AcquisitionOwner)
                 .Include(x => x.AcquisitionFileTeam)