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

Remove deprecated snapshot system

Browse Source 
The register/document model has fully replaced the snapshot system.
Delete every snapshot-scoped row and strip the application code that
referenced them: SnapshotID/SourceID struct fields, snapshot_id IS NULL
filters, snapshot columns from SELECT/INSERT statements and named args,
and the eight migrate-*-snapshots-to-documents one-shot tools.

The remaining snapshot_id / source_id columns, the snapshots and
controls_snapshots tables, the snapshots_type enum, and the
snapshot-scoped indexes are now unused; they are dropped in a follow-up
schema migration so this change can roll back cleanly without leaving
orphaned data.

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
2026-05-06 17:24:58 +02:00
parent 79fa9a6e46
commit 3ff66757ad
28 changed files with 34 additions and 4597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/coredata/applicability_statement.go
View File

@@ -34,7 +34,6 @@ type (
StatementOfApplicabilityID gid.GID `db:"statement_of_applicability_id"`
ControlID gid.GID `db:"control_id"`
OrganizationID gid.GID `db:"organization_id"`
SnapshotID *gid.GID `db:"snapshot_id"`
Applicability bool `db:"applicability"`
Justification *string `db:"justification"`
CreatedAt time.Time `db:"created_at"`
@@ -85,7 +84,6 @@ WITH stmt AS (
a.statement_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
a.applicability,
a.justification,
a.created_at,
@@ -107,7 +105,6 @@ SELECT
statement_of_applicability_id,
control_id,
organization_id,
snapshot_id,
applicability,
justification,
created_at,
@@ -162,7 +159,6 @@ SELECT
soac.statement_of_applicability_id,
soac.control_id,
soac.organization_id,
soac.snapshot_id,
soac.applicability,
soac.justification,
soac.created_at,
@@ -218,7 +214,6 @@ INSERT INTO
control_id,
organization_id,
tenant_id,
snapshot_id,
applicability,
justification,
created_at,
@@ -230,7 +225,6 @@ VALUES (
@control_id,
@organization_id,
@tenant_id,
@snapshot_id,
@applicability,
@justification,
@created_at,
@@ -244,7 +238,6 @@ VALUES (
"control_id": sac.ControlID,
"organization_id": sac.OrganizationID,
"tenant_id": scope.GetTenantID(),
"snapshot_id": sac.SnapshotID,
"applicability": sac.Applicability,
"justification": sac.Justification,
"created_at": sac.CreatedAt,
@@ -410,7 +403,6 @@ WITH stmt AS (
a.statement_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
a.applicability,
a.justification,
a.created_at,
@@ -432,7 +424,6 @@ SELECT
statement_of_applicability_id,
control_id,
organization_id,
snapshot_id,
applicability,
justification,
created_at,
@@ -477,7 +468,6 @@ SELECT
a.statement_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
a.applicability,
a.justification,
a.created_at,
@@ -558,7 +548,6 @@ WITH soac_ctrl AS (
soac.statement_of_applicability_id,
soac.control_id,
soac.organization_id,
soac.snapshot_id,
soac.applicability,
soac.justification,
soac.created_at,
@@ -576,14 +565,12 @@ WITH soac_ctrl AS (
WHERE
soac.%[1]s
AND soac.control_id = @control_id
AND soa.snapshot_id IS NULL
)
SELECT
id,
statement_of_applicability_id,
control_id,
organization_id,
snapshot_id,
applicability,
justification,
created_at,

7
pkg/coredata/asset.go
View File

@@ -91,7 +91,6 @@ FROM
WHERE
%s
AND id = @asset_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -140,7 +139,6 @@ FROM
WHERE
%s
AND owner_profile_id = @owner_profile_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -182,7 +180,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -223,7 +220,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -270,7 +266,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
ORDER BY
name ASC
`
@@ -364,7 +359,6 @@ SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
RETURNING
id,
name,
@@ -415,7 +409,6 @@ DELETE FROM assets
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

13
pkg/coredata/data_protection_impact_assessment.go
View File

@@ -138,8 +138,6 @@ WHERE
type (
DataProtectionImpactAssessment struct {
ID gid.GID `db:"id"`
SnapshotID *gid.GID `db:"snapshot_id"`
SourceID *gid.GID `db:"source_id"`
OrganizationID gid.GID `db:"organization_id"`
ProcessingActivityID gid.GID `db:"processing_activity_id"`
Description *string `db:"description"`
@@ -192,7 +190,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -221,8 +218,6 @@ func (dpias *DataProtectionImpactAssessments) LoadByOrganizationID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
description,
@@ -237,7 +232,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -271,8 +265,6 @@ func (dpias *DataProtectionImpactAssessments) LoadAllByOrganizationID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
description,
@@ -287,7 +279,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -319,8 +310,6 @@ func (dpia *DataProtectionImpactAssessment) LoadByID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
description,
@@ -371,8 +360,6 @@ func (dpia *DataProtectionImpactAssessment) LoadByProcessingActivityID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
description,

7
pkg/coredata/datum.go
View File

@@ -89,7 +89,6 @@ FROM
WHERE
%s
AND id = @data_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -132,7 +131,6 @@ FROM
WHERE
%s
AND owner_profile_id = @owner_profile_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -170,7 +168,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -210,7 +207,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -255,7 +251,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
ORDER BY
name ASC
`
@@ -341,7 +336,6 @@ SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
RETURNING
id,
name,
@@ -388,7 +382,6 @@ DELETE FROM data
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

23
pkg/coredata/finding.go
View File

@@ -31,8 +31,6 @@ type (
Finding struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
SnapshotID *gid.GID `db:"snapshot_id"`
SourceID *gid.GID `db:"source_id"`
Kind FindingKind `db:"kind"`
ReferenceID string `db:"reference_id"`
Description *string `db:"description"`
@@ -98,8 +96,6 @@ func (f *Finding) LoadByID(
SELECT
id,
organization_id,
snapshot_id,
source_id,
kind,
reference_id,
description,
@@ -120,7 +116,6 @@ FROM
WHERE
%s
AND id = @finding_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -159,7 +154,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -192,8 +186,6 @@ func (fs *Findings) LoadByOrganizationID(
SELECT
id,
organization_id,
snapshot_id,
source_id,
kind,
reference_id,
description,
@@ -214,7 +206,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
AND %s
`
@@ -264,7 +255,7 @@ WITH next_ref AS (
0
) + 1 AS next_num
FROM findings
WHERE organization_id = @organization_id AND snapshot_id IS NULL
WHERE organization_id = @organization_id
)
INSERT INTO findings (
id,
@@ -360,7 +351,6 @@ SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -399,7 +389,7 @@ func (f *Finding) Delete(
DELETE FROM findings
WHERE
%s
AND id = @id AND snapshot_id IS NULL
AND id = @id
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -429,8 +419,6 @@ WITH f AS (
fi.id,
fi.tenant_id,
fi.organization_id,
fi.snapshot_id,
fi.source_id,
fi.kind,
fi.reference_id,
fi.description,
@@ -452,13 +440,10 @@ WITH f AS (
findings_audits fa ON fi.id = fa.finding_id
WHERE
fa.audit_id = @audit_id
AND fi.snapshot_id IS NULL
)
SELECT
id,
organization_id,
snapshot_id,
source_id,
kind,
reference_id,
description,
@@ -520,7 +505,6 @@ WITH f AS (
findings_audits fa ON fi.id = fa.finding_id
WHERE
fa.audit_id = @audit_id
AND fi.snapshot_id IS NULL
)
SELECT
COUNT(id)
@@ -558,8 +542,6 @@ func (fs *Findings) LoadAllByOrganizationID(
SELECT
id,
organization_id,
snapshot_id,
source_id,
kind,
reference_id,
description,
@@ -580,7 +562,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
ORDER BY
reference_id ASC
`

30
pkg/coredata/migrations/20260506T150405Z.sql Normal file
View File

@@ -0,0 +1,30 @@
-- Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
--
-- Permission to use, copy, modify, and/or distribute this software for any
-- purpose with or without fee is hereby granted, provided that the above
-- copyright notice and this permission notice appear in all copies.
--
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-- PERFORMANCE OF THIS SOFTWARE.
-- The register/document model has fully replaced the snapshot system. Delete the
-- snapshot-scoped data; the schema (snapshot_id / source_id columns, snapshots
-- table, controls_snapshots, snapshots_type enum, snapshot-scoped indexes) is
-- dropped in a follow-up migration.
-- processing_activity_vendors stores snapshot_id without an FK to snapshots, so
-- the cascade delete below would not reach it. Clean it up explicitly first.
DELETE FROM processing_activity_vendors WHERE snapshot_id IS NOT NULL;
-- Every other table with a snapshot_id has a FOREIGN KEY (snapshot_id) REFERENCES
-- snapshots(id) ON DELETE CASCADE, so deleting all snapshots removes every
-- snapshot-scoped row across data, vendors, assets, risks, findings, obligations,
-- processing_activities, statements_of_applicability, applicability_statements,
-- the vendor_* sub-tables, the processing_activity DPIA/TIA tables, and the
-- controls_snapshots junction.
DELETE FROM snapshots;

36
pkg/coredata/obligation.go
View File

@@ -41,8 +41,6 @@ type (
DueDate *time.Time `db:"due_date"`
Status ObligationStatus `db:"status"`
Type ObligationType `db:"type"`
SnapshotID *gid.GID `db:"snapshot_id"`
SourceID *gid.GID `db:"source_id"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
}
@@ -89,8 +87,6 @@ func (o *Obligation) LoadByID(
SELECT
id,
organization_id,
snapshot_id,
source_id,
area,
source,
requirement,
@@ -108,7 +104,6 @@ FROM
WHERE
%s
AND id = @obligation_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -146,7 +141,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -176,7 +170,6 @@ WITH obls AS (
SELECT
o.id,
o.tenant_id,
o.snapshot_id,
o.search_vector
FROM
obligations o
@@ -184,7 +177,6 @@ WITH obls AS (
risks_obligations ro ON o.id = ro.obligation_id
WHERE
ro.risk_id = @risk_id
AND o.snapshot_id IS NULL
)
SELECT
COUNT(id)
@@ -230,8 +222,6 @@ SELECT
due_date,
status,
type,
snapshot_id,
source_id,
created_at,
updated_at
FROM
@@ -239,7 +229,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -286,8 +275,6 @@ WITH obls AS (
o.due_date,
o.status,
o.type,
o.snapshot_id,
o.source_id,
o.created_at,
o.updated_at,
o.tenant_id,
@@ -298,7 +285,6 @@ WITH obls AS (
risks_obligations ro ON o.id = ro.obligation_id
WHERE
ro.risk_id = @risk_id
AND o.snapshot_id IS NULL
)
SELECT
id,
@@ -313,8 +299,6 @@ SELECT
due_date,
status,
type,
snapshot_id,
source_id,
created_at,
updated_at
FROM
@@ -354,15 +338,13 @@ func (os *Obligations) CountByControlID(
WITH obls AS (
SELECT
o.id,
o.tenant_id,
o.snapshot_id
o.tenant_id
FROM
obligations o
INNER JOIN
controls_obligations co ON o.id = co.obligation_id
WHERE
co.control_id = @control_id
AND o.snapshot_id IS NULL
)
SELECT
COUNT(id)
@@ -409,8 +391,6 @@ WITH obls AS (
o.due_date,
o.status,
o.type,
o.snapshot_id,
o.source_id,
o.created_at,
o.updated_at,
o.tenant_id
@@ -420,7 +400,6 @@ WITH obls AS (
controls_obligations co ON o.id = co.obligation_id
WHERE
co.control_id = @control_id
AND o.snapshot_id IS NULL
)
SELECT
id,
@@ -435,8 +414,6 @@ SELECT
due_date,
status,
type,
snapshot_id,
source_id,
created_at,
updated_at
FROM
@@ -485,8 +462,6 @@ INSERT INTO obligations (
due_date,
status,
type,
snapshot_id,
source_id,
created_at,
updated_at
) VALUES (
@@ -503,8 +478,6 @@ INSERT INTO obligations (
@due_date,
@status,
@type,
@snapshot_id,
@source_id,
@created_at,
@updated_at
)
@@ -524,8 +497,6 @@ INSERT INTO obligations (
"due_date": o.DueDate,
"status": o.Status,
"type": o.Type,
"snapshot_id": o.SnapshotID,
"source_id": o.SourceID,
"created_at": o.CreatedAt,
"updated_at": o.UpdatedAt,
}
@@ -559,7 +530,6 @@ UPDATE obligations SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -598,7 +568,6 @@ DELETE FROM obligations
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -634,8 +603,6 @@ SELECT
due_date,
status,
type,
snapshot_id,
source_id,
created_at,
updated_at
FROM
@@ -643,7 +610,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
ORDER BY
created_at ASC
`

21
pkg/coredata/processing_activities.go
View File

@@ -137,8 +137,6 @@ WHERE
type (
ProcessingActivity struct {
ID gid.GID `db:"id"`
SnapshotID *gid.GID `db:"snapshot_id"`
SourceID *gid.GID `db:"source_id"`
OrganizationID gid.GID `db:"organization_id"`
Name string `db:"name"`
Purpose *string `db:"purpose"`
@@ -200,8 +198,6 @@ func (p *ProcessingActivity) LoadByID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
name,
purpose,
@@ -266,7 +262,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -299,8 +294,6 @@ func (p *ProcessingActivities) LoadByIDs(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
name,
purpose,
@@ -365,8 +358,6 @@ func (p *ProcessingActivities) LoadByOrganizationID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
name,
purpose,
@@ -394,7 +385,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -428,8 +418,6 @@ func (p *ProcessingActivities) LoadAllByOrganizationID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
name,
purpose,
@@ -457,7 +445,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
ORDER BY created_at DESC
`
@@ -490,8 +477,6 @@ func (p *ProcessingActivity) Insert(
INSERT INTO processing_activities (
id,
tenant_id,
snapshot_id,
source_id,
organization_id,
name,
purpose,
@@ -517,8 +502,6 @@ INSERT INTO processing_activities (
) VALUES (
@id,
@tenant_id,
@snapshot_id,
@source_id,
@organization_id,
@name,
@purpose,
@@ -547,8 +530,6 @@ INSERT INTO processing_activities (
args := pgx.StrictNamedArgs{
"id": p.ID,
"tenant_id": scope.GetTenantID(),
"snapshot_id": p.SnapshotID,
"source_id": p.SourceID,
"organization_id": p.OrganizationID,
"name": p.Name,
"purpose": p.Purpose,
@@ -612,7 +593,6 @@ SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -660,7 +640,6 @@ DELETE FROM processing_activities
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

1
pkg/coredata/processing_activity_third_party.go
View File

@@ -29,7 +29,6 @@ type (
ProcessingActivityID gid.GID `db:"processing_activity_id"`
ThirdPartyID gid.GID `db:"third_party_id"`
TenantID gid.TenantID `db:"tenant_id"`
SnapshotID *gid.GID `db:"snapshot_id"`
CreatedAt time.Time `db:"created_at"`
}

9
pkg/coredata/risk.go
View File

@@ -214,7 +214,6 @@ WITH rsks AS (
risks_measures rm ON r.id = rm.risk_id
WHERE
rm.measure_id = @measure_id
AND r.snapshot_id IS NULL
)
SELECT
COUNT(id)
@@ -277,7 +276,6 @@ WITH rsks AS (
iam_membership_profiles p ON r.owner_profile_id = p.id
WHERE
rm.measure_id = @measure_id
AND r.snapshot_id IS NULL
)
SELECT
id,
@@ -338,7 +336,6 @@ SELECT
FROM risks
WHERE %s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment())
@@ -393,7 +390,6 @@ WITH rsks AS (
iam_membership_profiles p ON r.owner_profile_id = p.id
WHERE
r.organization_id = @organization_id
AND r.snapshot_id IS NULL
)
SELECT
id,
@@ -470,7 +466,6 @@ FROM
risks r
WHERE %s
AND r.organization_id = @organization_id
AND r.snapshot_id IS NULL
ORDER BY r.name ASC, r.id ASC
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -649,7 +644,6 @@ SET
updated_at = @updated_at
WHERE %s
AND id = @risk_id
AND snapshot_id IS NULL
RETURNING inherent_risk_score, residual_risk_score
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -688,7 +682,7 @@ func (r *Risk) Delete(
riskID gid.GID,
) error {
q := `
DELETE FROM risks WHERE %s AND id = @id AND snapshot_id IS NULL
DELETE FROM risks WHERE %s AND id = @id
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -718,7 +712,6 @@ WITH rsks AS (
risks_documents rd ON r.id = rd.risk_id
WHERE
rd.document_id = @document_id
AND r.snapshot_id IS NULL
)
SELECT
COUNT(id)

5
pkg/coredata/statement_of_applicability.go
View File

@@ -85,7 +85,6 @@ FROM
WHERE
%s
AND id = @statement_of_applicability_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -132,7 +131,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
@@ -169,7 +167,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -252,7 +249,6 @@ SET
WHERE
%s
AND id = @statement_of_applicability_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -293,7 +289,6 @@ DELETE FROM statements_of_applicability
WHERE
%s
AND id = @statement_of_applicability_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

5
pkg/coredata/third_party.go
View File

@@ -446,7 +446,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -505,7 +504,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
ORDER BY name ASC
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -568,7 +566,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
AND %s
`
@@ -1160,7 +1157,6 @@ WITH filtered_processing_activities AS (
WHERE
pa.tenant_id = @tenant_id
AND pa.organization_id = @organization_id
AND pa.snapshot_id IS NULL
),
filtered_third_parties AS (
SELECT
@@ -1170,7 +1166,6 @@ filtered_third_parties AS (
third_parties v
WHERE
v.tenant_id = @tenant_id
AND v.snapshot_id IS NULL
)
SELECT
pav.processing_activity_id,

12
pkg/coredata/third_party_business_associate_agreement.go
View File

@@ -22,7 +22,6 @@ import (
"time"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
"go.gearno.de/kit/pg"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/page"
@@ -89,7 +88,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -139,7 +137,6 @@ FROM
WHERE
%s
AND third_party_id = ANY(@third_party_ids)
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -227,7 +224,6 @@ SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -299,12 +295,6 @@ ON CONFLICT (organization_id, third_party_id) DO UPDATE SET
_, err := conn.Exec(ctx, q, args)
if err != nil {
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) {
if pgErr.Code == "23505" && pgErr.ConstraintName == "third_party_business_associate_agreements_source_id_snapshot_id_key" {
return ErrResourceAlreadyExists
}
}
return fmt.Errorf("cannot upsert thirdParty business associate agreement: %w", err)
}
return nil
@@ -322,7 +312,6 @@ FROM
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -347,7 +336,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

3
pkg/coredata/third_party_compliance_report.go
View File

@@ -91,7 +91,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
AND %s
`
@@ -143,7 +142,6 @@ FROM
WHERE
%s
AND third_party_id = ANY(@third_party_ids)
AND snapshot_id IS NULL
ORDER BY
third_party_id, report_date DESC
`
@@ -279,7 +277,6 @@ FROM
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
RETURNING report_file_id
`

4
pkg/coredata/third_party_contact.go
View File

@@ -144,7 +144,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
@@ -198,7 +197,6 @@ FROM
WHERE
%s
AND third_party_id = ANY(@third_party_ids)
AND snapshot_id IS NULL
ORDER BY
third_party_id, full_name ASC
`
@@ -299,7 +297,6 @@ SET
WHERE
%s
AND id = @third_party_contact_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -333,7 +330,6 @@ DELETE FROM
WHERE
%s
AND id = @third_party_contact_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

11
pkg/coredata/third_party_data_privacy_agreement.go
View File

@@ -22,7 +22,6 @@ import (
"time"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
"go.gearno.de/kit/pg"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/page"
@@ -89,7 +88,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
LIMIT 1;
`
@@ -139,7 +137,6 @@ FROM
WHERE
%s
AND third_party_id = ANY(@third_party_ids)
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -227,7 +224,6 @@ SET
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -299,12 +295,6 @@ ON CONFLICT (organization_id, third_party_id) DO UPDATE SET
_, err := conn.Exec(ctx, q, args)
if err != nil {
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) {
if pgErr.Code == "23505" && pgErr.ConstraintName == "third_party_data_privacy_agreements_source_id_snapshot_id_key" {
return ErrResourceAlreadyExists
}
}
return fmt.Errorf("cannot upsert thirdParty data privacy agreement: %w", err)
}
return nil
@@ -322,7 +312,6 @@ FROM
WHERE
%s
AND id = @id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

3
pkg/coredata/third_party_risk_assessment.go
View File

@@ -189,7 +189,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
ORDER BY
created_at DESC
LIMIT 1;
@@ -240,7 +239,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
AND %s
`
@@ -292,7 +290,6 @@ FROM
WHERE
%s
AND third_party_id = ANY(@third_party_ids)
AND snapshot_id IS NULL
ORDER BY
third_party_id, created_at DESC
`

4
pkg/coredata/third_party_service.go
View File

@@ -135,7 +135,6 @@ FROM
WHERE
%s
AND third_party_id = @third_party_id
AND snapshot_id IS NULL
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
@@ -187,7 +186,6 @@ FROM
WHERE
%s
AND third_party_id = ANY(@third_party_ids)
AND snapshot_id IS NULL
ORDER BY
third_party_id, name ASC
`
@@ -280,7 +278,6 @@ SET
WHERE
%s
AND id = @third_party_service_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -312,7 +309,6 @@ DELETE FROM
WHERE
%s
AND id = @third_party_service_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())

13
pkg/coredata/transfer_impact_assessment.go
View File

@@ -138,8 +138,6 @@ WHERE
type (
TransferImpactAssessment struct {
ID gid.GID `db:"id"`
SnapshotID *gid.GID `db:"snapshot_id"`
SourceID *gid.GID `db:"source_id"`
OrganizationID gid.GID `db:"organization_id"`
ProcessingActivityID gid.GID `db:"processing_activity_id"`
DataSubjects *string `db:"data_subjects"`
@@ -192,7 +190,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -221,8 +218,6 @@ func (tias *TransferImpactAssessments) LoadByOrganizationID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
data_subjects,
@@ -237,7 +232,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
AND %s
`
@@ -271,8 +265,6 @@ func (tias *TransferImpactAssessments) LoadAllByOrganizationID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
data_subjects,
@@ -287,7 +279,6 @@ FROM
WHERE
%s
AND organization_id = @organization_id
AND snapshot_id IS NULL
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -319,8 +310,6 @@ func (tia *TransferImpactAssessment) LoadByID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
data_subjects,
@@ -370,8 +359,6 @@ func (tia *TransferImpactAssessment) LoadByProcessingActivityID(
q := `
SELECT
id,
snapshot_id,
source_id,
organization_id,
processing_activity_id,
data_subjects,