Merge pull request #58 from r-koubou/refactor/utc

Refactor/utc
r-koubou · Nov 6, 2023 · 4e3cf94 · 4e3cf94
2 parents 89b5599 + 3235e53
commit 4e3cf94
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 49 deletions.
diff --git a/KeySwitchManager/Sources/Runtime/Commons/Data/Extensions/UtcDateTimeExtension.cs b/KeySwitchManager/Sources/Runtime/Commons/Data/Extensions/UtcDateTimeExtension.cs
@@ -4,12 +4,13 @@ namespace KeySwitchManager.Commons.Data.Extensions
 {
     public static class UtcDateTimeExtension
     {
-        public static DateTime As(this UtcDateTime utcDateTime)
+        public static DateTime As( this UtcDateTime utcDateTime )
         {
             return new DateTime(
+                kind: DateTimeKind.Utc,
                 year: utcDateTime.Year,
                 month: utcDateTime.Month,
-                day:utcDateTime.Day,
+                day: utcDateTime.Day,
                 hour: utcDateTime.Hour,
                 minute: utcDateTime.Minute,
                 second: utcDateTime.Second,

diff --git a/KeySwitchManager/Sources/Runtime/Commons/Helpers/UtcDateTimeHelper.cs b/KeySwitchManager/Sources/Runtime/Commons/Helpers/UtcDateTimeHelper.cs
diff --git a/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Helpers/KeySwitchFactoryHelper.cs b/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Helpers/KeySwitchFactoryHelper.cs
@@ -27,12 +27,14 @@ public static KeySwitch CreateTemplate(
             IMidiNoteOnFactory midiNoteOnFactory,
             IMidiControlChangeFactory midiControlChangeFactory,
             IMidiProgramChangeFactory midiProgramChangeFactory )
-            => factory.Create(
+        {
+            var now = UtcDateTime.NowAsDateTime;
+            return factory.Create(
                 Guid.NewGuid(),
                 "Author",
                 "Description",
-                UtcDateTime.NowAsDateTime,
-                UtcDateTime.NowAsDateTime,
+                now,
+                now,
                 "Developer Name",
                 "Product name",
                 "Instrument name",
@@ -65,5 +67,6 @@ public static KeySwitch CreateTemplate(
                     { "extra2 key", "extra2 value" },
                 }
             );
+        }
     }
 }
diff --git a/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Models/Factory/IKeySwitchFactory.cs b/KeySwitchManager/Sources/Runtime/Domain/KeySwitches/Models/Factory/IKeySwitchFactory.cs
@@ -39,9 +39,6 @@ public KeySwitch Create(
                 IEnumerable<Articulation> articulations,
                 IReadOnlyDictionary<string, string> extraData )
             {
-                created     = DateTimeHelper.ToUtc( created );
-                lastUpdated = DateTimeHelper.ToUtc( lastUpdated );
-
                 return new KeySwitch(
                     new KeySwitchId( id ),
                     new Author( author ),
@@ -57,4 +54,4 @@ public KeySwitch Create(
             }
         }
     }
-}
+}
diff --git a/...nfrastructures/Storage.Spreadsheet/KeySwitches/Translators/SpreadsheetImportTranslator.cs b/...nfrastructures/Storage.Spreadsheet/KeySwitches/Translators/SpreadsheetImportTranslator.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 
 using KeySwitchManager.Commons.Data;
+using KeySwitchManager.Commons.Data.Extensions;
 using KeySwitchManager.Domain.KeySwitches.Models;
 using KeySwitchManager.Domain.KeySwitches.Models.Aggregations;
 using KeySwitchManager.Domain.KeySwitches.Models.Factory;
@@ -33,7 +34,7 @@ public IReadOnlyCollection<KeySwitch> Translate( Workbook source )
 
         private KeySwitch TranslateWorkSheet( Worksheet sheet, ICollection<Guid> parsedGuidList )
         {
-            var now = DateTimeHelper.NowUtc();
+            var now = UtcDateTime.NowAsDateTime;
             var articulations = new List<Articulation>();
             var extraData = new Dictionary<string, string>();
 
@@ -143,4 +144,4 @@ private IReadOnlyCollection<MidiProgramChange> TranslateMidiProgramChangeMapping
         }
 
     }
-}
+}