Merge pull request bcgov#4143 from devinleighsmith/dev

backmerge test to dev
stairaku · Jun 27, 2024 · 5cb18cb · 5cb18cb
2 parents 1f46985 + 1490784
commit 5cb18cb
Show file tree

Hide file tree

Showing 13 changed files with 3,849 additions and 5,164 deletions.
diff --git a/source/backend/dal/Repositories/TakeRepository.cs b/source/backend/dal/Repositories/TakeRepository.cs
@@ -50,6 +50,7 @@ public PimsTake GetById(long takeId)
         public IEnumerable<PimsTake> GetAllByAcquisitionFileId(long fileId)
         {
             return Context.PimsTakes
+
                 .Include(t => t.PropertyAcquisitionFile)
                 .Include(t => t.TakeSiteContamTypeCodeNavigation)
                 .Include(t => t.TakeStatusTypeCodeNavigation)

diff --git a/source/backend/entities/PimsBaseContext.cs b/source/backend/entities/PimsBaseContext.cs
@@ -4820,7 +4820,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             entity.HasKey(e => e.LeasePeriodHistId).HasName("PIMS_LSTERM_H_PK");
 
-            entity.Property(e => e.LeasePeriodHistId).ValueGeneratedNever();
+            entity.Property(e => e.LeasePeriodHistId).HasDefaultValueSql("(NEXT VALUE FOR [PIMS_LEASE_PERIOD_H_ID_SEQ])");
             entity.Property(e => e.EffectiveDateHist).HasDefaultValueSql("(getutcdate())");
         });
 
@@ -8682,7 +8682,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             .HasMin(1L)
             .HasMax(2147483647L);
         modelBuilder.HasSequence("PIMS_LEASE_PERIOD_H_ID_SEQ")
-            .StartsAt(56L)
             .HasMin(1L)
             .HasMax(2147483647L);
         modelBuilder.HasSequence("PIMS_LEASE_TENANT_H_ID_SEQ")

diff --git a/source/backend/entities/ef/PimsLeasePayment.cs b/source/backend/entities/ef/PimsLeasePayment.cs
@@ -45,6 +45,20 @@ public partial class PimsLeasePayment
     [StringLength(20)]
     public string LeasePaymentStatusTypeCode { get; set; }
 
+    /// <summary>
+    /// Foreign key reference to the PIMS_LEASE_PAYMENT_CATEGORY_TYPE_CODE table.
+    /// </summary>
+    [Column("LEASE_PAYMENT_CATEGORY_TYPE_CODE")]
+    [StringLength(20)]
+    public string LeasePaymentCategoryTypeCode { get; set; }
+
+    /// <summary>
+    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE_CODE table.
+    /// </summary>
+    [Column("LEASE_PMT_FREQ_TYPE_CODE")]
+    [StringLength(20)]
+    public string LeasePmtFreqTypeCode { get; set; }
+
     /// <summary>
     /// Date the payment was received or sent
     /// </summary>
@@ -172,20 +186,6 @@ public partial class PimsLeasePayment
     [StringLength(30)]
     public string DbLastUpdateUserid { get; set; }
 
-    /// <summary>
-    /// Foreign key reference to the PIMS_LEASE_PAYMENT_CATEGORY_TYPE_CODE table.
-    /// </summary>
-    [Column("LEASE_PAYMENT_CATEGORY_TYPE_CODE")]
-    [StringLength(20)]
-    public string LeasePaymentCategoryTypeCode { get; set; }
-
-    /// <summary>
-    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE_CODE table.
-    /// </summary>
-    [Column("LEASE_PMT_FREQ_TYPE_CODE")]
-    [StringLength(20)]
-    public string LeasePmtFreqTypeCode { get; set; }
-
     [ForeignKey("LeasePaymentCategoryTypeCode")]
     [InverseProperty("PimsLeasePayments")]
     public virtual PimsLeasePaymentCategoryType LeasePaymentCategoryTypeCodeNavigation { get; set; }

diff --git a/source/backend/entities/ef/PimsLeasePaymentHist.cs b/source/backend/entities/ef/PimsLeasePaymentHist.cs
@@ -35,6 +35,14 @@ public partial class PimsLeasePaymentHist
     [StringLength(20)]
     public string LeasePaymentStatusTypeCode { get; set; }
 
+    [Column("LEASE_PAYMENT_CATEGORY_TYPE_CODE")]
+    [StringLength(20)]
+    public string LeasePaymentCategoryTypeCode { get; set; }
+
+    [Column("LEASE_PMT_FREQ_TYPE_CODE")]
+    [StringLength(20)]
+    public string LeasePmtFreqTypeCode { get; set; }
+
     [Column("PAYMENT_RECEIVED_DATE", TypeName = "datetime")]
     public DateTime PaymentReceivedDate { get; set; }
 
@@ -104,12 +112,4 @@ public partial class PimsLeasePaymentHist
     [Column("DB_LAST_UPDATE_USERID")]
     [StringLength(30)]
     public string DbLastUpdateUserid { get; set; }
-
-    [Column("LEASE_PAYMENT_CATEGORY_TYPE_CODE")]
-    [StringLength(20)]
-    public string LeasePaymentCategoryTypeCode { get; set; }
-
-    [Column("LEASE_PMT_FREQ_TYPE_CODE")]
-    [StringLength(20)]
-    public string LeasePmtFreqTypeCode { get; set; }
 }
diff --git a/source/backend/entities/ef/PimsLeasePeriod.cs b/source/backend/entities/ef/PimsLeasePeriod.cs
@@ -45,6 +45,27 @@ public partial class PimsLeasePeriod
     [StringLength(20)]
     public string LeasePmtFreqTypeCode { get; set; }
 
+    /// <summary>
+    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE table.
+    /// </summary>
+    [Column("BASE_RENT_FREQ")]
+    [StringLength(20)]
+    public string BaseRentFreq { get; set; }
+
+    /// <summary>
+    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE table.
+    /// </summary>
+    [Column("ADDL_RENT_FREQ")]
+    [StringLength(20)]
+    public string AddlRentFreq { get; set; }
+
+    /// <summary>
+    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE table.
+    /// </summary>
+    [Column("VBL_RENT_FREQ")]
+    [StringLength(20)]
+    public string VblRentFreq { get; set; }
+
     /// <summary>
     /// Start date of the current period of the lease/licence
     /// </summary>
@@ -101,6 +122,54 @@ public partial class PimsLeasePeriod
     [Column("IS_PERIOD_EXERCISED")]
     public bool? IsPeriodExercised { get; set; }
 
+    /// <summary>
+    /// Indicates whether the payment type is predetermined (FALSE) or variable (TRUE).  Predetermined (FALSE) is the default value.
+    /// </summary>
+    [Column("PAYMENT_TYPE")]
+    public bool PaymentType { get; set; }
+
+    /// <summary>
+    /// Indicates whether the period duration is fixed (FALSE) or flexible (TRUE).  Fixed (FALSE) is the default value.
+    /// </summary>
+    [Column("PERIOD_DURATION")]
+    public bool PeriodDuration { get; set; }
+
+    /// <summary>
+    /// Indicates the agreed-to variable base rent payment amount.
+    /// </summary>
+    [Column("BASE_RENT_AGREED_PMT", TypeName = "money")]
+    public decimal? BaseRentAgreedPmt { get; set; }
+
+    /// <summary>
+    /// Is the variable base rent payment subject to GST?
+    /// </summary>
+    [Column("IS_BASE_RENT_SUBJECT_TO_GST")]
+    public bool? IsBaseRentSubjectToGst { get; set; }
+
+    /// <summary>
+    /// Indicates the agreed-to variable additional rent payment amount.
+    /// </summary>
+    [Column("ADDL_RENT_AGREED_PMT", TypeName = "money")]
+    public decimal? AddlRentAgreedPmt { get; set; }
+
+    /// <summary>
+    /// Is the variable additional rent payment subject to GST?
+    /// </summary>
+    [Column("IS_ADDL_RENT_SUBJECT_TO_GST")]
+    public bool? IsAddlRentSubjectToGst { get; set; }
+
+    /// <summary>
+    /// Indicates the agreed-to variable rent payment amount.
+    /// </summary>
+    [Column("VBL_RENT_AGREED_PMT", TypeName = "money")]
+    public decimal? VblRentAgreedPmt { get; set; }
+
+    /// <summary>
+    /// Is the variable rent payment subject to GST?
+    /// </summary>
+    [Column("IS_VBL_RENT_SUBJECT_TO_GST")]
+    public bool? IsVblRentSubjectToGst { get; set; }
+
     /// <summary>
     /// Application code is responsible for retrieving the row and then incrementing the value of the CONCURRENCY_CONTROL_NUMBER column by one prior to issuing an update. If this is done then the update will succeed, provided that the row was not updated by any o
     /// </summary>
@@ -191,75 +260,6 @@ public partial class PimsLeasePeriod
     [StringLength(30)]
     public string DbLastUpdateUserid { get; set; }
 
-    /// <summary>
-    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE table.
-    /// </summary>
-    [Column("BASE_RENT_FREQ")]
-    [StringLength(20)]
-    public string BaseRentFreq { get; set; }
-
-    /// <summary>
-    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE table.
-    /// </summary>
-    [Column("ADDL_RENT_FREQ")]
-    [StringLength(20)]
-    public string AddlRentFreq { get; set; }
-
-    /// <summary>
-    /// Foreign key reference to the PIMS_LEASE_PMT_FREQ_TYPE table.
-    /// </summary>
-    [Column("VBL_RENT_FREQ")]
-    [StringLength(20)]
-    public string VblRentFreq { get; set; }
-
-    /// <summary>
-    /// Indicates whether the payment type is predetermined (FALSE) or variable (TRUE).  Predetermined (FALSE) is the default value.
-    /// </summary>
-    [Column("PAYMENT_TYPE")]
-    public bool PaymentType { get; set; }
-
-    /// <summary>
-    /// Indicates whether the period duration is fixed (FALSE) or flexible (TRUE).  Fixed (FALSE) is the default value.
-    /// </summary>
-    [Column("PERIOD_DURATION")]
-    public bool PeriodDuration { get; set; }
-
-    /// <summary>
-    /// Indicates the agreed-to variable base rent payment amount.
-    /// </summary>
-    [Column("BASE_RENT_AGREED_PMT", TypeName = "money")]
-    public decimal? BaseRentAgreedPmt { get; set; }
-
-    /// <summary>
-    /// Is the variable base rent payment subject to GST?
-    /// </summary>
-    [Column("IS_BASE_RENT_SUBJECT_TO_GST")]
-    public bool? IsBaseRentSubjectToGst { get; set; }
-
-    /// <summary>
-    /// Indicates the agreed-to variable additional rent payment amount.
-    /// </summary>
-    [Column("ADDL_RENT_AGREED_PMT", TypeName = "money")]
-    public decimal? AddlRentAgreedPmt { get; set; }
-
-    /// <summary>
-    /// Is the variable additional rent payment subject to GST?
-    /// </summary>
-    [Column("IS_ADDL_RENT_SUBJECT_TO_GST")]
-    public bool? IsAddlRentSubjectToGst { get; set; }
-
-    /// <summary>
-    /// Indicates the agreed-to variable rent payment amount.
-    /// </summary>
-    [Column("VBL_RENT_AGREED_PMT", TypeName = "money")]
-    public decimal? VblRentAgreedPmt { get; set; }
-
-    /// <summary>
-    /// Is the variable rent payment subject to GST?
-    /// </summary>
-    [Column("IS_VBL_RENT_SUBJECT_TO_GST")]
-    public bool? IsVblRentSubjectToGst { get; set; }
-
     [ForeignKey("AddlRentFreq")]
     [InverseProperty("PimsLeasePeriodAddlRentFreqNavigations")]
     public virtual PimsLeasePmtFreqType AddlRentFreqNavigation { get; set; }

diff --git a/source/backend/entities/ef/PimsLeasePeriodHist.cs b/source/backend/entities/ef/PimsLeasePeriodHist.cs
@@ -34,6 +34,18 @@ public partial class PimsLeasePeriodHist
     [StringLength(20)]
     public string LeasePmtFreqTypeCode { get; set; }
 
+    [Column("BASE_RENT_FREQ")]
+    [StringLength(20)]
+    public string BaseRentFreq { get; set; }
+
+    [Column("ADDL_RENT_FREQ")]
+    [StringLength(20)]
+    public string AddlRentFreq { get; set; }
+
+    [Column("VBL_RENT_FREQ")]
+    [StringLength(20)]
+    public string VblRentFreq { get; set; }
+
     [Column("PERIOD_START_DATE", TypeName = "datetime")]
     public DateTime PeriodStartDate { get; set; }
 
@@ -63,6 +75,30 @@ public partial class PimsLeasePeriodHist
     [Column("IS_PERIOD_EXERCISED")]
     public bool? IsPeriodExercised { get; set; }
 
+    [Column("PAYMENT_TYPE")]
+    public bool PaymentType { get; set; }
+
+    [Column("PERIOD_DURATION")]
+    public bool PeriodDuration { get; set; }
+
+    [Column("BASE_RENT_AGREED_PMT", TypeName = "money")]
+    public decimal? BaseRentAgreedPmt { get; set; }
+
+    [Column("IS_BASE_RENT_SUBJECT_TO_GST")]
+    public bool? IsBaseRentSubjectToGst { get; set; }
+
+    [Column("ADDL_RENT_AGREED_PMT", TypeName = "money")]
+    public decimal? AddlRentAgreedPmt { get; set; }
+
+    [Column("IS_ADDL_RENT_SUBJECT_TO_GST")]
+    public bool? IsAddlRentSubjectToGst { get; set; }
+
+    [Column("VBL_RENT_AGREED_PMT", TypeName = "money")]
+    public decimal? VblRentAgreedPmt { get; set; }
+
+    [Column("IS_VBL_RENT_SUBJECT_TO_GST")]
+    public bool? IsVblRentSubjectToGst { get; set; }
+
     [Column("CONCURRENCY_CONTROL_NUMBER")]
     public long ConcurrencyControlNumber { get; set; }
 
@@ -113,40 +149,4 @@ public partial class PimsLeasePeriodHist
     [Column("DB_LAST_UPDATE_USERID")]
     [StringLength(30)]
     public string DbLastUpdateUserid { get; set; }
-
-    [Column("BASE_RENT_FREQ")]
-    [StringLength(20)]
-    public string BaseRentFreq { get; set; }
-
-    [Column("ADDL_RENT_FREQ")]
-    [StringLength(20)]
-    public string AddlRentFreq { get; set; }
-
-    [Column("VBL_RENT_FREQ")]
-    [StringLength(20)]
-    public string VblRentFreq { get; set; }
-
-    [Column("PAYMENT_TYPE")]
-    public bool PaymentType { get; set; }
-
-    [Column("PERIOD_DURATION")]
-    public bool PeriodDuration { get; set; }
-
-    [Column("BASE_RENT_AGREED_PMT", TypeName = "money")]
-    public decimal? BaseRentAgreedPmt { get; set; }
-
-    [Column("IS_BASE_RENT_SUBJECT_TO_GST")]
-    public bool? IsBaseRentSubjectToGst { get; set; }
-
-    [Column("ADDL_RENT_AGREED_PMT", TypeName = "money")]
-    public decimal? AddlRentAgreedPmt { get; set; }
-
-    [Column("IS_ADDL_RENT_SUBJECT_TO_GST")]
-    public bool? IsAddlRentSubjectToGst { get; set; }
-
-    [Column("VBL_RENT_AGREED_PMT", TypeName = "money")]
-    public decimal? VblRentAgreedPmt { get; set; }
-
-    [Column("IS_VBL_RENT_SUBJECT_TO_GST")]
-    public bool? IsVblRentSubjectToGst { get; set; }
 }
diff --git a/source/backend/entities/ef/PimsPropertyAcquisitionFile.cs b/source/backend/entities/ef/PimsPropertyAcquisitionFile.cs
@@ -42,6 +42,12 @@ public partial class PimsPropertyAcquisitionFile
     [StringLength(500)]
     public string PropertyName { get; set; }
 
+    /// <summary>
+    /// Geospatial location (pin) of property
+    /// </summary>
+    [Column("LOCATION", TypeName = "geometry")]
+    public Geometry Location { get; set; }
+
     /// <summary>
     /// Force the display order of the codes.
     /// </summary>
@@ -138,12 +144,6 @@ public partial class PimsPropertyAcquisitionFile
     [StringLength(30)]
     public string DbLastUpdateUserid { get; set; }
 
-    /// <summary>
-    /// Geospatial location (pin) of property
-    /// </summary>
-    [Column("LOCATION", TypeName = "geometry")]
-    public Geometry Location { get; set; }
-
     [ForeignKey("AcquisitionFileId")]
     [InverseProperty("PimsPropertyAcquisitionFiles")]
     public virtual PimsAcquisitionFile AcquisitionFile { get; set; }