From 49ee46da22317dc73d026ac14bb83d1d743c0cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Thu, 11 Dec 2025 10:21:01 +0100 Subject: [PATCH] Update timestamp on reject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Émile Ré --- pkg/coredata/trust_center_document_access.go | 13 +++++++++++-- pkg/trust/trust_center_access_service.go | 7 ++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkg/coredata/trust_center_document_access.go b/pkg/coredata/trust_center_document_access.go index 1666fc67a..c4e528627 100644 --- a/pkg/coredata/trust_center_document_access.go +++ b/pkg/coredata/trust_center_document_access.go @@ -609,6 +609,7 @@ FROM WHERE %s AND trust_center_access_id = @trust_center_access_id +ORDER BY created_at ASC ` q = fmt.Sprintf(q, scope.SQLFragment()) @@ -673,6 +674,7 @@ func RejectOrRevokeByDocumentIDs( scope Scoper, trustCenterAccessID gid.GID, documentIDs []gid.GID, + updatedAt time.Time, ) error { q := ` UPDATE trust_center_document_accesses @@ -680,7 +682,8 @@ SET status = CASE WHEN status = 'GRANTED'::trust_center_document_access_status THEN 'REVOKED'::trust_center_document_access_status ELSE 'REJECTED'::trust_center_document_access_status - END + END, + updated_at = @updated_at WHERE %s AND trust_center_access_id = @trust_center_access_id @@ -692,6 +695,7 @@ WHERE args := pgx.StrictNamedArgs{ "trust_center_access_id": trustCenterAccessID, "document_ids": documentIDs, + "updated_at": updatedAt, } maps.Copy(args, scope.SQLArguments()) @@ -743,6 +747,7 @@ func RejectOrRevokeByReportIDs( scope Scoper, trustCenterAccessID gid.GID, reportIDs []gid.GID, + updatedAt time.Time, ) error { q := ` UPDATE trust_center_document_accesses @@ -750,7 +755,8 @@ SET status = CASE WHEN status = 'GRANTED'::trust_center_document_access_status THEN 'REVOKED'::trust_center_document_access_status ELSE 'REJECTED'::trust_center_document_access_status - END + END, + updated_at = @updated_at WHERE %s AND trust_center_access_id = @trust_center_access_id @@ -762,6 +768,7 @@ WHERE args := pgx.StrictNamedArgs{ "trust_center_access_id": trustCenterAccessID, "report_ids": reportIDs, + "updated_at": updatedAt, } maps.Copy(args, scope.SQLArguments()) @@ -1155,6 +1162,7 @@ func RejectOrRevokeByTrustCenterFileIDs( scope Scoper, trustCenterAccessID gid.GID, trustCenterFileIDs []gid.GID, + updatedAt time.Time, ) error { q := ` UPDATE trust_center_document_accesses @@ -1174,6 +1182,7 @@ WHERE args := pgx.StrictNamedArgs{ "trust_center_access_id": trustCenterAccessID, "trust_center_file_ids": trustCenterFileIDs, + "updated_at": updatedAt, } maps.Copy(args, scope.SQLArguments()) diff --git a/pkg/trust/trust_center_access_service.go b/pkg/trust/trust_center_access_service.go index 5d2fa1b36..0251200dc 100644 --- a/pkg/trust/trust_center_access_service.go +++ b/pkg/trust/trust_center_access_service.go @@ -596,22 +596,23 @@ func (s *TrustCenterAccessService) RejectOrRevokeByIDs( } shouldSendEmail := false + now := time.Now() if len(documentIDs) > 0 { shouldSendEmail = true - if err := coredata.RejectOrRevokeByDocumentIDs(ctx, tx, s.svc.scope, access.ID, documentIDs); err != nil { + if err := coredata.RejectOrRevokeByDocumentIDs(ctx, tx, s.svc.scope, access.ID, documentIDs, now); err != nil { return fmt.Errorf("cannot reject/revoke document accesses: %w", err) } } if len(reportIDs) > 0 { shouldSendEmail = true - if err := coredata.RejectOrRevokeByReportIDs(ctx, tx, s.svc.scope, access.ID, reportIDs); err != nil { + if err := coredata.RejectOrRevokeByReportIDs(ctx, tx, s.svc.scope, access.ID, reportIDs, now); err != nil { return fmt.Errorf("cannot reject/revoke report accesses: %w", err) } } if len(fileIDs) > 0 { shouldSendEmail = true - if err := coredata.RejectOrRevokeByTrustCenterFileIDs(ctx, tx, s.svc.scope, access.ID, fileIDs); err != nil { + if err := coredata.RejectOrRevokeByTrustCenterFileIDs(ctx, tx, s.svc.scope, access.ID, fileIDs, now); err != nil { return fmt.Errorf("cannot reject/revoke trust center file accesses: %w", err) } }