From 4e63ba70e7210732f59538cb0cff1417781910d5 Mon Sep 17 00:00:00 2001
From: Slendy <josh@slendy.pw>
Date: Sat, 20 Jan 2024 15:47:39 -0600
Subject: [PATCH] Fix broken merge and recreate migrations

---
 ProjectLighthouse.Tests/Helpers/MockHelper.cs               | 2 +-
 ...InitialActivity.cs => 20240120214525_InitialActivity.cs} | 4 +++-
 ...s => 20240120214606_AddPublishedAtToWebAnnouncements.cs} | 6 ++++--
 .../Migrations/DatabaseContextModelSnapshot.cs              | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)
 rename ProjectLighthouse/Migrations/{20230725013522_InitialActivity.cs => 20240120214525_InitialActivity.cs} (98%)
 rename ProjectLighthouse/Migrations/{20230814031609_AddPublishedAtToAnnouncements.cs => 20240120214606_AddPublishedAtToWebAnnouncements.cs} (82%)

diff --git a/ProjectLighthouse.Tests/Helpers/MockHelper.cs b/ProjectLighthouse.Tests/Helpers/MockHelper.cs
index 64dc10c3..7982ac42 100644
--- a/ProjectLighthouse.Tests/Helpers/MockHelper.cs
+++ b/ProjectLighthouse.Tests/Helpers/MockHelper.cs
@@ -50,7 +50,7 @@ public static class MockHelper
         return finalResult;
     }
 
-    private static async Task<DbContextOptionsBuilder<DatabaseContext>> GetInMemoryDbOptions()
+    public static async Task<DbContextOptionsBuilder<DatabaseContext>> GetInMemoryDbOptions()
     {
         DbConnection connection = new SqliteConnection("DataSource=:memory:");
         await connection.OpenAsync();
diff --git a/ProjectLighthouse/Migrations/20230725013522_InitialActivity.cs b/ProjectLighthouse/Migrations/20240120214525_InitialActivity.cs
similarity index 98%
rename from ProjectLighthouse/Migrations/20230725013522_InitialActivity.cs
rename to ProjectLighthouse/Migrations/20240120214525_InitialActivity.cs
index da18f6cf..9f4d01a4 100644
--- a/ProjectLighthouse/Migrations/20230725013522_InitialActivity.cs
+++ b/ProjectLighthouse/Migrations/20240120214525_InitialActivity.cs
@@ -9,9 +9,10 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace ProjectLighthouse.Migrations
 {
     [DbContext(typeof(DatabaseContext))]
-    [Migration("20230725013522_InitialActivity")]
+    [Migration("20240120214525_InitialActivity")]
     public partial class InitialActivity : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.CreateTable(
@@ -140,6 +141,7 @@ namespace ProjectLighthouse.Migrations
                 column: "UserId");
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
diff --git a/ProjectLighthouse/Migrations/20230814031609_AddPublishedAtToAnnouncements.cs b/ProjectLighthouse/Migrations/20240120214606_AddPublishedAtToWebAnnouncements.cs
similarity index 82%
rename from ProjectLighthouse/Migrations/20230814031609_AddPublishedAtToAnnouncements.cs
rename to ProjectLighthouse/Migrations/20240120214606_AddPublishedAtToWebAnnouncements.cs
index 97840f9c..cfd53fc9 100644
--- a/ProjectLighthouse/Migrations/20230814031609_AddPublishedAtToAnnouncements.cs
+++ b/ProjectLighthouse/Migrations/20240120214606_AddPublishedAtToWebAnnouncements.cs
@@ -8,9 +8,10 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace ProjectLighthouse.Migrations
 {
     [DbContext(typeof(DatabaseContext))]
-    [Migration("20230814031609_AddPublishedAtToAnnouncements")]
-    public partial class AddPublishedAtToAnnouncements : Migration
+    [Migration("20240120214606_AddPublishedAtToWebAnnouncements")]
+    public partial class AddPublishedAtToWebAnnouncements : Migration
     {
+        /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.AddColumn<DateTime>(
@@ -21,6 +22,7 @@ namespace ProjectLighthouse.Migrations
                 defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
         }
 
+        /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropColumn(
diff --git a/ProjectLighthouse/Migrations/DatabaseContextModelSnapshot.cs b/ProjectLighthouse/Migrations/DatabaseContextModelSnapshot.cs
index af5224fc..5c33884b 100644
--- a/ProjectLighthouse/Migrations/DatabaseContextModelSnapshot.cs
+++ b/ProjectLighthouse/Migrations/DatabaseContextModelSnapshot.cs
@@ -1107,6 +1107,9 @@ namespace ProjectLighthouse.Migrations
                     b.Property<string>("Content")
                         .HasColumnType("longtext");
 
+                    b.Property<DateTime>("PublishedAt")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<int?>("PublisherId")
                         .HasColumnType("int");