Improve data isolation for risks

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

pkg/coredata/risk.go

@@ -324,15 +324,14 @@ func (r *Risk) Delete(
 	ctx context.Context,
 	conn pg.Conn,
 	scope Scoper,
+	riskID gid.GID,
 ) error {
 	q := `
 DELETE FROM risks WHERE %s AND id = @id
 `
 	q = fmt.Sprintf(q, scope.SQLFragment())
 
-	args := pgx.StrictNamedArgs{
-		"id": r.ID,
-	}
+	args := pgx.StrictNamedArgs{"id": riskID}
 	maps.Copy(args, scope.SQLArguments())
 
 	_, err := conn.Exec(ctx, q, args)

pkg/coredata/risk_mesure.go

@@ -71,6 +71,8 @@ func (rm RiskMeasure) Delete(
 	ctx context.Context,
 	conn pg.Conn,
 	scope Scoper,
+	riskID gid.GID,
+	measureID gid.GID,
 ) error {
 	q := `
 DELETE
@@ -85,8 +87,8 @@ WHERE
 	q = fmt.Sprintf(q, scope.SQLFragment())
 
 	args := pgx.StrictNamedArgs{
-		"risk_id":    rm.RiskID,
-		"measure_id": rm.MeasureID,
+		"risk_id":    riskID,
+		"measure_id": measureID,
 	}
 	maps.Copy(args, scope.SQLArguments())
 

pkg/coredata/risk_policy.go

@@ -71,6 +71,8 @@ func (rp RiskPolicy) Delete(
 	ctx context.Context,
 	conn pg.Conn,
 	scope Scoper,
+	riskID gid.GID,
+	policyID gid.GID,
 ) error {
 	q := `
 DELETE
@@ -85,8 +87,8 @@ WHERE
 	q = fmt.Sprintf(q, scope.SQLFragment())
 
 	args := pgx.StrictNamedArgs{
-		"risk_id":   rp.RiskID,
-		"policy_id": rp.PolicyID,
+		"risk_id":   riskID,
+		"policy_id": policyID,
 	}
 	maps.Copy(args, scope.SQLArguments())