delete attachments on delete comment

gently-whitesnow · gently-whitesnow · commit 61a72dab01c6 · 2025-05-04T17:44:02.000+03:00
diff --git a/backend/Bugget.BO/Services/Attachments/AttachmentService.cs b/backend/Bugget.BO/Services/Attachments/AttachmentService.cs
@@ -13,7 +13,6 @@
 namespace Bugget.BO.Services.Attachments;
 
 public sealed class AttachmentService(
-    AttachmentOptimizator attachmentOptimizator,
     AttachmentDbClient attachmentDbClient,
     ITaskQueue taskQueue,
     AttachmentEventsService attachmentEventsService,
@@ -113,6 +112,23 @@ await taskQueue.EnqueueAsync(async () =>
         return;
     }
 
+    public async Task DeleteCommentAttachmentsInternalAsync(
+        int commentId)
+    {
+        var attachmentsDbModels = await attachmentDbClient.DeleteCommentAttachmentsAsync(commentId);
+        if (attachmentsDbModels.Length == 0)
+            return;
+
+        foreach (var attachmentDbModel in attachmentsDbModels)
+        {
+            await fileStorageClient.DeleteAsync(attachmentDbModel.StorageKey);
+            if( attachmentDbModel.HasPreview.Value)
+            {
+                await fileStorageClient.DeleteAsync(keyGen.GetPreviewKey(attachmentDbModel.StorageKey));
+            }
+        }
+    }
+
     public Task<MonadeStruct<AttachmentDbModel>> SaveBugAttachmentAsync(
         UserIdentity user,
         int reportId,
diff --git a/backend/Bugget.BO/Services/Comments/CommentEventsService.cs b/backend/Bugget.BO/Services/Comments/CommentEventsService.cs
@@ -1,30 +1,33 @@
+using Bugget.BO.Services.Attachments;
 using Bugget.DA.WebSockets;
 using Bugget.Entities.Authentication;
 using Bugget.Entities.DbModels.Comment;
 
 public class CommentEventsService(
-        IReportPageHubClient reportPageHubClient
+        IReportPageHubClient reportPageHubClient,
+        AttachmentService attachmentService
             )
+{
+    public async Task HandleCommentCreateEventAsync(int reportId, UserIdentity user, CommentSummaryDbModel commentSummaryDbModel)
     {
-        public async Task HandleCommentCreateEventAsync(int reportId, UserIdentity user, CommentSummaryDbModel commentSummaryDbModel)
-        {
-            await Task.WhenAll(
-                reportPageHubClient.SendCommentCreateAsync(reportId, commentSummaryDbModel, user.SignalRConnectionId)
-        );
-        }
+        await Task.WhenAll(
+            reportPageHubClient.SendCommentCreateAsync(reportId, commentSummaryDbModel, user.SignalRConnectionId)
+    );
+    }
 
-        public async Task HandleCommentDeleteEventAsync(int reportId, UserIdentity user, int bugId, int commentId)
-        {
-            await Task.WhenAll(
-                reportPageHubClient.SendCommentDeleteAsync(reportId, bugId, commentId, user.SignalRConnectionId)
-            );
-        }
+    public async Task HandleCommentDeleteEventAsync(int reportId, UserIdentity user, int bugId, int commentId)
+    {
+        await Task.WhenAll(
+            reportPageHubClient.SendCommentDeleteAsync(reportId, bugId, commentId, user.SignalRConnectionId),
+            attachmentService.DeleteCommentAttachmentsInternalAsync(commentId)
+        );
+    }
 
-        public async Task HandleCommentUpdateEventAsync(int reportId, UserIdentity user, CommentSummaryDbModel commentSummaryDbModel)
-        {
-            await Task.WhenAll(
-                reportPageHubClient.SendCommentUpdateAsync(reportId, commentSummaryDbModel, user.SignalRConnectionId)
-            );
-        }
+    public async Task HandleCommentUpdateEventAsync(int reportId, UserIdentity user, CommentSummaryDbModel commentSummaryDbModel)
+    {
+        await Task.WhenAll(
+            reportPageHubClient.SendCommentUpdateAsync(reportId, commentSummaryDbModel, user.SignalRConnectionId)
+        );
     }
+}
 
diff --git a/backend/Bugget.BO/Services/LimitsService.cs b/backend/Bugget.BO/Services/LimitsService.cs
@@ -41,6 +41,7 @@ public sealed class LimitsService(
         int commentId)
     {
         var commentAttachmentsCount = await attachmentDbClient.GetCommentAttachmentsCountAsync(
+            user.Id,
             user.OrganizationId,
             reportId,
             bugId,
diff --git a/backend/Bugget.DA/Postgres/AttachmentDbClient.cs b/backend/Bugget.DA/Postgres/AttachmentDbClient.cs
@@ -3,8 +3,21 @@
 
 namespace Bugget.DA.Postgres;
 
-public class AttachmentDbClient: PostgresClient
+public class AttachmentDbClient : PostgresClient
 {
+    public async Task<AttachmentDbModel[]> DeleteCommentAttachmentsAsync(int commentId)
+    {
+        await using var connection = await DataSource.OpenConnectionAsync();
+
+        return (await connection.QueryAsync<AttachmentDbModel>(
+            "SELECT * FROM public.delete_comment_attachments_internal(@commentId)",
+            new
+            {
+                commentId
+            }
+        )).ToArray();
+    }
+
     public async Task<AttachmentDbModel> UpdateAttachmentAsync(UpdateAttachmentDbModel updateAttachmentDbModel)
     {
         await using var connection = await DataSource.OpenConnectionAsync();
@@ -25,7 +38,8 @@ public async Task<AttachmentDbModel> UpdateAttachmentAsync(UpdateAttachmentDbMod
         );
     }
 
-    public async Task<AttachmentDbModel?> GetBugAttachmentAsync(string? organizationId, int reportId, int bugId, int attachmentId){
+    public async Task<AttachmentDbModel?> GetBugAttachmentAsync(string? organizationId, int reportId, int bugId, int attachmentId)
+    {
         await using var connection = await DataSource.OpenConnectionAsync();
 
         return await connection.QuerySingleOrDefaultAsync<AttachmentDbModel>(
@@ -40,7 +54,8 @@ public async Task<AttachmentDbModel> UpdateAttachmentAsync(UpdateAttachmentDbMod
         );
     }
 
-    public async Task<AttachmentDbModel?> GetCommentAttachmentAsync(string? organizationId, int reportId, int bugId, int commentId, int attachmentId){
+    public async Task<AttachmentDbModel?> GetCommentAttachmentAsync(string? organizationId, int reportId, int bugId, int commentId, int attachmentId)
+    {
         await using var connection = await DataSource.OpenConnectionAsync();
 
         return await connection.QuerySingleOrDefaultAsync<AttachmentDbModel>(
@@ -59,7 +74,7 @@ public async Task<AttachmentDbModel> UpdateAttachmentAsync(UpdateAttachmentDbMod
     public async Task<int> GetBugAttachmentsCountAsync(string? organizationId, int reportId, int bugId, int attachType)
     {
         await using var connection = await DataSource.OpenConnectionAsync();
-        
+
         var result = await connection.ExecuteScalarAsync<int>(
             "SELECT public.get_bug_attachments_count(@organizationId, @reportId, @bugId, @attachType)",
             new
@@ -74,14 +89,15 @@ public async Task<int> GetBugAttachmentsCountAsync(string? organizationId, int r
         return result;
     }
 
-    public async Task<int> GetCommentAttachmentsCountAsync(string? organizationId, int reportId, int bugId, int commentId)
+    public async Task<int> GetCommentAttachmentsCountAsync(string userId, string? organizationId, int reportId, int bugId, int commentId)
     {
         await using var connection = await DataSource.OpenConnectionAsync();
-        
+
         var result = await connection.ExecuteScalarAsync<int>(
-            "SELECT public.get_comment_attachments_count(@organizationId, @reportId, @bugId, @commentId)",
+            "SELECT public.get_comment_attachments_count(@userId, @organizationId, @reportId, @bugId, @commentId)",
             new
             {
+                userId,
                 organizationId,
                 reportId,
                 bugId,
diff --git a/backend/Bugget/Controllers/Comments/CommentAttachmentsController.cs b/backend/Bugget/Controllers/Comments/CommentAttachmentsController.cs
@@ -53,7 +53,7 @@ CancellationToken ct
             bugId,
             commentId,
             fileStream,
-            new FileMeta(file.FileName, file.Length, file.ContentType),
+            new FileMeta(file.FileName, file.Length, mimeType),
             ct)
             .AsActionResultAsync();
     }
diff --git a/devops/migrator/sql/001_ddl.sql b/devops/migrator/sql/001_ddl.sql
@@ -44,11 +44,7 @@ CREATE TABLE IF NOT EXISTS public.attachments (
     bug_id INT NOT NULL,
     path TEXT NOT NULL,
     created_at timestamp with time zone not null default now(),
-    attach_type INT NOT NULL,
-
-    CONSTRAINT fk_attachments_bugs
-        FOREIGN KEY (bug_id)
-        REFERENCES public.bugs(id)
+    attach_type INT NOT NULL
 );
 
 -- Таблица комментариев
diff --git a/devops/migrator/sql/012_ddl_attachment_v2.sql b/devops/migrator/sql/012_ddl_attachment_v2.sql
@@ -8,4 +8,8 @@ ALTER TABLE public.attachments
   ADD COLUMN IF NOT EXISTS mime_type text DEFAULT NULL,
   ADD COLUMN IF NOT EXISTS has_preview boolean DEFAULT false,
   ADD COLUMN IF NOT EXISTS is_gzip_compressed boolean DEFAULT false,
-  ADD COLUMN IF NOT EXISTS updated_at timestamp with time zone DEFAULT now();
+  ADD COLUMN IF NOT EXISTS updated_at timestamp with time zone DEFAULT now();
+
+ALTER TABLE public.attachments
+  DROP CONSTRAINT IF EXISTS fk_attachments_bugs;
+
diff --git a/devops/migrator/sql/013_dml_attachment_v2.sql b/devops/migrator/sql/013_dml_attachment_v2.sql
@@ -19,7 +19,7 @@ BEGIN
 END;
 $$;
 
-CREATE OR REPLACE PROCEDURE public.check_comment_access(IN _comment_id integer, IN _bug_id integer, IN _report_id integer, IN _organization_id text)
+CREATE OR REPLACE PROCEDURE public.check_comment_access(IN _user_id text, IN _comment_id integer, IN _bug_id integer, IN _report_id integer, IN _organization_id text)
 LANGUAGE plpgsql
 AS $$
 BEGIN
@@ -35,7 +35,8 @@ BEGIN
             AND b.id = _bug_id
             AND b.report_id = _report_id
             AND(_organization_id IS NULL
-                OR r.creator_organization_id = _organization_id)) THEN
+                OR r.creator_organization_id = _organization_id)
+            AND c.creator_user_id = _user_id) THEN
     RAISE EXCEPTION 'Comment % not found or access denied', _comment_id
         USING ERRCODE = 'P0404';
     END IF;
@@ -60,13 +61,13 @@ END;
 $$
 LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION public.get_comment_attachments_count(_organization_id text, _report_id int, _bug_id int, _comment_id int)
+CREATE OR REPLACE FUNCTION public.get_comment_attachments_count(_user_id text, _organization_id text, _report_id int, _bug_id int, _comment_id int)
     RETURNS int
     AS $$
 DECLARE
     _comment_attach_type int = 2;
 BEGIN
-    CALL check_comment_access(_comment_id, _bug_id, _report_id, _organization_id);
+    CALL check_comment_access(_user_id, _comment_id, _bug_id, _report_id, _organization_id);
     RETURN (
         SELECT
             COUNT(*)
diff --git a/devops/migrator/sql/014_dml_comment_v2.sql b/devops/migrator/sql/014_dml_comment_v2.sql
@@ -28,11 +28,10 @@ CREATE OR REPLACE FUNCTION public.delete_comment_v2(_organization_id text, _user
     AS $$
 BEGIN
     -- Проверка доступа
-    CALL check_comment_access(_comment_id, _bug_id, _report_id, _organization_id);
+    CALL check_comment_access(_user_id, _comment_id, _bug_id, _report_id, _organization_id);
     -- Удаляем комментарий
     DELETE FROM public.comments
-    WHERE public.comments.id = _comment_id
-        AND public.comments.creator_user_id = _user_id;
+    WHERE public.comments.id = _comment_id;
 END;
 $$;
 
@@ -48,7 +47,7 @@ CREATE OR REPLACE FUNCTION public.update_comment_v2(_organization_id text, _user
     AS $$
 BEGIN
     -- 1) Проверяем, что комментарий существует и вы имеете к нему доступ
-    CALL check_comment_access(_comment_id, _bug_id, _report_id, _organization_id);
+    CALL check_comment_access(_user_id, _comment_id, _bug_id, _report_id, _organization_id);
     -- 2) Обновляем и сразу возвращаем новые значения
     RETURN QUERY UPDATE
         public.comments c
@@ -57,7 +56,6 @@ BEGIN
         updated_at = now()
     WHERE
         c.id = _comment_id
-        AND c.creator_user_id = _user_id
     RETURNING
         c.id,
         c.bug_id,
@@ -68,3 +66,40 @@ BEGIN
 END;
 $$;
 
+CREATE OR REPLACE FUNCTION public.delete_comment_attachments_internal(_comment_id integer)
+    RETURNS TABLE(
+        id integer,
+        attach_type integer,
+        entity_id integer,
+        storage_key text,
+        storage_kind integer,
+        creator_user_id text,
+        length_bytes bigint,
+        file_name text,
+        mime_type text,
+        has_preview boolean,
+        is_gzip_compressed boolean,
+        created_at timestamp with time zone,
+        updated_at timestamp with time zone)
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+    RETURN QUERY DELETE FROM public.attachments a
+    WHERE a.entity_id = _comment_id
+    RETURNING
+        a.id,
+        a.attach_type,
+        a.entity_id,
+        a.storage_key,
+        a.storage_kind,
+        a.creator_user_id,
+        a.length_bytes,
+        a.file_name,
+        a.mime_type,
+        a.has_preview,
+        a.is_gzip_compressed,
+        a.created_at,
+        a.updated_at;
+END;
+$$;
+

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public sealed class LimitsService(`
`41`	`41`	`int commentId)`
`42`	`42`	`{`
`43`	`43`	`var commentAttachmentsCount = await attachmentDbClient.GetCommentAttachmentsCountAsync(`
	`44`	`+ user.Id,`
`44`	`45`	`user.OrganizationId,`
`45`	`46`	`reportId,`
`46`	`47`	`bugId,`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ CancellationToken ct`
`53`	`53`	`bugId,`
`54`	`54`	`commentId,`
`55`	`55`	`fileStream,`
`56`		`- new FileMeta(file.FileName, file.Length, file.ContentType),`
	`56`	`+ new FileMeta(file.FileName, file.Length, mimeType),`
`57`	`57`	`ct)`
`58`	`58`	`.AsActionResultAsync();`
`59`	`59`	`}`