Ensure dates read from the database are treated as local when constructing entities (2) (#19013)

* Revert "Ensure dates read from the database are treated as local when constructing entities (#18989)"

This reverts commit 7b10d39.

* Avoid system dates stored with local server time being defaulted to UTC on database read.

* ContentScheduleDto.Date is UTC

---------

Co-authored-by: kjac <[email protected]>

Author: AndyButland

src/Umbraco.Cms.Api.Management/Factories/DocumentVersionPresentationFactory.cs

@@ -26,7 +26,7 @@ public async Task<DocumentVersionItemResponseModel> CreateAsync(ContentVersionMe
             new ReferenceByIdModel(_entityService.GetKey(contentVersion.ContentTypeId, UmbracoObjectTypes.DocumentType)
                 .Result),
             new ReferenceByIdModel(await _userIdKeyResolver.GetAsync(contentVersion.UserId)),
-            new DateTimeOffset(contentVersion.VersionDate),
+            new DateTimeOffset(contentVersion.VersionDate, TimeSpan.Zero), // todo align with datetime offset rework
             contentVersion.CurrentPublishedVersion,
             contentVersion.CurrentDraftVersion,
             contentVersion.PreventCleanup);

src/Umbraco.Core/Models/ContentVersionMeta.cs

@@ -37,7 +37,7 @@ public ContentVersionMeta(
 
     public int UserId { get; }
 
-    public DateTime VersionDate { get; private set; }
+    public DateTime VersionDate { get; }
 
     public bool CurrentPublishedVersion { get; }
 
@@ -47,7 +47,5 @@ public ContentVersionMeta(
 
     public string? Username { get; }
 
-    public void SpecifyVersionDateKind(DateTimeKind kind) => VersionDate = DateTime.SpecifyKind(VersionDate, kind);
-
     public override string ToString() => $"ContentVersionMeta(versionId: {VersionId}, versionDate: {VersionDate:s}";
 }

src/Umbraco.Infrastructure/Persistence/Dtos/AccessDto.cs

@@ -27,11 +27,11 @@ internal class AccessDto
     [ForeignKey(typeof(NodeDto), Name = "FK_umbracoAccess_umbracoNode_id2")]
     public int NoAccessNodeId { get; set; }
 
-    [Column("createDate")]
+    [Column("createDate", ForceToUtc = false)]
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime CreateDate { get; set; }
 
-    [Column("updateDate")]
+    [Column("updateDate", ForceToUtc = false)]
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime UpdateDate { get; set; }
 

src/Umbraco.Infrastructure/Persistence/Dtos/AccessRuleDto.cs

@@ -25,11 +25,11 @@ internal class AccessRuleDto
     [Column("ruleType")]
     public string? RuleType { get; set; }
 
-    [Column("createDate")]
+    [Column("createDate", ForceToUtc = false)]
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime CreateDate { get; set; }
 
-    [Column("updateDate")]
+    [Column("updateDate", ForceToUtc = false)]
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime UpdateDate { get; set; }
 }

src/Umbraco.Infrastructure/Persistence/Dtos/AuditEntryDto.cs

@@ -30,7 +30,7 @@ internal class AuditEntryDto
     [Length(Constants.Audit.IpLength)]
     public string? PerformingIp { get; set; }
 
-    [Column("eventDateUtc")]
+    [Column("eventDateUtc", ForceToUtc = false)]
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime EventDateUtc { get; set; }
 

src/Umbraco.Infrastructure/Persistence/Dtos/ConsentDto.cs

@@ -29,7 +29,7 @@ public class ConsentDto
     [Length(512)]
     public string? Action { get; set; }
 
-    [Column("createDate")]
+    [Column("createDate", ForceToUtc = false)]
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime CreateDate { get; set; }
 

src/Umbraco.Infrastructure/Persistence/Dtos/ContentScheduleDto.cs

@@ -24,6 +24,7 @@ internal class ContentScheduleDto
     [NullSetting(NullSetting = NullSettings.Null)] // can be invariant
     public int? LanguageId { get; set; }
 
+    // NOTE: this date is explicitly stored and treated as UTC despite the lack of "Utc" postfix.
     [Column("date")]
     public DateTime Date { get; set; }
 

src/Umbraco.Infrastructure/Persistence/Dtos/ContentVersionCleanupPolicyDto.cs

@@ -27,6 +27,6 @@ internal class ContentVersionCleanupPolicyDto
     [NullSetting(NullSetting = NullSettings.Null)]
     public int? KeepLatestVersionPerDayForDays { get; set; }
 
-    [Column("updated")]
+    [Column("updated", ForceToUtc = false)]
     public DateTime Updated { get; set; }
 }

src/Umbraco.Infrastructure/Persistence/Dtos/ContentVersionCultureVariationDto.cs

@@ -33,7 +33,7 @@ internal class ContentVersionCultureVariationDto
     [Column("name")]
     public string? Name { get; set; }
 
-    [Column("date")] // TODO: db rename to 'updateDate'
+    [Column("date", ForceToUtc = false)] // TODO: db rename to 'updateDate'
     public DateTime UpdateDate { get; set; }
 
     [Column("availableUserId")] // TODO: db rename to 'updateDate'

src/Umbraco.Infrastructure/Persistence/Dtos/ContentVersionDto.cs

@@ -22,7 +22,7 @@ public class ContentVersionDto
     [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId", ForColumns = "nodeId,current", IncludeColumns = "id,versionDate,text,userId,preventCleanup")]
     public int NodeId { get; set; }
 
-    [Column("versionDate")] // TODO: db rename to 'updateDate'
+    [Column("versionDate", ForceToUtc = false)] // TODO: db rename to 'updateDate'
     [Constraint(Default = SystemMethods.CurrentDateTime)]
     public DateTime VersionDate { get; set; }