Added foreignkey

bitwarden · Feb 7, 2025 · 052b2cf · 052b2cf
1 parent f1d8071
commit 052b2cf
Show file tree

Hide file tree

Showing 18 changed files with 251 additions and 109 deletions.
diff --git a/....EntityFramework/NotificationCenter/Configurations/NotificationEntityTypeConfiguration.cs b/....EntityFramework/NotificationCenter/Configurations/NotificationEntityTypeConfiguration.cs
@@ -30,6 +30,10 @@ public void Configure(EntityTypeBuilder<Notification> builder)
             .HasIndex(n => n.UserId)
             .IsClustered(false);
 
+        builder
+            .HasIndex(n => n.TaskId)
+            .IsClustered(false);
+
         builder.ToTable(nameof(Notification));
     }
 }
diff --git a/src/Infrastructure.EntityFramework/NotificationCenter/Models/Notification.cs b/src/Infrastructure.EntityFramework/NotificationCenter/Models/Notification.cs
@@ -1,13 +1,15 @@
 using AutoMapper;
 using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Vault.Models;
 
 namespace Bit.Infrastructure.EntityFramework.NotificationCenter.Models;
 
 public class Notification : Core.NotificationCenter.Entities.Notification
 {
     public virtual User User { get; set; }
     public virtual Organization Organization { get; set; }
+    public virtual SecurityTask Task { get; set; }
 }
 
 public class NotificationMapperProfile : Profile

diff --git a/src/Sql/NotificationCenter/dbo/Stored Procedures/Notification_Create.sql b/src/Sql/NotificationCenter/dbo/Stored Procedures/Notification_Create.sql
@@ -7,9 +7,9 @@ CREATE PROCEDURE [dbo].[Notification_Create]
     @OrganizationId UNIQUEIDENTIFIER,
     @Title NVARCHAR(256),
     @Body NVARCHAR(MAX),
-    @TaskId UNIQUEIDENTIFIER = NULL,
     @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    @TaskId UNIQUEIDENTIFIER = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -23,9 +23,9 @@ BEGIN
         [OrganizationId],
         [Title],
         [Body],
-        [TaskId],
         [CreationDate],
-        [RevisionDate]
+        [RevisionDate],
+        [TaskId]
         )
     VALUES (
         @Id,
@@ -36,8 +36,8 @@ BEGIN
         @OrganizationId,
         @Title,
         @Body,
-        @TaskId,
         @CreationDate,
-        @RevisionDate
+        @RevisionDate,
+        @TaskId
         )
 END
diff --git a/src/Sql/NotificationCenter/dbo/Stored Procedures/Notification_Update.sql b/src/Sql/NotificationCenter/dbo/Stored Procedures/Notification_Update.sql
@@ -7,9 +7,9 @@ CREATE PROCEDURE [dbo].[Notification_Update]
     @OrganizationId UNIQUEIDENTIFIER,
     @Title NVARCHAR(256),
     @Body NVARCHAR(MAX),
-    @TaskId UNIQUEIDENTIFIER = NULL,
     @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    @TaskId UNIQUEIDENTIFIER = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -22,8 +22,8 @@ BEGIN
         [OrganizationId] = @OrganizationId,
         [Title] = @Title,
         [Body] = @Body,
-        [TaskId] = @TaskId,
         [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
+        [RevisionDate] = @RevisionDate,
+        [TaskId]       = @TaskId
     WHERE [Id] = @Id
 END
diff --git a/src/Sql/NotificationCenter/dbo/Tables/Notification.sql b/src/Sql/NotificationCenter/dbo/Tables/Notification.sql
@@ -8,12 +8,13 @@ CREATE TABLE [dbo].[Notification]
     [OrganizationId] UNIQUEIDENTIFIER NULL,
     [Title] NVARCHAR (256) NULL,
     [Body] NVARCHAR (MAX) NULL,
-    [TaskId] UNIQUEIDENTIFIER NULL,
     [CreationDate] DATETIME2 (7) NOT NULL,
     [RevisionDate] DATETIME2 (7) NOT NULL,
+    [TaskId] UNIQUEIDENTIFIER NULL,
     CONSTRAINT [PK_Notification] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_Notification_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]),
-    CONSTRAINT [FK_Notification_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id])
+    CONSTRAINT [FK_Notification_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id]),
+    CONSTRAINT [FK_Notification_SecurityTask] FOREIGN KEY ([TaskId]) REFERENCES [dbo].[SecurityTask] ([Id])
 );
 
 
@@ -31,3 +32,6 @@ GO
 CREATE NONCLUSTERED INDEX [IX_Notification_OrganizationId]
     ON [dbo].[Notification]([OrganizationId] ASC) WHERE OrganizationId IS NOT NULL;
 
+GO
+CREATE NONCLUSTERED INDEX [IX_Notification_TaskId]
+    ON [dbo].[Notification] ([TaskId] ASC) WHERE TaskId IS NOT NULL;
diff --git a/util/Migrator/DbScripts/2025-02-07_00_AddOptionalNotificationTaskId.sql b/util/Migrator/DbScripts/2025-02-07_00_AddOptionalNotificationTaskId.sql
@@ -1,12 +1,24 @@
--- Add optional Type column to Notification table
+-- Add optional TaskId column to Notification table
 IF COL_LENGTH('[dbo].[Notification]', 'TaskId') IS NULL
 BEGIN
     ALTER TABLE [dbo].[Notification]
         ADD [TaskId] UNIQUEIDENTIFIER NULL
+
+    ALTER TABLE [dbo].[Notification]
+        ADD CONSTRAINT [FK_Notification_SecurityTask] FOREIGN KEY ([TaskId]) REFERENCES [dbo].[SecurityTask] ([Id])
 END
 GO
 
--- Alter Notification_Create and Notification_Update stored procedures to include Type
+IF NOT EXISTS (SELECT *
+               FROM sys.indexes
+               WHERE name = 'IX_Notification_TaskId')
+    BEGIN
+        CREATE NONCLUSTERED INDEX [IX_Notification_TaskId]
+            ON [dbo].[Notification] ([TaskId] ASC) WHERE TaskId IS NOT NULL;
+    END
+GO
+
+-- Alter Notification_Create and Notification_Update stored procedures to include TaskId
 CREATE OR ALTER PROCEDURE [dbo].[Notification_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @Priority TINYINT,
@@ -16,9 +28,9 @@ CREATE OR ALTER PROCEDURE [dbo].[Notification_Create]
     @OrganizationId UNIQUEIDENTIFIER,
     @Title NVARCHAR(256),
     @Body NVARCHAR(MAX),
-    @TaskId UNIQUEIDENTIFIER = NULL,
     @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    @TaskId UNIQUEIDENTIFIER = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -32,9 +44,9 @@ BEGIN
         [OrganizationId],
         [Title],
         [Body],
-        [TaskId],
         [CreationDate],
-        [RevisionDate]
+        [RevisionDate],
+        [TaskId]
     )
     VALUES (
        @Id,
@@ -45,9 +57,9 @@ BEGIN
        @OrganizationId,
        @Title,
        @Body,
-       @TaskId,
        @CreationDate,
-       @RevisionDate
+       @RevisionDate,
+       @TaskId
    )
 END
 GO
@@ -61,9 +73,9 @@ CREATE OR ALTER PROCEDURE [dbo].[Notification_Update]
     @OrganizationId UNIQUEIDENTIFIER,
     @Title NVARCHAR(256),
     @Body NVARCHAR(MAX),
-    @TaskId UNIQUEIDENTIFIER = NULL,
     @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
+    @RevisionDate DATETIME2(7),
+    @TaskId UNIQUEIDENTIFIER = NULL
 AS
 BEGIN
     SET NOCOUNT ON
@@ -76,9 +88,9 @@ BEGIN
         [OrganizationId] = @OrganizationId,
         [Title] = @Title,
         [Body] = @Body,
-        [TaskId] = @TaskId,
         [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
+        [RevisionDate] = @RevisionDate,
+        [TaskId]       = @TaskId
     WHERE [Id] = @Id
 END
 GO

diff --git a/util/MySqlMigrations/Migrations/20250207182213_AddOptionalNotifificationTaskId.cs b/util/MySqlMigrations/Migrations/20250207182213_AddOptionalNotifificationTaskId.cs
diff --git a/...dOptionalNotifificationTaskId.Designer.cs → ...AddOptionalNotificationTaskId.Designer.cs b/...dOptionalNotifificationTaskId.Designer.cs → ...AddOptionalNotificationTaskId.Designer.cs
diff --git a/util/MySqlMigrations/Migrations/20250207204741_AddOptionalNotificationTaskId.cs b/util/MySqlMigrations/Migrations/20250207204741_AddOptionalNotificationTaskId.cs
@@ -0,0 +1,50 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Bit.MySqlMigrations.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddOptionalNotifificationTaskId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "TaskId",
+                table: "Notification",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Notification_TaskId",
+                table: "Notification",
+                column: "TaskId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Notification_SecurityTask_TaskId",
+                table: "Notification",
+                column: "TaskId",
+                principalTable: "SecurityTask",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Notification_SecurityTask_TaskId",
+                table: "Notification");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Notification_TaskId",
+                table: "Notification");
+
+            migrationBuilder.DropColumn(
+                name: "TaskId",
+                table: "Notification");
+        }
+    }
+}
diff --git a/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs b/util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs
@@ -1690,6 +1690,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("OrganizationId")
                         .HasAnnotation("SqlServer:Clustered", false);
 
+                    b.HasIndex("TaskId")
+                        .HasAnnotation("SqlServer:Clustered", false);
+
                     b.HasIndex("UserId")
                         .HasAnnotation("SqlServer:Clustered", false);
 
@@ -2631,12 +2634,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .WithMany()
                         .HasForeignKey("OrganizationId");
 
+                    b.HasOne("Bit.Infrastructure.EntityFramework.Vault.Models.SecurityTask", "Task")
+                        .WithMany()
+                        .HasForeignKey("TaskId");
+
                     b.HasOne("Bit.Infrastructure.EntityFramework.Models.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId");
 
                     b.Navigation("Organization");
 
+                    b.Navigation("Task");
+
                     b.Navigation("User");
                 });
 

diff --git a/util/PostgresMigrations/Migrations/20250207182206_AddOptionalNotifificationTaskId.cs b/util/PostgresMigrations/Migrations/20250207182206_AddOptionalNotifificationTaskId.cs