rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update timestamp on reject

Browse Source 
Signed-off-by: Émile Ré <nemile.re@gmail.com>
This commit is contained in:
Émile Ré
2025-12-11 10:21:01 +01:00
parent 75f01d4d0c
commit 49ee46da22
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/coredata/trust_center_document_access.go
View File

@@ -609,6 +609,7 @@ FROM
WHERE WHERE
%s %s
AND trust_center_access_id = @trust_center_access_id AND trust_center_access_id = @trust_center_access_id
ORDER BY created_at ASC
` `
q = fmt.Sprintf(q, scope.SQLFragment()) q = fmt.Sprintf(q, scope.SQLFragment())
@@ -673,6 +674,7 @@ func RejectOrRevokeByDocumentIDs(
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
documentIDs []gid.GID, documentIDs []gid.GID,
updatedAt time.Time,
) error { ) error {
q := ` q := `
UPDATE trust_center_document_accesses UPDATE trust_center_document_accesses
@@ -680,7 +682,8 @@ SET
status = CASE status = CASE
WHEN status = 'GRANTED'::trust_center_document_access_status THEN 'REVOKED'::trust_center_document_access_status WHEN status = 'GRANTED'::trust_center_document_access_status THEN 'REVOKED'::trust_center_document_access_status
ELSE 'REJECTED'::trust_center_document_access_status ELSE 'REJECTED'::trust_center_document_access_status
END END,
updated_at = @updated_at
WHERE WHERE
%s %s
AND trust_center_access_id = @trust_center_access_id AND trust_center_access_id = @trust_center_access_id
@@ -692,6 +695,7 @@ WHERE
args := pgx.StrictNamedArgs{ args := pgx.StrictNamedArgs{
"trust_center_access_id": trustCenterAccessID, "trust_center_access_id": trustCenterAccessID,
"document_ids": documentIDs, "document_ids": documentIDs,
"updated_at": updatedAt,
} }
maps.Copy(args, scope.SQLArguments()) maps.Copy(args, scope.SQLArguments())
@@ -743,6 +747,7 @@ func RejectOrRevokeByReportIDs(
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
reportIDs []gid.GID, reportIDs []gid.GID,
updatedAt time.Time,
) error { ) error {
q := ` q := `
UPDATE trust_center_document_accesses UPDATE trust_center_document_accesses
@@ -750,7 +755,8 @@ SET
status = CASE status = CASE
WHEN status = 'GRANTED'::trust_center_document_access_status THEN 'REVOKED'::trust_center_document_access_status WHEN status = 'GRANTED'::trust_center_document_access_status THEN 'REVOKED'::trust_center_document_access_status
ELSE 'REJECTED'::trust_center_document_access_status ELSE 'REJECTED'::trust_center_document_access_status
END END,
updated_at = @updated_at
WHERE WHERE
%s %s
AND trust_center_access_id = @trust_center_access_id AND trust_center_access_id = @trust_center_access_id
@@ -762,6 +768,7 @@ WHERE
args := pgx.StrictNamedArgs{ args := pgx.StrictNamedArgs{
"trust_center_access_id": trustCenterAccessID, "trust_center_access_id": trustCenterAccessID,
"report_ids": reportIDs, "report_ids": reportIDs,
"updated_at": updatedAt,
} }
maps.Copy(args, scope.SQLArguments()) maps.Copy(args, scope.SQLArguments())
@@ -1155,6 +1162,7 @@ func RejectOrRevokeByTrustCenterFileIDs(
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
trustCenterFileIDs []gid.GID, trustCenterFileIDs []gid.GID,
updatedAt time.Time,
) error { ) error {
q := ` q := `
UPDATE trust_center_document_accesses UPDATE trust_center_document_accesses
@@ -1174,6 +1182,7 @@ WHERE
args := pgx.StrictNamedArgs{ args := pgx.StrictNamedArgs{
"trust_center_access_id": trustCenterAccessID, "trust_center_access_id": trustCenterAccessID,
"trust_center_file_ids": trustCenterFileIDs, "trust_center_file_ids": trustCenterFileIDs,
"updated_at": updatedAt,
} }
maps.Copy(args, scope.SQLArguments()) maps.Copy(args, scope.SQLArguments())

7
pkg/trust/trust_center_access_service.go
View File

@@ -596,22 +596,23 @@ func (s *TrustCenterAccessService) RejectOrRevokeByIDs(
} }
shouldSendEmail := false shouldSendEmail := false
now := time.Now()
if len(documentIDs) > 0 { if len(documentIDs) > 0 {
shouldSendEmail = true 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) return fmt.Errorf("cannot reject/revoke document accesses: %w", err)
} }
} }
if len(reportIDs) > 0 { if len(reportIDs) > 0 {
shouldSendEmail = true 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) return fmt.Errorf("cannot reject/revoke report accesses: %w", err)
} }
} }
if len(fileIDs) > 0 { if len(fileIDs) > 0 {
shouldSendEmail = true 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) return fmt.Errorf("cannot reject/revoke trust center file accesses: %w", err)
} }
} }