Skip to content

Commit

Permalink
Revert DbContext reflection code, enforce DateTimeKind.Utc for all ge…
Browse files Browse the repository at this point in the history
…tters and setters of DateTime fields
  • Loading branch information
zgong-gov committed Oct 27, 2023
1 parent 62c12eb commit 56c4aea
Show file tree
Hide file tree
Showing 83 changed files with 2,453 additions and 392 deletions.
17 changes: 15 additions & 2 deletions Server/HetsApi/Model/AitReport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,21 @@ public class AitReport
public string ProjectNumber { get; set; }
public string ProjectName { get; set; }

public DateTime? DatedOn { get; set; }
public DateTime? StartDate { get; set; }
private DateTime? _datedOn;
public DateTime? DatedOn {
get => _datedOn is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _datedOn = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

private DateTime? _startDate;
public DateTime? StartDate {
get => _startDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _startDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public static AitReport MapFromHetRentalAgreement(HetRentalAgreement agreement)
{
Expand Down
19 changes: 17 additions & 2 deletions Server/HetsData/Dtos/BatchReportDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,23 @@ public class BatchReportDto

public string ReportName { get; set; }
public string ReportLink { get; set; }
public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; }

private DateTime? _startDate;
public DateTime? StartDate {
get => _startDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _startDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

private DateTime? _endDate;
public DateTime? EndDate {
get => _endDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _endDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public bool Complete { get; set; }
public int DistrictId { get; set; }
public int ConcurrencyControlNumber { get; set; }
Expand Down
16 changes: 14 additions & 2 deletions Server/HetsData/Dtos/BusinessUserRoleDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,20 @@ public class BusinessUserRoleDto
[JsonProperty("Id")]
public int BusinessUserRoleId { get; set; }

public DateTime EffectiveDate { get; set; }
public DateTime? ExpiryDate { get; set; }
private DateTime _effectiveDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime EffectiveDate {
get => DateTime.SpecifyKind(_effectiveDate, DateTimeKind.Utc);
set => _effectiveDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

private DateTime? _expiryDate;
public DateTime? ExpiryDate {
get => _expiryDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _expiryDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public int? BusinessUserId { get; set; }
public int? RoleId { get; set; }
public int ConcurrencyControlNumber { get; set; }
Expand Down
10 changes: 9 additions & 1 deletion Server/HetsData/Dtos/DigitalFileDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ public class DigitalFileDto
public MimeTypeDto MimeType { get; set; }
public int? FileSize { get; set; }
public string LastUpdateUserid { get; set; }
public DateTime? LastUpdateTimestamp { get; set; }

private DateTime? _lastUpdateTimestamp;
public DateTime? LastUpdateTimestamp {
get => _lastUpdateTimestamp is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _lastUpdateTimestamp = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string UserName { get; set; }
}
}
17 changes: 15 additions & 2 deletions Server/HetsData/Dtos/DistrictDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,21 @@ public class DistrictDto
public int DistrictId { get; set; }
public int? DistrictNumber { get; set; }
public string Name { get; set; }
public DateTime StartDate { get; set; }
public DateTime? EndDate { get; set; }

private DateTime _startDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime StartDate {
get => DateTime.SpecifyKind(_startDate, DateTimeKind.Utc);
set => _startDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

private DateTime? _endDate;
public DateTime? EndDate {
get => _endDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _endDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public int MinistryDistrictId { get; set; }
public int? RegionId { get; set; }
public int ConcurrencyControlNumber { get; set; }
Expand Down
15 changes: 13 additions & 2 deletions Server/HetsData/Dtos/DistrictStatusDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@ public class DistrictStatusDto
public int DistrictId { get; set; }
public int? CurrentFiscalYear { get; set; }
public int? NextFiscalYear { get; set; }
public DateTime RolloverStartDate { get; set; }
public DateTime RolloverEndDate { get; set; }

private DateTime _rolloverStartDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime RolloverStartDate {
get => DateTime.SpecifyKind(_rolloverStartDate, DateTimeKind.Utc);
set => _rolloverStartDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

private DateTime _rolloverEndDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime RolloverEndDate {
get => DateTime.SpecifyKind(_rolloverEndDate, DateTimeKind.Utc);
set => _rolloverEndDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

public int? LocalAreaCount { get; set; }
public int? DistrictEquipmentTypeCount { get; set; }
public int? LocalAreaCompleteCount { get; set; }
Expand Down
55 changes: 49 additions & 6 deletions Server/HetsData/Dtos/EquipmentDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,71 @@ public EquipmentDto()
public string Make { get; set; }
public string Model { get; set; }
public string Year { get; set; }
public DateTime ReceivedDate { get; set; }

private DateTime _receivedDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime ReceivedDate {
get => DateTime.SpecifyKind(_receivedDate, DateTimeKind.Utc);
set => _receivedDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

public float? YearsOfService { get; set; }
public string LicencePlate { get; set; }
public string SerialNumber { get; set; }
public string Size { get; set; }
public float? Seniority { get; set; }
public DateTime? SeniorityEffectiveDate { get; set; }
public DateTime? ToDate { get; set; }

private DateTime? _seniorityEffectiveDate;
public DateTime? SeniorityEffectiveDate {
get => _seniorityEffectiveDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _seniorityEffectiveDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

private DateTime? _toDate;
public DateTime? ToDate {
get => _toDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _toDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public int? NumberInBlock { get; set; }
public int? BlockNumber { get; set; }
public float? ServiceHoursLastYear { get; set; }
public float? ServiceHoursThreeYearsAgo { get; set; }
public float? ServiceHoursTwoYearsAgo { get; set; }
public bool? IsSeniorityOverridden { get; set; }
public string SeniorityOverrideReason { get; set; }
public DateTime? ApprovedDate { get; set; }

private DateTime? _approvedDate;
public DateTime? ApprovedDate {
get => _approvedDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _approvedDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public int EquipmentStatusTypeId { get; set; }
public string StatusComment { get; set; }
public DateTime? ArchiveDate { get; set; }

private DateTime? _archiveDate;
public DateTime? ArchiveDate {
get => _archiveDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _archiveDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string ArchiveCode { get; set; }
public string ArchiveReason { get; set; }
public DateTime LastVerifiedDate { get; set; }

private DateTime _lastVerifiedDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime LastVerifiedDate {
get => DateTime.SpecifyKind(_lastVerifiedDate, DateTimeKind.Utc);
set => _lastVerifiedDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

public string InformationUpdateNeededReason { get; set; }
public bool? IsInformationUpdateNeeded { get; set; }
public int? DistrictEquipmentTypeId { get; set; }
Expand Down
10 changes: 9 additions & 1 deletion Server/HetsData/Dtos/HistoryDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ public class HistoryDto
{
[JsonProperty("Id")]
public int HistoryId { get; set; }
public DateTime? CreatedDate { get; set; }

private DateTime? _createdDate;
public DateTime? CreatedDate {
get => _createdDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _createdDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string HistoryText { get; set; }
public int? EquipmentId { get; set; }
public int? OwnerId { get; set; }
Expand Down
17 changes: 15 additions & 2 deletions Server/HetsData/Dtos/LocalAreaDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,21 @@ public class LocalAreaDto
public int LocalAreaId { get; set; }
public int LocalAreaNumber { get; set; }
public string Name { get; set; }
public DateTime? EndDate { get; set; }
public DateTime StartDate { get; set; }

private DateTime? _endDate;
public DateTime? EndDate {
get => _endDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _endDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

private DateTime _startDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime StartDate {
get => DateTime.SpecifyKind(_startDate, DateTimeKind.Utc);
set => _startDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

public int? ServiceAreaId { get; set; }
public int ConcurrencyControlNumber { get; set; }
public ServiceAreaDto ServiceArea { get; set; }
Expand Down
8 changes: 7 additions & 1 deletion Server/HetsData/Dtos/NoteDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ public class NoteDto
public int? ProjectId { get; set; }
public int? RentalRequestId { get; set; }
public int ConcurrencyControlNumber { get; set; }

private DateTime _dbCreateTimeStamp = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);

[JsonProperty("createDate")]
public DateTime DbCreateTimeStamp { get; set; }
public DateTime DbCreateTimeStamp {
get => DateTime.SpecifyKind(_dbCreateTimeStamp, DateTimeKind.Utc);
set => _dbCreateTimeStamp = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}
}
}
30 changes: 27 additions & 3 deletions Server/HetsData/Dtos/OwnerDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,40 @@ public OwnerDto()
public string Province { get; set; }
public int OwnerStatusTypeId { get; set; }
public string StatusComment { get; set; }
public DateTime? ArchiveDate { get; set; }

private DateTime? _archiveDate;
public DateTime? ArchiveDate {
get => _archiveDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _archiveDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string ArchiveCode { get; set; }
public string ArchiveReason { get; set; }
public int? LocalAreaId { get; set; }
public int? PrimaryContactId { get; set; }
public string CglCompany { get; set; }
public string CglPolicyNumber { get; set; }
public DateTime? CglendDate { get; set; }

private DateTime? _cglendDate;
public DateTime? CglendDate {
get => _cglendDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _cglendDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string WorkSafeBcpolicyNumber { get; set; }
public DateTime? WorkSafeBcexpiryDate { get; set; }

private DateTime? _workSafeBcexpiryDate;
public DateTime? WorkSafeBcexpiryDate {
get => _workSafeBcexpiryDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _workSafeBcexpiryDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public bool? IsMaintenanceContractor { get; set; }
public bool MeetsResidency { get; set; }
public int? BusinessId { get; set; }
Expand Down
6 changes: 5 additions & 1 deletion Server/HetsData/Dtos/ProjectDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ public ProjectDto()

public bool CanEditStatus { get; set; }
public string Status { get; set; }
public DateTime FiscalYearStartDate { get; set; }

private DateTime _fiscalYearStartDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime FiscalYearStartDate {
get => DateTime.SpecifyKind(_fiscalYearStartDate, DateTimeKind.Utc);
set => _fiscalYearStartDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}
}
}
17 changes: 15 additions & 2 deletions Server/HetsData/Dtos/RegionDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,21 @@ public class RegionDto
public string Name { get; set; }
public int? RegionNumber { get; set; }
public int MinistryRegionId { get; set; }
public DateTime StartDate { get; set; }
public DateTime? EndDate { get; set; }

private DateTime _startDate = new(0001, 01, 01, 00, 00, 00, DateTimeKind.Utc);
public DateTime StartDate {
get => DateTime.SpecifyKind(_startDate, DateTimeKind.Utc);
set => _startDate = DateTime.SpecifyKind(value, DateTimeKind.Utc);
}

private DateTime? _endDate;
public DateTime? EndDate {
get => _endDate is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _endDate = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public int ConcurrencyControlNumber { get; set; }
}
}
20 changes: 18 additions & 2 deletions Server/HetsData/Dtos/RentalAgreementDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,28 @@ public RentalAgreementDto()
public int RentalAgreementId { get; set; }
public string Number { get; set; }
public int? EstimateHours { get; set; }
public DateTime? EstimateStartWork { get; set; }

private DateTime? _estimateStartWork;
public DateTime? EstimateStartWork {
get => _estimateStartWork is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _estimateStartWork = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string Note { get; set; }
public float? EquipmentRate { get; set; }
public string RateComment { get; set; }
public int RatePeriodTypeId { get; set; }
public DateTime? DatedOn { get; set; }

private DateTime? _datedOn;
public DateTime? DatedOn {
get => _datedOn is DateTime dt ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
set => _datedOn = (value.HasValue && value.Value is DateTime dt) ?
DateTime.SpecifyKind(dt, DateTimeKind.Utc) : null;
}

public string AgreementCity { get; set; }
public int RentalAgreementStatusTypeId { get; set; }
public int? EquipmentId { get; set; }
Expand Down
Loading

0 comments on commit 56c4aea

Please sign in to comment.