Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scaffold/s79 #3975

Merged
merged 3 commits into from
Apr 26, 2024
Merged

Scaffold/s79 #3975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed53989
Generated scaffold
FuriousLlama Apr 26, 2024
fa6a1ad
Compilation fixes
FuriousLlama Apr 26, 2024
4c8f9e7
Merge branch 'dev' into scaffold/s79
FuriousLlama Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/backend/api/Services/AcquisitionFileService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public List<AcquisitionFileExportModel> GetAcquisitionFileExport(AcquisitionFilt
FileFunding = fileProperty.file.AcquisitionFundingTypeCodeNavigation is not null ? fileProperty.file.AcquisitionFundingTypeCodeNavigation.Description : string.Empty,
FileAssignedDate = fileProperty.file.AssignedDate.HasValue ? fileProperty.file.AssignedDate.Value.ToString("dd-MMM-yyyy") : string.Empty,
FileDeliveryDate = fileProperty.file.DeliveryDate.HasValue ? fileProperty.file.DeliveryDate.Value.ToString("dd-MMM-yyyy") : string.Empty,
FileAcquisitionCompleted = fileProperty.file.CompletionDate.HasValue ? fileProperty.file.CompletionDate.Value.ToString("dd-MMM-yyyy") : string.Empty,
//FileAcquisitionCompleted = fileProperty.file.CompletionDate.HasValue ? fileProperty.file.CompletionDate.Value.ToString("dd-MMM-yyyy") : string.Empty, TODO: Fix mappings
FilePhysicalStatus = fileProperty.file.AcqPhysFileStatusTypeCodeNavigation is not null ? fileProperty.file.AcqPhysFileStatusTypeCodeNavigation.Description : string.Empty,
FileAcquisitionType = fileProperty.file.AcquisitionTypeCodeNavigation is not null ? fileProperty.file.AcquisitionTypeCodeNavigation.Description : string.Empty,
FileAcquisitionTeam = string.Join(", ", fileProperty.file.PimsAcquisitionFileTeams.Select(x => x.PersonId.HasValue ? x.Person.GetFullName(true) : x.Organization.Name)),
Expand Down
139 changes: 136 additions & 3 deletions source/backend/entities/PimsBaseContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ public PimsBaseContext(DbContextOptions<PimsBaseContext> options)

public virtual DbSet<PimsFenceType> PimsFenceTypes { get; set; }

public virtual DbSet<PimsFileNumber> PimsFileNumbers { get; set; }

public virtual DbSet<PimsFileNumberHist> PimsFileNumberHists { get; set; }

public virtual DbSet<PimsFileNumberType> PimsFileNumberTypes { get; set; }

public virtual DbSet<PimsFinancialActivityCode> PimsFinancialActivityCodes { get; set; }

public virtual DbSet<PimsFinancialActivityCodeHist> PimsFinancialActivityCodeHists { get; set; }
Expand Down Expand Up @@ -878,7 +884,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
entity.Property(e => e.AssignedDate)
.HasDefaultValueSql("(getutcdate())")
.HasComment("Date of file assignment.");
entity.Property(e => e.CompletionDate).HasComment("Date of acquisition file completion.");
entity.Property(e => e.ConcurrencyControlNumber).HasDefaultValue(1L);
entity.Property(e => e.DbCreateTimestamp).HasDefaultValueSql("(getutcdate())");
entity.Property(e => e.DbCreateUserid).HasDefaultValueSql("(user_name())");
Expand Down Expand Up @@ -3505,6 +3510,113 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
entity.Property(e => e.IsDisabled).HasComment("Indicates if the code value is inactive.");
});

modelBuilder.Entity<PimsFileNumber>(entity =>
{
entity.HasKey(e => e.FileNumberId).HasName("FILNUM_PK");

entity.ToTable("PIMS_FILE_NUMBER", tb =>
{
tb.HasComment("Table containing the file numbers associated with a property.");
tb.HasTrigger("PIMS_FILNUM_A_S_IUD_TR");
tb.HasTrigger("PIMS_FILNUM_I_S_I_TR");
tb.HasTrigger("PIMS_FILNUM_I_S_U_TR");
});

entity.Property(e => e.FileNumberId)
.HasDefaultValueSql("(NEXT VALUE FOR [PIMS_FILE_NUMBER_ID_SEQ])")
.HasComment("Generated surrogate primary key");
entity.Property(e => e.AppCreateTimestamp)
.HasDefaultValueSql("(getutcdate())")
.HasComment("The date and time the user created the record.");
entity.Property(e => e.AppCreateUserDirectory)
.HasDefaultValueSql("(user_name())")
.HasComment("The directory of the user account that created the record.");
entity.Property(e => e.AppCreateUserGuid).HasComment("The GUID of the user account that created the record.");
entity.Property(e => e.AppCreateUserid)
.HasDefaultValueSql("(user_name())")
.HasComment("The user account that created the record.");
entity.Property(e => e.AppLastUpdateTimestamp)
.HasDefaultValueSql("(getutcdate())")
.HasComment("The date and time the user updated the record.");
entity.Property(e => e.AppLastUpdateUserDirectory)
.HasDefaultValueSql("(user_name())")
.HasComment("The directory of the user account that updated the record.");
entity.Property(e => e.AppLastUpdateUserGuid).HasComment("The GUID of the user account that updated the record.");
entity.Property(e => e.AppLastUpdateUserid)
.HasDefaultValueSql("(user_name())")
.HasComment("The user account that updated the record.");
entity.Property(e => e.ConcurrencyControlNumber)
.HasDefaultValue(1L)
.HasComment("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");
entity.Property(e => e.DbCreateTimestamp)
.HasDefaultValueSql("(getutcdate())")
.HasComment("The date and time the record was created.");
entity.Property(e => e.DbCreateUserid)
.HasDefaultValueSql("(user_name())")
.HasComment("The user or proxy account that created the record.");
entity.Property(e => e.DbLastUpdateTimestamp)
.HasDefaultValueSql("(getutcdate())")
.HasComment("The date and time the record was created or last updated.");
entity.Property(e => e.DbLastUpdateUserid)
.HasDefaultValueSql("(user_name())")
.HasComment("The user or proxy account that created or last updated the record.");
entity.Property(e => e.FileNumber).HasComment("The file number value.");
entity.Property(e => e.FileNumberTypeCode).HasComment("Foreign key describing the file number type.");
entity.Property(e => e.IsDisabled)
.HasDefaultValue(false)
.HasComment("Indicates if the record is disabled.");
entity.Property(e => e.OtherFileNumberType).HasComment("Description of file number type that's not currently listed.");
entity.Property(e => e.PropertyId).HasComment("Foreign key to the PIMS_PROPERTY table.");

entity.HasOne(d => d.FileNumberTypeCodeNavigation).WithMany(p => p.PimsFileNumbers)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("PIM_FLNMTY_PIM_FILNUM_FK");

entity.HasOne(d => d.Property).WithMany(p => p.PimsFileNumbers)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("PIM_PRPRTY_PIM_FILNUM_FK");
});

modelBuilder.Entity<PimsFileNumberHist>(entity =>
{
entity.HasKey(e => e.FileNumberHistId).HasName("PIMS_FILNUM_H_PK");

entity.Property(e => e.FileNumberHistId).HasDefaultValueSql("(NEXT VALUE FOR [PIMS_FILE_NUMBER_H_ID_SEQ])");
entity.Property(e => e.EffectiveDateHist).HasDefaultValueSql("(getutcdate())");
});

modelBuilder.Entity<PimsFileNumberType>(entity =>
{
entity.HasKey(e => e.FileNumberTypeCode).HasName("FLNMTY_PK");

entity.ToTable("PIMS_FILE_NUMBER_TYPE", tb =>
{
tb.HasComment("Code table to describe the type of property file number.");
tb.HasTrigger("PIMS_FLNMTY_I_S_I_TR");
tb.HasTrigger("PIMS_FLNMTY_I_S_U_TR");
});

entity.Property(e => e.FileNumberTypeCode).HasComment("Code representing the type of file number.");
entity.Property(e => e.ConcurrencyControlNumber)
.HasDefaultValue(1L)
.HasComment("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");
entity.Property(e => e.DbCreateTimestamp)
.HasDefaultValueSql("(getutcdate())")
.HasComment("The date and time the record was created.");
entity.Property(e => e.DbCreateUserid)
.HasDefaultValueSql("(user_name())")
.HasComment("The user or proxy account that created the record.");
entity.Property(e => e.DbLastUpdateTimestamp)
.HasDefaultValueSql("(getutcdate())")
.HasComment("The date and time the record was created or last updated.");
entity.Property(e => e.DbLastUpdateUserid)
.HasDefaultValueSql("(user_name())")
.HasComment("The user or proxy account that created or last updated the record.");
entity.Property(e => e.Description).HasComment("Description of the type of file number.");
entity.Property(e => e.DisplayOrder).HasComment("Force the display order of the codes.");
entity.Property(e => e.IsDisabled).HasComment("Indicates if the code is disabled.");
});

modelBuilder.Entity<PimsFinancialActivityCode>(entity =>
{
entity.HasKey(e => e.Id).HasName("FINACT_PK");
Expand Down Expand Up @@ -5591,8 +5703,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
tb.HasTrigger("PIMS_PRPRTY_I_S_U_TR");
});

entity.Property(e => e.PropertyId).HasDefaultValueSql("(NEXT VALUE FOR [PIMS_PROPERTY_ID_SEQ])");
entity.Property(e => e.PropertyId)
.HasDefaultValueSql("(NEXT VALUE FOR [PIMS_PROPERTY_ID_SEQ])")
.HasComment("Generated surrogate primary key");
entity.Property(e => e.AdditionalDetails).HasComment("Additional details about the property.");
entity.Property(e => e.AddressId).HasComment("Foreign key to the address table.");
entity.Property(e => e.AppCreateTimestamp).HasDefaultValueSql("(getutcdate())");
entity.Property(e => e.AppLastUpdateTimestamp).HasDefaultValueSql("(getutcdate())");
entity.Property(e => e.BandName).HasComment("Name of the Indian band.");
Expand All @@ -5603,6 +5718,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
entity.Property(e => e.DbLastUpdateTimestamp).HasDefaultValueSql("(getutcdate())");
entity.Property(e => e.DbLastUpdateUserid).HasDefaultValueSql("(user_name())");
entity.Property(e => e.Description).HasComment("Property description");
entity.Property(e => e.DistrictCode).HasComment("Foreign key to the district table.");
entity.Property(e => e.EncumbranceReason).HasComment("reason for property encumbreance");
entity.Property(e => e.FileNumber).HasComment("The (ARCS/ORCS) number identifying the Property File.");
entity.Property(e => e.FileNumberSuffix).HasComment("A suffix to distinguish between Property Files with the same number.");
Expand Down Expand Up @@ -5630,16 +5746,27 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
entity.Property(e => e.Notes).HasComment("Notes about the property");
entity.Property(e => e.Pid).HasComment("Property ID");
entity.Property(e => e.Pin).HasComment("Property number");
entity.Property(e => e.PphStatusTypeCode).HasComment("Foreign key to the provincial public highway status type table.");
entity.Property(e => e.PphStatusUpdateTimestamp).HasComment("Date / time that the Provincial Public Highway status was updated.");
entity.Property(e => e.PphStatusUpdateUserGuid).HasComment("GUID of the user that updated the PPH status.");
entity.Property(e => e.PphStatusUpdateUserid).HasComment("Userid that updated the Provincial Public Highway status.");
entity.Property(e => e.PropertyClassificationTypeCode).HasDefaultValue("UNKNOWN");
entity.Property(e => e.PropertyAreaUnitTypeCode).HasComment("Foreign key to the property area unit type table.");
entity.Property(e => e.PropertyClassificationTypeCode)
.HasDefaultValue("UNKNOWN")
.HasComment("Foreign key to the proeprty classification type table.");
entity.Property(e => e.PropertyDataSourceEffectiveDate).HasComment("Date the property was officially registered");
entity.Property(e => e.PropertyDataSourceTypeCode).HasComment("Foreign key to the property data source type table.");
entity.Property(e => e.PropertyStatusTypeCode).HasComment("Foreign key to the property status type table.");
entity.Property(e => e.PropertyTypeCode).HasComment("Foreign key to the proprty type table.");
entity.Property(e => e.RegionCode).HasComment("Foreign key to the region table.");
entity.Property(e => e.ReserveName).HasComment("Name of the Indian reserve.");
entity.Property(e => e.SurplusDeclarationComment).HasComment("Comment regarding the surplus declaration");
entity.Property(e => e.SurplusDeclarationDate).HasComment("Date the property was declared surplus");
entity.Property(e => e.SurplusDeclarationTypeCode).HasComment("Foreign key to the surplus declaration type table.");
entity.Property(e => e.SurveyPlanNumber).HasComment("Property/Land Parcel survey plan number");
entity.Property(e => e.VolumeUnitTypeCode).HasComment("Foreign key to the volume unit type table.");
entity.Property(e => e.VolumetricMeasurement).HasComment("Volumetric measurement of the parcel.");
entity.Property(e => e.VolumetricTypeCode).HasComment("Foreign key to the volumetric type table.");
entity.Property(e => e.Zoning).HasComment("Current property zoning");
entity.Property(e => e.ZoningPotential).HasComment("Potential property zoning");

Expand Down Expand Up @@ -7916,6 +8043,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
modelBuilder.HasSequence("PIMS_FILE_ENTITY_PERMISSIONS_ID_SEQ")
.HasMin(1L)
.HasMax(2147483647L);
modelBuilder.HasSequence("PIMS_FILE_NUMBER_H_ID_SEQ")
.HasMin(1L)
.HasMax(2147483647L);
modelBuilder.HasSequence("PIMS_FILE_NUMBER_ID_SEQ")
.HasMin(1L)
.HasMax(2147483647L);
modelBuilder.HasSequence("PIMS_FINANCIAL_ACTIVITY_CODE_H_ID_SEQ")
.HasMin(1L)
.HasMax(2147483647L);
Expand Down
6 changes: 0 additions & 6 deletions source/backend/entities/ef/PimsAcquisitionFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@ public partial class PimsAcquisitionFile
[Column("DELIVERY_DATE", TypeName = "datetime")]
public DateTime? DeliveryDate { get; set; }

/// <summary>
/// Date of acquisition file completion.
/// </summary>
[Column("COMPLETION_DATE", TypeName = "datetime")]
public DateTime? CompletionDate { get; set; }

/// <summary>
/// Legacy Acquisition File ID from the PAIMS system.
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions source/backend/entities/ef/PimsAcquisitionFileHist.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ public partial class PimsAcquisitionFileHist
[Column("DELIVERY_DATE", TypeName = "datetime")]
public DateTime? DeliveryDate { get; set; }

[Column("COMPLETION_DATE", TypeName = "datetime")]
public DateTime? CompletionDate { get; set; }

[Column("PAIMS_ACQUISITION_FILE_ID")]
public int? PaimsAcquisitionFileId { get; set; }

Expand Down Expand Up @@ -140,4 +137,7 @@ public partial class PimsAcquisitionFileHist
[Column("DB_LAST_UPDATE_USERID")]
[StringLength(30)]
public string DbLastUpdateUserid { get; set; }

[Column("COMPLETION_DATE", TypeName = "datetime")]
public DateTime? CompletionDate { get; set; }
}
Loading
Loading