Replace ElapsedTime column with EndTime + Timestamp

deitry · Jul 8, 2023 · 8eb9696 · 8eb9696
1 parent cd1e494
commit 8eb9696
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 16 deletions.
diff --git a/TimeTracker.Core/Database/Migrations/M005_AddTimestampAndReworkElapsed.cs b/TimeTracker.Core/Database/Migrations/M005_AddTimestampAndReworkElapsed.cs
@@ -0,0 +1,79 @@
+using SQLite;
+
+namespace TimeTracker.Database.Migrations;
+
+public class M005_AddTimestampAndReworkElapsed : IDbMigration
+{
+    public async Task Do(SQLiteAsyncConnection db)
+    {
+        var timestamp = DateTime.Now;
+
+        await db.ExecuteAsync("ALTER TABLE TrackedTimeDb ADD Timestamp datetime");
+        await db.ExecuteAsync("ALTER TABLE TrackedTimeDb ADD EndTime datetime");
+
+        var all = await db.Table<TrackedTimeDb_M005>().ToListAsync();
+        foreach (var trackedTimeDb in all)
+        {
+            trackedTimeDb.Timestamp = timestamp;
+#pragma warning disable CS0618
+            trackedTimeDb.EndTime = trackedTimeDb.StartTime + trackedTimeDb.ElapsedTime;
+#pragma warning restore CS0618
+            await db.UpdateAsync(trackedTimeDb);
+        }
+
+        // NOTE: sqlite does not support DROP COLUMN
+        // await db.ExecuteAsync("ALTER TABLE TrackedTimeDb DROP COLUMN ElapsedTime");
+
+        const string TemporaryTable = "t1_backup";
+        await db.ExecuteAsync(
+            $"CREATE TABLE {TemporaryTable} AS SELECT Id, Uuid, Name, Status, StartTime, EndTime, Timestamp FROM TrackedTimeDb");
+        await db.ExecuteAsync("DROP TABLE TrackedTimeDb");
+        await db.ExecuteAsync($"ALTER TABLE {TemporaryTable} RENAME TO TrackedTimeDb");
+    }
+
+    public Task UnDo(SQLiteAsyncConnection db)
+    {
+        throw new NotImplementedException();
+    }
+
+    public string Serialize()
+    {
+        throw new NotImplementedException();
+    }
+}
+
+/// <summary>
+/// Data model at the time of migration <see cref="M005_AddTimestampAndReworkElapsed"/>
+/// </summary>
+[Table(nameof(TrackedTimeDb))]
+public class TrackedTimeDb_M005 : ITable
+{
+    [PrimaryKey, AutoIncrement]
+    public int Id { get; set; }
+
+    public Guid Uuid { get; set; }
+
+    public string Name { get; set; }
+
+    public DateTime StartTime { get; set; }
+
+    public TimeSpan ElapsedTime { get; init; }
+    public DateTime EndTime { get; set; }
+
+    public int Status { get; set; }
+
+    /// <summary>
+    /// Last modification time - considering Start and Elapsed may ba changed later
+    /// </summary>
+    public DateTime Timestamp { get; set; }
+
+    public enum TrackingStatus
+    {
+        Completed = 0,
+
+        /// <summary>
+        /// Currently running
+        /// </summary>
+        Running = 1,
+    }
+}
diff --git a/TimeTracker.Core/Database/Migrations/M4_AddUuid.cs b/TimeTracker.Core/Database/Migrations/M4_AddUuid.cs
@@ -4,19 +4,16 @@ namespace TimeTracker.Database.Migrations;
 
 public class M4_AddUuid : IDbMigration
 {
-    public Task Do(SQLiteAsyncConnection db)
+    public async Task Do(SQLiteAsyncConnection db)
     {
-        // iterate over TrackedTimeDb and add Guid.NewGuid() as parameter
-        return db.ExecuteAsync("ALTER TABLE TrackedTimeDb ADD Uuid text")
-            .ContinueWith(async _ =>
-            {
-                var all = await db.Table<TrackedTimeDb>().ToListAsync();
-                foreach (var trackedTimeDb in all)
-                {
-                    trackedTimeDb.Uuid = Guid.NewGuid();
-                    await db.UpdateAsync(trackedTimeDb);
-                }
-            });
+        await db.ExecuteAsync("ALTER TABLE TrackedTimeDb ADD Uuid text");
+
+        var all = await db.Table<TrackedTimeDb_M004>().ToListAsync();
+        foreach (var trackedTimeDb in all)
+        {
+            trackedTimeDb.Uuid = Guid.NewGuid();
+            await db.UpdateAsync(trackedTimeDb);
+        }
     }
 
     public Task UnDo(SQLiteAsyncConnection db)
@@ -29,3 +26,33 @@ public string Serialize()
         throw new NotImplementedException();
     }
 }
+
+/// <summary>
+/// Data model at the time of migration <see cref="M4_AddUuid"/>
+/// </summary>
+[Table(nameof(TrackedTimeDb))]
+public class TrackedTimeDb_M004 : ITable
+{
+    [PrimaryKey, AutoIncrement]
+    public int Id { get; set; }
+
+    public Guid Uuid { get; set; }
+
+    public string Name { get; set; }
+
+    public DateTime StartTime { get; set; }
+
+    public TimeSpan ElapsedTime { get; init; }
+
+    public int Status { get; set; }
+
+    public enum TrackingStatus
+    {
+        Completed = 0,
+
+        /// <summary>
+        /// Currently running
+        /// </summary>
+        Running = 1,
+    }
+}
diff --git a/TimeTracker.Core/Database/Migrator.cs b/TimeTracker.Core/Database/Migrator.cs
@@ -18,6 +18,7 @@ public static class Migrator
         new M2_AddCategories(),
         new M3_AddStatuses(),
         new M4_AddUuid(),
+        new M005_AddTimestampAndReworkElapsed(),
     };
 
     public static async Task Migrate(SQLiteAsyncConnection db)
@@ -37,7 +38,15 @@ public static async Task Migrate(SQLiteAsyncConnection db)
         {
             var migration = Migrations[i];
 
-            await migration.Do(db);
+            try
+            {
+                await migration.Do(db);
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine($"Migration {migration.GetType().Name} failed: {e}");
+                throw;
+            }
             await db.UpdateAsync(new ControlDb(ControlDb.ParamId.Version, i + 1));
         }
     }

diff --git a/TimeTracker.Core/Database/Tables/TrackedTimeDb.cs b/TimeTracker.Core/Database/Tables/TrackedTimeDb.cs
@@ -16,10 +16,17 @@ public class TrackedTimeDb : ITable
 
     public DateTime StartTime { get; set; }
 
-    public TimeSpan ElapsedTime { get; init; }
+    public DateTime EndTime { get; set; }
+
+    [Ignore] public TimeSpan ElapsedTime => EndTime - StartTime;
 
     public int Status { get; set; }
 
+    /// <summary>
+    /// Last modification time - considering Start and Elapsed may ba changed later
+    /// </summary>
+    public DateTime Timestamp { get; set; }
+
     [Ignore]
     public TrackingStatus StatusEnum
     {

diff --git a/TimeTracker.Core/Models/TimeTracker.cs b/TimeTracker.Core/Models/TimeTracker.cs
@@ -30,7 +30,7 @@ public TimeTracker(TrackedTimeDb tracker)
         StartTime = tracker.StartTime;
         IsRunning = tracker.StatusEnum == TrackedTimeDb.TrackingStatus.Running;
         if (IsRunning == false)
-            EndTime = tracker.StartTime + tracker.ElapsedTime;
+            EndTime = tracker.EndTime;
     }
 
     public TimeTracker Start()
@@ -56,7 +56,7 @@ public TrackedTimeDb ToDb()
             Uuid = new Guid(),
             Name = Name,
             StartTime = StartTime,
-            ElapsedTime = ElapsedTime,
+            EndTime = EndTime,
             StatusEnum = IsRunning
                 ? TrackedTimeDb.TrackingStatus.Running
                 : TrackedTimeDb.TrackingStatus.Completed,

diff --git a/TimeTracker.Core/TimeTracker.Core.csproj b/TimeTracker.Core/TimeTracker.Core.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace>TimeTracker</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>