Remove duplicate table that was never used

Iceshrimp.Backend/Core/Database/DatabaseContext.cs

@@ -74,7 +74,6 @@ public class DatabaseContext : DbContext {
 	public virtual DbSet<User>                 Users                 { get; init; } = null!;
 	public virtual DbSet<UserGroup>            UserGroups            { get; init; } = null!;
 	public virtual DbSet<UserGroupInvitation>  UserGroupInvitations  { get; init; } = null!;
-	public virtual DbSet<UserGroupInvite>      UserGroupInvites      { get; init; } = null!;
 	public virtual DbSet<UserGroupMember>      UserGroupMembers      { get; init; } = null!;
 	public virtual DbSet<UserKeypair>          UserKeypairs          { get; init; } = null!;
 	public virtual DbSet<UserList>             UserLists             { get; init; } = null!;
@@ -867,12 +866,6 @@ public class DatabaseContext : DbContext {
 			entity.HasOne(d => d.User).WithMany(p => p.UserGroupInvitations);
 		});
 
-		modelBuilder.Entity<UserGroupInvite>(entity => {
-			entity.HasOne(d => d.UserGroup).WithMany(p => p.UserGroupInvites);
-
-			entity.HasOne(d => d.User).WithMany(p => p.UserGroupInvites);
-		});
-
 		modelBuilder.Entity<UserGroupMember>(entity => {
 			entity.Property(e => e.CreatedAt).HasComment("The created date of the UserGroupMember.");
 			entity.Property(e => e.UserGroupId).HasComment("The group ID.");
@@ -880,7 +873,7 @@ public class DatabaseContext : DbContext {
 
 			entity.HasOne(d => d.UserGroup).WithMany(p => p.UserGroupMembers);
 
-			entity.HasOne(d => d.User).WithMany(p => p.UserGroupMembers);
+			entity.HasOne(d => d.User).WithMany(p => p.UserGroupMemberships);
 		});
 
 		modelBuilder.Entity<UserKeypair>(entity => { entity.HasOne(d => d.User).WithOne(p => p.UserKeypair); });

Iceshrimp.Backend/Core/Database/Migrations/20240108164605_RemoveUnneededTable.cs

@@ -0,0 +1,64 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Iceshrimp.Backend.Core.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemoveUnneededTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "user_group_invite");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "user_group_invite",
+                columns: table => new
+                {
+                    id = table.Column<string>(type: "character varying(32)", maxLength: 32, nullable: false),
+                    userGroupId = table.Column<string>(type: "character varying(32)", maxLength: 32, nullable: false),
+                    userId = table.Column<string>(type: "character varying(32)", maxLength: 32, nullable: false),
+                    createdAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_user_group_invite", x => x.id);
+                    table.ForeignKey(
+                        name: "FK_user_group_invite_user_group_userGroupId",
+                        column: x => x.userGroupId,
+                        principalTable: "user_group",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_user_group_invite_user_userId",
+                        column: x => x.userId,
+                        principalTable: "user",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_user_group_invite_userGroupId",
+                table: "user_group_invite",
+                column: "userGroupId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_user_group_invite_userId",
+                table: "user_group_invite",
+                column: "userId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_user_group_invite_userId_userGroupId",
+                table: "user_group_invite",
+                columns: new[] { "userId", "userGroupId" },
+                unique: true);
+        }
+    }
+}

Iceshrimp.Backend/Core/Database/Migrations/DatabaseContextModelSnapshot.cs

@@ -4080,41 +4080,6 @@ namespace Iceshrimp.Backend.Core.Database.Migrations
                     b.ToTable("user_group_invitation");
                 });
 
-            modelBuilder.Entity("Iceshrimp.Backend.Core.Database.Tables.UserGroupInvite", b =>
-                {
-                    b.Property<string>("Id")
-                        .HasMaxLength(32)
-                        .HasColumnType("character varying(32)")
-                        .HasColumnName("id");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("createdAt");
-
-                    b.Property<string>("UserGroupId")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("character varying(32)")
-                        .HasColumnName("userGroupId");
-
-                    b.Property<string>("UserId")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("character varying(32)")
-                        .HasColumnName("userId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserGroupId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("UserId", "UserGroupId")
-                        .IsUnique();
-
-                    b.ToTable("user_group_invite");
-                });
-
             modelBuilder.Entity("Iceshrimp.Backend.Core.Database.Tables.UserGroupMember", b =>
                 {
                     b.Property<string>("Id")
@@ -5547,25 +5512,6 @@ namespace Iceshrimp.Backend.Core.Database.Migrations
                     b.Navigation("UserGroup");
                 });
 
-            modelBuilder.Entity("Iceshrimp.Backend.Core.Database.Tables.UserGroupInvite", b =>
-                {
-                    b.HasOne("Iceshrimp.Backend.Core.Database.Tables.UserGroup", "UserGroup")
-                        .WithMany("UserGroupInvites")
-                        .HasForeignKey("UserGroupId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Iceshrimp.Backend.Core.Database.Tables.User", "User")
-                        .WithMany("UserGroupInvites")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-
-                    b.Navigation("UserGroup");
-                });
-
             modelBuilder.Entity("Iceshrimp.Backend.Core.Database.Tables.UserGroupMember", b =>
                 {
                     b.HasOne("Iceshrimp.Backend.Core.Database.Tables.UserGroup", "UserGroup")
@@ -5575,7 +5521,7 @@ namespace Iceshrimp.Backend.Core.Database.Migrations
                         .IsRequired();
 
                     b.HasOne("Iceshrimp.Backend.Core.Database.Tables.User", "User")
-                        .WithMany("UserGroupMembers")
+                        .WithMany("UserGroupMemberships")
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -5904,9 +5850,7 @@ namespace Iceshrimp.Backend.Core.Database.Migrations
 
                     b.Navigation("UserGroupInvitations");
 
-                    b.Navigation("UserGroupInvites");
+                    b.Navigation("UserGroupMemberships");
-
-                    b.Navigation("UserGroupMembers");
 
                     b.Navigation("UserGroups");
 
@@ -5933,8 +5877,6 @@ namespace Iceshrimp.Backend.Core.Database.Migrations
 
                     b.Navigation("UserGroupInvitations");
 
-                    b.Navigation("UserGroupInvites");
-
                     b.Navigation("UserGroupMembers");
                 });
 

Iceshrimp.Backend/Core/Database/Tables/User.cs

@@ -399,10 +399,7 @@ public class User {
 		new List<UserGroupInvitation>();
 
 	[InverseProperty("User")]
-	public virtual ICollection<UserGroupInvite> UserGroupInvites { get; set; } = new List<UserGroupInvite>();
+	public virtual ICollection<UserGroupMember> UserGroupMemberships { get; set; } = new List<UserGroupMember>();
-
-	[InverseProperty("User")]
-	public virtual ICollection<UserGroupMember> UserGroupMembers { get; set; } = new List<UserGroupMember>();
 
 	[InverseProperty("User")] public virtual ICollection<UserGroup> UserGroups { get; set; } = new List<UserGroup>();
 

Iceshrimp.Backend/Core/Database/Tables/UserGroup.cs

@@ -41,9 +41,6 @@ public class UserGroup {
 	public virtual ICollection<UserGroupInvitation> UserGroupInvitations { get; set; } =
 		new List<UserGroupInvitation>();
 
-	[InverseProperty("UserGroup")]
-	public virtual ICollection<UserGroupInvite> UserGroupInvites { get; set; } = new List<UserGroupInvite>();
-
 	[InverseProperty("UserGroup")]
 	public virtual ICollection<UserGroupMember> UserGroupMembers { get; set; } = new List<UserGroupMember>();
 }

Iceshrimp.Backend/Core/Database/Tables/UserGroupInvite.cs

@@ -1,32 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-
-namespace Iceshrimp.Backend.Core.Database.Tables;
-
-[Table("user_group_invite")]
-[Index("UserId")]
-[Index("UserId", "UserGroupId", IsUnique = true)]
-[Index("UserGroupId")]
-public class UserGroupInvite {
-	[Key]
-	[Column("id")]
-	[StringLength(32)]
-	public string Id { get; set; } = null!;
-
-	[Column("createdAt")] public DateTime CreatedAt { get; set; }
-
-	[Column("userId")] [StringLength(32)] public string UserId { get; set; } = null!;
-
-	[Column("userGroupId")]
-	[StringLength(32)]
-	public string UserGroupId { get; set; } = null!;
-
-	[ForeignKey("UserId")]
-	[InverseProperty("UserGroupInvites")]
-	public virtual User User { get; set; } = null!;
-
-	[ForeignKey("UserGroupId")]
-	[InverseProperty("UserGroupInvites")]
-	public virtual UserGroup UserGroup { get; set; } = null!;
-}

Iceshrimp.Backend/Core/Database/Tables/UserGroupMember.cs

@@ -38,7 +38,7 @@ public class UserGroupMember {
 	public virtual ICollection<Antenna> Antennas { get; set; } = new List<Antenna>();
 
 	[ForeignKey("UserId")]
-	[InverseProperty("UserGroupMembers")]
+	[InverseProperty("UserGroupMemberships")]
 	public virtual User User { get; set; } = null!;
 
 	[ForeignKey("UserGroupId")]