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

Clear document mappings on soft delete

Browse Source 
Document soft delete cleared generated-document references but left
control, risk, and measure junction rows pointing at deleted documents.
That blocked risk deletion and made unlinkRisk fail when the document
was already gone.

Remove entity mappings in SoftDelete and BulkSoftDelete, drop mappings
before deleting a risk, tolerate missing documents when unlinking, and
backfill orphaned junction rows for soft-deleted documents.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
Cursor Agent
2026-07-29 15:01:37 +00:00
committed by Bryan Frimin
parent c6ad0154b9
commit f451e94c0b
7 changed files with 229 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/probo/control_service.go
View File

@@ -501,7 +501,7 @@ func (s ControlService) DeleteDocumentMapping(
documentID gid.GID,
) (*coredata.Control, *coredata.Document, error) {
control := &coredata.Control{}
document := &coredata.Document{}
document := &coredata.Document{ID: documentID}
err := s.svc.pg.WithTx(
ctx,
@@ -511,11 +511,13 @@ func (s ControlService) DeleteDocumentMapping(
}
if err := document.LoadByID(ctx, tx, scope, documentID); err != nil {
return fmt.Errorf("cannot load document: %w", err)
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load document: %w", err)
}
}
controlDocument := &coredata.ControlDocument{}
if err := controlDocument.Delete(ctx, tx, scope, control.ID, document.ID); err != nil {
if err := controlDocument.Delete(ctx, tx, scope, control.ID, documentID); err != nil {
return fmt.Errorf("cannot delete control document mapping: %w", err)
}

65
pkg/probo/document_service.go
View File

@@ -1598,6 +1598,10 @@ func (s *DocumentService) SoftDelete(
return fmt.Errorf("cannot emit document deleted webhook: %w", err)
}
if err := s.deleteDocumentEntityMappings(ctx, scope, tx, []gid.GID{documentID}); err != nil {
return err
}
if err := s.clearDocumentReferences(ctx, scope, tx, []gid.GID{documentID}); err != nil {
return err
}
@@ -1624,6 +1628,10 @@ func (s *DocumentService) BulkSoftDelete(
return fmt.Errorf("cannot emit document deleted webhooks: %w", err)
}
if err := s.deleteDocumentEntityMappings(ctx, scope, tx, documentIDs); err != nil {
return err
}
if err := s.clearDocumentReferences(ctx, scope, tx, documentIDs); err != nil {
return err
}
@@ -1652,19 +1660,8 @@ func (s *DocumentService) BulkArchive(
}
}
controlDocument := coredata.ControlDocument{}
if err := controlDocument.DeleteByDocumentIDs(ctx, tx, scope, documentIDs); err != nil {
return fmt.Errorf("cannot delete control mappings: %w", err)
}
riskDocument := coredata.RiskDocument{}
if err := riskDocument.DeleteByDocumentIDs(ctx, tx, scope, documentIDs); err != nil {
return fmt.Errorf("cannot delete risk mappings: %w", err)
}
measureDocument := coredata.MeasureDocument{}
if err := measureDocument.DeleteByDocumentIDs(ctx, tx, scope, documentIDs); err != nil {
return fmt.Errorf("cannot delete measure mappings: %w", err)
if err := s.deleteDocumentEntityMappings(ctx, scope, tx, documentIDs); err != nil {
return err
}
if err := s.clearDocumentReferences(ctx, scope, tx, documentIDs); err != nil {
@@ -1716,6 +1713,33 @@ func (s *DocumentService) BulkUnarchive(
)
}
func (s *DocumentService) deleteDocumentEntityMappings(
ctx context.Context, scope coredata.Scoper,
tx pg.Tx,
documentIDs []gid.GID,
) error {
if len(documentIDs) == 0 {
return nil
}
controlDocument := coredata.ControlDocument{}
if err := controlDocument.DeleteByDocumentIDs(ctx, tx, scope, documentIDs); err != nil {
return fmt.Errorf("cannot delete control mappings: %w", err)
}
riskDocument := coredata.RiskDocument{}
if err := riskDocument.DeleteByDocumentIDs(ctx, tx, scope, documentIDs); err != nil {
return fmt.Errorf("cannot delete risk mappings: %w", err)
}
measureDocument := coredata.MeasureDocument{}
if err := measureDocument.DeleteByDocumentIDs(ctx, tx, scope, documentIDs); err != nil {
return fmt.Errorf("cannot delete measure mappings: %w", err)
}
return nil
}
// clearDocumentReferences nullifies references to the given document IDs in
// generated_documents and statements_of_applicability. This must be called
// inside a transaction before soft-deleting or archiving documents, because
@@ -2476,19 +2500,8 @@ func (s *DocumentService) Archive(
return err
}
controlDocument := coredata.ControlDocument{}
if err := controlDocument.DeleteByDocumentIDs(ctx, tx, scope, []gid.GID{documentID}); err != nil {
return fmt.Errorf("cannot delete control mappings: %w", err)
}
riskDocument := coredata.RiskDocument{}
if err := riskDocument.DeleteByDocumentIDs(ctx, tx, scope, []gid.GID{documentID}); err != nil {
return fmt.Errorf("cannot delete risk mappings: %w", err)
}
measureDocument := coredata.MeasureDocument{}
if err := measureDocument.DeleteByDocumentIDs(ctx, tx, scope, []gid.GID{documentID}); err != nil {
return fmt.Errorf("cannot delete measure mappings: %w", err)
if err := s.deleteDocumentEntityMappings(ctx, scope, tx, []gid.GID{documentID}); err != nil {
return err
}
if err := s.clearDocumentReferences(ctx, scope, tx, []gid.GID{documentID}); err != nil {

8
pkg/probo/measure_service.go
View File

@@ -789,7 +789,7 @@ func (s MeasureService) DeleteDocumentMapping(
documentID gid.GID,
) (*coredata.Measure, *coredata.Document, error) {
measure := &coredata.Measure{}
document := &coredata.Document{}
document := &coredata.Document{ID: documentID}
err := s.svc.pg.WithTx(
ctx,
@@ -799,11 +799,13 @@ func (s MeasureService) DeleteDocumentMapping(
}
if err := document.LoadByID(ctx, tx, scope, documentID); err != nil {
return fmt.Errorf("cannot load document: %w", err)
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load document: %w", err)
}
}
measureDocument := &coredata.MeasureDocument{}
if err := measureDocument.Delete(ctx, tx, scope, measure.ID, document.ID); err != nil {
if err := measureDocument.Delete(ctx, tx, scope, measure.ID, documentID); err != nil {
return fmt.Errorf("cannot delete measure document mapping: %w", err)
}

13
pkg/probo/risk_service.go
View File

@@ -249,7 +249,7 @@ func (s RiskService) DeleteDocumentMapping(
) (*coredata.Risk, *coredata.Document, error) {
riskDocument := &coredata.RiskDocument{}
risk := &coredata.Risk{}
document := &coredata.Document{}
document := &coredata.Document{ID: documentID}
err := s.svc.pg.WithTx(
ctx,
@@ -259,10 +259,12 @@ func (s RiskService) DeleteDocumentMapping(
}
if err := document.LoadByID(ctx, tx, scope, documentID); err != nil {
return fmt.Errorf("cannot load document: %w", err)
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load document: %w", err)
}
}
return riskDocument.Delete(ctx, tx, scope, risk.ID, document.ID)
return riskDocument.Delete(ctx, tx, scope, risk.ID, documentID)
},
)
if err != nil {
@@ -610,10 +612,15 @@ func (s RiskService) Delete(
riskID gid.GID,
) error {
risk := &coredata.Risk{}
riskDocument := &coredata.RiskDocument{}
return s.svc.pg.WithTx(
ctx,
func(ctx context.Context, tx pg.Tx) error {
if err := riskDocument.DeleteByRiskID(ctx, tx, scope, riskID); err != nil {
return fmt.Errorf("cannot delete risk document mappings: %w", err)
}
return risk.Delete(ctx, tx, scope, riskID)
},
)