Database object tables (#187)

* initial object table setup

* climate object in database

* adding more object tables

* more tables

* bugs

* add script to fix object descriptions

* add all object tables

* add dtos and mappers

* adding object route tests

* .net 10 preview

* fix all the datetime stuff

* trying to make shit work

Author: LeftofZen

.editorconfig

@@ -9,6 +9,8 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+tab_width = 4
+indent_size = 4
 dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
 dotnet_style_namespace_match_folder = true:suggestion
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
@@ -21,8 +23,6 @@ dotnet_style_collection_initializer = true:suggestion
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
 dotnet_style_prefer_conditional_expression_over_return = true:suggestion
-tab_width = 4
-indent_size = 4
 dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
@@ -338,9 +338,9 @@ dotnet_diagnostic.CS8032.severity = none
 dotnet_diagnostic.CS8602.severity = warning # do not change: DAT treats this as error so we need to match it
 
 dotnet_diagnostic.IDE0004.severity = suggestion
-dotnet_diagnostic.IDE0005.severity = suggestion
+dotnet_diagnostic.IDE0005.severity = error
 dotnet_diagnostic.IDE0009.severity = suggestion
-dotnet_diagnostic.IDE0010.severity = suggestion
+dotnet_diagnostic.IDE0010.severity = error
 dotnet_diagnostic.IDE0011.severity = suggestion
 dotnet_diagnostic.IDE0016.severity = suggestion
 dotnet_diagnostic.IDE0017.severity = suggestion

Common/Common.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
 </Project>

Common/DateOnlyExtensions.cs

@@ -0,0 +1,27 @@
+namespace Common
+{
+	public static class DateOnlyExtensions
+	{
+		extension(DateOnly)
+		{
+			public static DateOnly Today
+				=> DateOnly.FromDateTimeOffset(DateTimeOffset.UtcNow);
+
+			public static DateOnly FromDateTimeOffset(DateTimeOffset dateTimeOffset)
+				=> DateOnly.FromDateTime(dateTimeOffset.DateTime);
+		}
+
+		extension(DateOnly dateOnly)
+		{
+			public DateTimeOffset ToDateTimeOffset()
+				=> new(dateOnly.Year, dateOnly.Month, dateOnly.Day, 0, 0, 0, TimeSpan.Zero);
+		}
+	}
+
+	// dummy helper class to get VS to detect the static property above
+	// can remove this in VS 2022 17.16
+	//public static class Foo
+	//{
+	//	public static DateOnly Get() => DateOnly.Now;
+	//}
+}

Common/VersionCheckBody.cs

@@ -5,6 +5,6 @@ namespace OpenLoco.Common
 	public class VersionCheckBody
 	{
 		[JsonPropertyName("tag_name")]
-		public string TagName { get; set; }
+		public required string TagName { get; set; }
 	}
 }

Dat/Dat.csproj

@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
+    <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AnalysisLevel>latest</AnalysisLevel>

Dat/Data/ObjectType.cs

@@ -12,12 +12,12 @@ public enum ObjectType : byte
 		TownNames,
 		Cargo,
 		Wall,
-		TrainSignal,
+		TrackSignal,
 		LevelCrossing,
 		StreetLight,
 		Tunnel,
 		Bridge,
-		TrainStation,
+		TrackStation,
 		TrackExtra,
 		Track,
 		RoadStation,

Dat/FileParsing/AttributeHelper.cs

@@ -1,4 +1,3 @@
-using Dat.Objects;
 using OpenLoco.Dat.Data;
 using OpenLoco.Dat.Objects;
 using OpenLoco.Dat.Types;
@@ -59,8 +58,8 @@ public static Type TypeToStruct(ObjectType objectType)
 				ObjectType.TownNames => typeof(TownNamesObject),
 				ObjectType.TrackExtra => typeof(TrackExtraObject),
 				ObjectType.Track => typeof(TrackObject),
-				ObjectType.TrainSignal => typeof(TrainSignalObject),
-				ObjectType.TrainStation => typeof(TrainStationObject),
+				ObjectType.TrackSignal => typeof(TrackSignalObject),
+				ObjectType.TrackStation => typeof(TrackStationObject),
 				ObjectType.Tree => typeof(TreeObject),
 				ObjectType.Tunnel => typeof(TunnelObject),
 				ObjectType.Vehicle => typeof(VehicleObject),

Dat/FileParsing/SawyerStreamReader.cs

@@ -1,4 +1,3 @@
-using Dat.Objects;
 using OpenLoco.Common.Logging;
 using OpenLoco.Dat.Data;
 using OpenLoco.Dat.Objects;
@@ -471,8 +470,8 @@ public static ILocoStruct GetLocoStruct(ObjectType objectType, ReadOnlySpan<byte
 				ObjectType.TownNames => ByteReader.ReadLocoStruct<TownNamesObject>(data),
 				ObjectType.TrackExtra => ByteReader.ReadLocoStruct<TrackExtraObject>(data),
 				ObjectType.Track => ByteReader.ReadLocoStruct<TrackObject>(data),
-				ObjectType.TrainSignal => ByteReader.ReadLocoStruct<TrainSignalObject>(data),
-				ObjectType.TrainStation => ByteReader.ReadLocoStruct<TrainStationObject>(data),
+				ObjectType.TrackSignal => ByteReader.ReadLocoStruct<TrackSignalObject>(data),
+				ObjectType.TrackStation => ByteReader.ReadLocoStruct<TrackStationObject>(data),
 				ObjectType.Tree => ByteReader.ReadLocoStruct<TreeObject>(data),
 				ObjectType.Tunnel => ByteReader.ReadLocoStruct<TunnelObject>(data),
 				ObjectType.Vehicle => ByteReader.ReadLocoStruct<VehicleObject>(data),

Dat/FileParsing/SawyerStreamWriter.cs

@@ -1,6 +1,6 @@
-using Dat.Objects;
 using OpenLoco.Common.Logging;
 using OpenLoco.Dat.Data;
+using OpenLoco.Dat.Objects;
 using OpenLoco.Dat.Types;
 using System.Text;
 

Dat/Objects/AirportObject.cs

@@ -3,7 +3,7 @@
 using OpenLoco.Dat.Types;
 using System.ComponentModel;
 
-namespace Dat.Objects
+namespace OpenLoco.Dat.Objects
 {
 	[TypeConverter(typeof(ExpandableObjectConverter))]
 	[LocoStructSize(0x04)]