Hotfix Migration failed

MareSynchronosServer/MareSynchronosShared/Migrations/20251102085631_SyncshellDiscovery.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 

MareSynchronosServer/MareSynchronosShared/Migrations/20251102085639_McdfShare.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
@@ -23,8 +23,8 @@ namespace MareSynchronosServer.Migrations
                     salt = table.Column<byte[]>(type: "bytea", nullable: false),
                     tag = table.Column<byte[]>(type: "bytea", nullable: false),
                     created_utc = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    updated_utc = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    updated_utc = table.Column<DateTime?>(type: "timestamp with time zone", nullable: true),
-                    expires_at_utc = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    expires_at_utc = table.Column<DateTime?>(type: "timestamp with time zone", nullable: true),
                     download_count = table.Column<int>(type: "integer", nullable: false)
                 },
                 constraints: table =>

MareSynchronosServer/MareSynchronosShared/Migrations/MareDbContextModelSnapshot.cs

@@ -17,7 +17,7 @@ namespace MareSynchronosServer.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("ProductVersion", "8.0.19")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -341,10 +341,6 @@ namespace MareSynchronosServer.Migrations
                         .HasColumnType("boolean")
                         .HasColumnName("disable_vfx");
 
-                    b.Property<DateTime?>("ExpiresAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expires_at");
-
                     b.Property<bool>("IsPaused")
                         .HasColumnType("boolean")
                         .HasColumnName("is_paused");
@@ -442,6 +438,10 @@ namespace MareSynchronosServer.Migrations
                         .HasColumnType("character varying(50)")
                         .HasColumnName("alias");
 
+                    b.Property<bool>("AutoDetectVisible")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_detect_visible");
+
                     b.Property<bool>("DisableAnimations")
                         .HasColumnType("boolean")
                         .HasColumnName("disable_animations");
@@ -454,38 +454,30 @@ namespace MareSynchronosServer.Migrations
                         .HasColumnType("boolean")
                         .HasColumnName("disable_vfx");
 
-                    b.Property<bool>("AutoDetectVisible")
+                    b.Property<DateTime?>("ExpiresAt")
-                        .HasColumnType("boolean")
+                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("auto_detect_visible");
+                        .HasColumnName("expires_at");
 
                     b.Property<string>("HashedPassword")
                         .HasColumnType("text")
                         .HasColumnName("hashed_password");
 
-                    b.Property<bool>("IsTemporary")
-                        .HasColumnType("boolean")
-                        .HasColumnName("is_temporary");
-
-                    b.Property<bool>("PasswordTemporarilyDisabled")
-                        .HasColumnType("boolean")
-                        .HasColumnName("password_temporarily_disabled");
-
                     b.Property<bool>("InvitesEnabled")
                         .HasColumnType("boolean")
                         .HasColumnName("invites_enabled");
 
-                    b.Property<bool>("AutoDetectVisible")
+                    b.Property<bool>("IsTemporary")
                         .HasColumnType("boolean")
-                        .HasColumnName("auto_detect_visible");
+                        .HasColumnName("is_temporary");
-
-                    b.Property<bool>("PasswordTemporarilyDisabled")
-                        .HasColumnType("boolean")
-                        .HasColumnName("password_temporarily_disabled");
 
                     b.Property<string>("OwnerUID")
                         .HasColumnType("character varying(10)")
                         .HasColumnName("owner_uid");
 
+                    b.Property<bool>("PasswordTemporarilyDisabled")
+                        .HasColumnType("boolean")
+                        .HasColumnName("password_temporarily_disabled");
+
                     b.HasKey("GID")
                         .HasName("pk_groups");
 
@@ -495,99 +487,6 @@ namespace MareSynchronosServer.Migrations
                     b.ToTable("groups", (string)null);
                 });
 
-            modelBuilder.Entity("MareSynchronosShared.Models.McdfShare", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uuid")
-                        .HasColumnName("id");
-
-                    b.Property<byte[]>("CipherData")
-                        .HasColumnType("bytea")
-                        .HasColumnName("cipher_data");
-
-                    b.Property<DateTime>("CreatedUtc")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("created_utc");
-
-                    b.Property<int>("DownloadCount")
-                        .HasColumnType("integer")
-                        .HasColumnName("download_count");
-
-                    b.Property<string>("Description")
-                        .HasColumnType("text")
-                        .HasColumnName("description");
-
-                    b.Property<DateTime?>("ExpiresAtUtc")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("expires_at_utc");
-
-                    b.Property<byte[]>("Nonce")
-                        .HasColumnType("bytea")
-                        .HasColumnName("nonce");
-
-                    b.Property<string>("OwnerUID")
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("owner_uid");
-
-                    b.Property<byte[]>("Salt")
-                        .HasColumnType("bytea")
-                        .HasColumnName("salt");
-
-                    b.Property<byte[]>("Tag")
-                        .HasColumnType("bytea")
-                        .HasColumnName("tag");
-
-                    b.Property<DateTime?>("UpdatedUtc")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("updated_utc");
-
-                    b.HasKey("Id")
-                        .HasName("pk_mcdf_shares");
-
-                    b.HasIndex("OwnerUID")
-                        .HasDatabaseName("ix_mcdf_shares_owner_uid");
-
-                    b.ToTable("mcdf_shares", (string)null);
-                });
-
-            modelBuilder.Entity("MareSynchronosShared.Models.McdfShareAllowedGroup", b =>
-                {
-                    b.Property<Guid>("ShareId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("share_id");
-
-                    b.Property<string>("AllowedGroupGid")
-                        .HasColumnType("character varying(20)")
-                        .HasColumnName("allowed_group_gid");
-
-                    b.HasKey("ShareId", "AllowedGroupGid")
-                        .HasName("pk_mcdf_share_allowed_groups");
-
-                    b.HasIndex("AllowedGroupGid")
-                        .HasDatabaseName("ix_mcdf_share_allowed_groups_allowed_group_gid");
-
-                    b.ToTable("mcdf_share_allowed_groups", (string)null);
-                });
-
-            modelBuilder.Entity("MareSynchronosShared.Models.McdfShareAllowedUser", b =>
-                {
-                    b.Property<Guid>("ShareId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("share_id");
-
-                    b.Property<string>("AllowedIndividualUid")
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("allowed_individual_uid");
-
-                    b.HasKey("ShareId", "AllowedIndividualUid")
-                        .HasName("pk_mcdf_share_allowed_users");
-
-                    b.HasIndex("AllowedIndividualUid")
-                        .HasDatabaseName("ix_mcdf_share_allowed_users_allowed_individual_uid");
-
-                    b.ToTable("mcdf_share_allowed_users", (string)null);
-                });
-
             modelBuilder.Entity("MareSynchronosShared.Models.GroupBan", b =>
                 {
                     b.Property<string>("GroupGID")
@@ -732,6 +631,103 @@ namespace MareSynchronosServer.Migrations
                     b.ToTable("lodestone_auth", (string)null);
                 });
 
+            modelBuilder.Entity("MareSynchronosShared.Models.McdfShare", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("id");
+
+                    b.Property<byte[]>("CipherData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("cipher_data");
+
+                    b.Property<DateTime>("CreatedUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_utc");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<int>("DownloadCount")
+                        .HasColumnType("integer")
+                        .HasColumnName("download_count");
+
+                    b.Property<DateTime?>("ExpiresAtUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expires_at_utc");
+
+                    b.Property<byte[]>("Nonce")
+                        .HasColumnType("bytea")
+                        .HasColumnName("nonce");
+
+                    b.Property<string>("OwnerUID")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("owner_uid");
+
+                    b.Property<byte[]>("Salt")
+                        .HasColumnType("bytea")
+                        .HasColumnName("salt");
+
+                    b.Property<byte[]>("Tag")
+                        .HasColumnType("bytea")
+                        .HasColumnName("tag");
+
+                    b.Property<DateTime?>("UpdatedUtc")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("updated_utc");
+
+                    b.HasKey("Id")
+                        .HasName("pk_mcdf_shares");
+
+                    b.HasIndex("OwnerUID")
+                        .HasDatabaseName("ix_mcdf_shares_owner_uid");
+
+                    b.ToTable("mcdf_shares", (string)null);
+                });
+
+            modelBuilder.Entity("MareSynchronosShared.Models.McdfShareAllowedGroup", b =>
+                {
+                    b.Property<Guid>("ShareId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("share_id");
+
+                    b.Property<string>("AllowedGroupGid")
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)")
+                        .HasColumnName("allowed_group_gid");
+
+                    b.HasKey("ShareId", "AllowedGroupGid")
+                        .HasName("pk_mcdf_share_allowed_groups");
+
+                    b.HasIndex("AllowedGroupGid")
+                        .HasDatabaseName("ix_mcdf_share_allowed_groups_allowed_group_gid");
+
+                    b.ToTable("mcdf_share_allowed_groups", (string)null);
+                });
+
+            modelBuilder.Entity("MareSynchronosShared.Models.McdfShareAllowedUser", b =>
+                {
+                    b.Property<Guid>("ShareId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("share_id");
+
+                    b.Property<string>("AllowedIndividualUid")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)")
+                        .HasColumnName("allowed_individual_uid");
+
+                    b.HasKey("ShareId", "AllowedIndividualUid")
+                        .HasName("pk_mcdf_share_allowed_users");
+
+                    b.HasIndex("AllowedIndividualUid")
+                        .HasDatabaseName("ix_mcdf_share_allowed_users_allowed_individual_uid");
+
+                    b.ToTable("mcdf_share_allowed_users", (string)null);
+                });
+
             modelBuilder.Entity("MareSynchronosShared.Models.User", b =>
                 {
                     b.Property<string>("UID")
@@ -854,13 +850,6 @@ namespace MareSynchronosServer.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("MareSynchronosShared.Models.McdfShare", b =>
-                {
-                    b.Navigation("AllowedIndividuals");
-
-                    b.Navigation("AllowedSyncshells");
-                });
-
             modelBuilder.Entity("MareSynchronosShared.Models.CharaData", b =>
                 {
                     b.HasOne("MareSynchronosShared.Models.User", "Uploader")
@@ -1059,13 +1048,22 @@ namespace MareSynchronosServer.Migrations
                     b.Navigation("Group");
                 });
 
+            modelBuilder.Entity("MareSynchronosShared.Models.LodeStoneAuth", b =>
+                {
+                    b.HasOne("MareSynchronosShared.Models.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserUID")
+                        .HasConstraintName("fk_lodestone_auth_users_user_uid");
+
+                    b.Navigation("User");
+                });
+
             modelBuilder.Entity("MareSynchronosShared.Models.McdfShare", b =>
                 {
                     b.HasOne("MareSynchronosShared.Models.User", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerUID")
                         .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired()
                         .HasConstraintName("fk_mcdf_shares_users_owner_uid");
 
                     b.Navigation("Owner");
@@ -1095,16 +1093,6 @@ namespace MareSynchronosServer.Migrations
                     b.Navigation("Share");
                 });
 
-            modelBuilder.Entity("MareSynchronosShared.Models.LodeStoneAuth", b =>
-                {
-                    b.HasOne("MareSynchronosShared.Models.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserUID")
-                        .HasConstraintName("fk_lodestone_auth_users_user_uid");
-
-                    b.Navigation("User");
-                });
-
             modelBuilder.Entity("MareSynchronosShared.Models.UserProfileData", b =>
                 {
                     b.HasOne("MareSynchronosShared.Models.User", "User")
@@ -1146,6 +1134,13 @@ namespace MareSynchronosServer.Migrations
 
                     b.Navigation("Poses");
                 });
+
+            modelBuilder.Entity("MareSynchronosShared.Models.McdfShare", b =>
+                {
+                    b.Navigation("AllowedIndividuals");
+
+                    b.Navigation("AllowedSyncshells");
+                });
 #pragma warning restore 612, 618
         }
     }