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

Rename State of Applicability to Statement of Applicability

Browse Source 
Rename the entity across the full stack: database table
(states_of_applicability → statements_of_applicability), Go model,
GraphQL types, MCP specification, CLI commands, frontend components,
routes, and display labels. Includes a migration to rename the table
and its foreign key column.

Widen sidebar from 260px to 280px to fit the longer label.

Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
2026-04-09 13:06:06 +02:00
parent 050073ab3c
commit 5fd580e995
48 changed files with 978 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
pkg/coredata/applicability_statement.go
View File

@@ -30,15 +30,15 @@ import (
type (
ApplicabilityStatement struct {
ID gid.GID `db:"id"`
StateOfApplicabilityID gid.GID `db:"state_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"`
UpdatedAt time.Time `db:"updated_at"`
ID gid.GID `db:"id"`
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"`
UpdatedAt time.Time `db:"updated_at"`
// Ordering only.
SectionTitle string `db:"section_title"`
@@ -82,7 +82,7 @@ func (sac *ApplicabilityStatement) LoadByID(
WITH stmt AS (
SELECT
a.id,
a.state_of_applicability_id,
a.statement_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
@@ -104,7 +104,7 @@ WITH stmt AS (
)
SELECT
id,
state_of_applicability_id,
statement_of_applicability_id,
control_id,
organization_id,
snapshot_id,
@@ -142,25 +142,25 @@ LIMIT 1;
return nil
}
func (sac *ApplicabilityStatement) LoadByStateOfApplicabilityIDAndControlID(
func (sac *ApplicabilityStatement) LoadByStatementOfApplicabilityIDAndControlID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
stateOfApplicabilityID gid.GID,
statementOfApplicabilityID gid.GID,
controlID gid.GID,
) error {
q := `
WITH current_soa AS (
SELECT id
FROM states_of_applicability
FROM statements_of_applicability
WHERE
%s
AND id = @state_of_applicability_id
AND id = @statement_of_applicability_id
AND snapshot_id IS NULL
)
SELECT
soac.id,
soac.state_of_applicability_id,
soac.statement_of_applicability_id,
soac.control_id,
soac.organization_id,
soac.snapshot_id,
@@ -172,7 +172,7 @@ SELECT
FROM
applicability_statements soac
INNER JOIN
current_soa ON soac.state_of_applicability_id = current_soa.id
current_soa ON soac.statement_of_applicability_id = current_soa.id
INNER JOIN
controls c ON c.id = soac.control_id
INNER JOIN
@@ -184,8 +184,8 @@ LIMIT 1;
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"state_of_applicability_id": stateOfApplicabilityID,
"control_id": controlID,
"statement_of_applicability_id": statementOfApplicabilityID,
"control_id": controlID,
}
maps.Copy(args, scope.SQLArguments())
@@ -215,7 +215,7 @@ func (sac *ApplicabilityStatement) Insert(
INSERT INTO
applicability_statements (
id,
state_of_applicability_id,
statement_of_applicability_id,
control_id,
organization_id,
tenant_id,
@@ -227,7 +227,7 @@ INSERT INTO
)
VALUES (
@id,
@state_of_applicability_id,
@statement_of_applicability_id,
@control_id,
@organization_id,
@tenant_id,
@@ -240,16 +240,16 @@ VALUES (
`
args := pgx.StrictNamedArgs{
"id": sac.ID,
"state_of_applicability_id": sac.StateOfApplicabilityID,
"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,
"updated_at": sac.UpdatedAt,
"id": sac.ID,
"statement_of_applicability_id": sac.StatementOfApplicabilityID,
"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,
"updated_at": sac.UpdatedAt,
}
_, err := conn.Exec(ctx, q, args)
@@ -280,17 +280,17 @@ SET
updated_at = @updated_at
WHERE
%s
AND state_of_applicability_id = @state_of_applicability_id
AND statement_of_applicability_id = @statement_of_applicability_id
AND control_id = @control_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"state_of_applicability_id": sac.StateOfApplicabilityID,
"control_id": sac.ControlID,
"applicability": sac.Applicability,
"justification": sac.Justification,
"updated_at": sac.UpdatedAt,
"statement_of_applicability_id": sac.StatementOfApplicabilityID,
"control_id": sac.ControlID,
"applicability": sac.Applicability,
"justification": sac.Justification,
"updated_at": sac.UpdatedAt,
}
maps.Copy(args, scope.SQLArguments())
@@ -347,20 +347,20 @@ func (sac *ApplicabilityStatement) Delete(
q := `
WITH current_soa AS (
SELECT id
FROM states_of_applicability
FROM statements_of_applicability
WHERE
%s
AND id = @state_of_applicability_id
AND id = @statement_of_applicability_id
AND snapshot_id IS NULL
)
DELETE FROM applicability_statements
WHERE state_of_applicability_id IN (SELECT id FROM current_soa)
WHERE statement_of_applicability_id IN (SELECT id FROM current_soa)
AND control_id = @control_id;
`
args := pgx.StrictNamedArgs{
"state_of_applicability_id": sac.StateOfApplicabilityID,
"control_id": sac.ControlID,
"statement_of_applicability_id": sac.StatementOfApplicabilityID,
"control_id": sac.ControlID,
}
maps.Copy(args, scope.SQLArguments())
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -398,18 +398,18 @@ WHERE
return nil
}
func (sacs *ApplicabilityStatements) LoadByStateOfApplicabilityID(
func (sacs *ApplicabilityStatements) LoadByStatementOfApplicabilityID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
stateOfApplicabilityID gid.GID,
statementOfApplicabilityID gid.GID,
cursor *page.Cursor[ApplicabilityStatementOrderField],
) error {
q := `
WITH stmt AS (
SELECT
a.id,
a.state_of_applicability_id,
a.statement_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
@@ -427,11 +427,11 @@ WITH stmt AS (
frameworks f ON f.id = c.framework_id
WHERE
a.%[1]s
AND a.state_of_applicability_id = @state_of_applicability_id
AND a.statement_of_applicability_id = @statement_of_applicability_id
)
SELECT
id,
state_of_applicability_id,
statement_of_applicability_id,
control_id,
organization_id,
snapshot_id,
@@ -448,7 +448,7 @@ WHERE
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.NamedArgs{
"state_of_applicability_id": stateOfApplicabilityID,
"statement_of_applicability_id": statementOfApplicabilityID,
}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, cursor.SQLArguments())
@@ -467,11 +467,11 @@ WHERE
return nil
}
func (sacs *ApplicabilityStatements) CountByStateOfApplicabilityID(
func (sacs *ApplicabilityStatements) CountByStatementOfApplicabilityID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
stateOfApplicabilityID gid.GID,
statementOfApplicabilityID gid.GID,
) (int, error) {
q := `
SELECT
@@ -480,11 +480,11 @@ FROM
applicability_statements
WHERE
%s
AND state_of_applicability_id = @state_of_applicability_id;
AND statement_of_applicability_id = @statement_of_applicability_id;
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.NamedArgs{"state_of_applicability_id": stateOfApplicabilityID}
args := pgx.NamedArgs{"statement_of_applicability_id": statementOfApplicabilityID}
maps.Copy(args, scope.SQLArguments())
var count int
@@ -506,7 +506,7 @@ func (sacs *ApplicabilityStatements) LoadByControlID(
WITH soac_ctrl AS (
SELECT
soac.id,
soac.state_of_applicability_id,
soac.statement_of_applicability_id,
soac.control_id,
soac.organization_id,
soac.snapshot_id,
@@ -519,7 +519,7 @@ WITH soac_ctrl AS (
FROM
applicability_statements soac
INNER JOIN
states_of_applicability soa ON soac.state_of_applicability_id = soa.id
statements_of_applicability soa ON soac.statement_of_applicability_id = soa.id
INNER JOIN
controls c ON c.id = soac.control_id
INNER JOIN
@@ -531,7 +531,7 @@ WITH soac_ctrl AS (
)
SELECT
id,
state_of_applicability_id,
statement_of_applicability_id,
control_id,
organization_id,
snapshot_id,

4
pkg/coredata/audit_log_resource_type.go
View File

@@ -97,8 +97,8 @@ func ResourceTypeName(entityType uint16) string {
return "TransferImpactAssessment"
case RightsRequestEntityType:
return "RightsRequest"
case StateOfApplicabilityEntityType:
return "StateOfApplicability"
case StatementOfApplicabilityEntityType:
return "StatementOfApplicability"
case ApplicabilityStatementEntityType:
return "ApplicabilityStatement"
case WebhookSubscriptionEntityType:

8
pkg/coredata/control.go
View File

@@ -1041,11 +1041,11 @@ WHERE %s
return nil
}
func (c *Controls) CountByStateOfApplicabilityID(
func (c *Controls) CountByStatementOfApplicabilityID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
stateOfApplicabilityID gid.GID,
statementOfApplicabilityID gid.GID,
filter *ControlFilter,
) (int, error) {
q := `
@@ -1059,7 +1059,7 @@ WITH ctrl AS (
INNER JOIN
applicability_statements soac ON c.id = soac.control_id
WHERE
soac.state_of_applicability_id = @state_of_applicability_id
soac.statement_of_applicability_id = @statement_of_applicability_id
)
SELECT
COUNT(id)
@@ -1070,7 +1070,7 @@ WHERE %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment())
args := pgx.NamedArgs{"state_of_applicability_id": stateOfApplicabilityID}
args := pgx.NamedArgs{"statement_of_applicability_id": statementOfApplicabilityID}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, filter.SQLArguments())

6
pkg/coredata/entity_type_reg.go
View File

@@ -72,7 +72,7 @@ const (
DataProtectionImpactAssessmentEntityType uint16 = 46
TransferImpactAssessmentEntityType uint16 = 47
RightsRequestEntityType uint16 = 48
StateOfApplicabilityEntityType uint16 = 49
StatementOfApplicabilityEntityType uint16 = 49
ApplicabilityStatementEntityType uint16 = 50
MembershipProfileEntityType uint16 = 51
SCIMConfigurationEntityType uint16 = 52
@@ -194,8 +194,8 @@ func NewEntityFromID(id gid.GID) (any, bool) {
return &TransferImpactAssessment{ID: id}, true
case RightsRequestEntityType:
return &RightsRequest{ID: id}, true
case StateOfApplicabilityEntityType:
return &StateOfApplicability{ID: id}, true
case StatementOfApplicabilityEntityType:
return &StatementOfApplicability{ID: id}, true
case ApplicabilityStatementEntityType:
return &ApplicabilityStatement{ID: id}, true
case MembershipProfileEntityType:

19
pkg/coredata/migrations/20260409T120000Z.sql Normal file
View File

@@ -0,0 +1,19 @@
-- Copyright (c) 2025-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.
-- Rename states_of_applicability to statements_of_applicability
ALTER TABLE states_of_applicability RENAME TO statements_of_applicability;
ALTER TABLE applicability_statements RENAME COLUMN state_of_applicability_id TO statement_of_applicability_id;
ALTER TYPE snapshots_type RENAME VALUE 'STATES_OF_APPLICABILITY' TO 'STATEMENTS_OF_APPLICABILITY';

22
pkg/coredata/snapshots_type.go
View File

@@ -24,14 +24,14 @@ type (
)
const (
SnapshotsTypeRisks SnapshotsType = "RISKS"
SnapshotsTypeVendors SnapshotsType = "VENDORS"
SnapshotsTypeAssets SnapshotsType = "ASSETS"
SnapshotsTypeData SnapshotsType = "DATA"
SnapshotsTypeFindings SnapshotsType = "FINDINGS"
SnapshotsTypeObligations SnapshotsType = "OBLIGATIONS"
SnapshotsTypeProcessingActivities SnapshotsType = "PROCESSING_ACTIVITIES"
SnapshotsTypeStatesOfApplicability SnapshotsType = "STATES_OF_APPLICABILITY"
SnapshotsTypeRisks SnapshotsType = "RISKS"
SnapshotsTypeVendors SnapshotsType = "VENDORS"
SnapshotsTypeAssets SnapshotsType = "ASSETS"
SnapshotsTypeData SnapshotsType = "DATA"
SnapshotsTypeFindings SnapshotsType = "FINDINGS"
SnapshotsTypeObligations SnapshotsType = "OBLIGATIONS"
SnapshotsTypeProcessingActivities SnapshotsType = "PROCESSING_ACTIVITIES"
SnapshotsTypeStatementsOfApplicability SnapshotsType = "STATEMENTS_OF_APPLICABILITY"
)
func SnapshotsTypes() []SnapshotsType {
@@ -43,7 +43,7 @@ func SnapshotsTypes() []SnapshotsType {
SnapshotsTypeFindings,
SnapshotsTypeObligations,
SnapshotsTypeProcessingActivities,
SnapshotsTypeStatesOfApplicability,
SnapshotsTypeStatementsOfApplicability,
}
}
@@ -77,8 +77,8 @@ func (st *SnapshotsType) Scan(value any) error {
*st = SnapshotsTypeObligations
case SnapshotsTypeProcessingActivities.String():
*st = SnapshotsTypeProcessingActivities
case SnapshotsTypeStatesOfApplicability.String():
*st = SnapshotsTypeStatesOfApplicability
case SnapshotsTypeStatementsOfApplicability.String():
*st = SnapshotsTypeStatementsOfApplicability
default:
return fmt.Errorf("invalid SnapshotsType value: %q", s)
}

4
pkg/coredata/snapshottable.go
View File

@@ -42,8 +42,8 @@ func GetSnapshottable(snapshotType SnapshotsType) (Snapshottable, error) {
return ProcessingActivities{}, nil
case SnapshotsTypeVendors:
return Vendors{}, nil
case SnapshotsTypeStatesOfApplicability:
return StatesOfApplicability{}, nil
case SnapshotsTypeStatementsOfApplicability:
return StatementsOfApplicability{}, nil
default:
return nil, fmt.Errorf("unsupported snapshot type: %s", snapshotType)
}

150
pkg/coredata/state_of_applicability.go → pkg/coredata/statement_of_applicability.go
View File

@@ -29,7 +29,7 @@ import (
)
type (
StateOfApplicability struct {
StatementOfApplicability struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
Name string `db:"name"`
@@ -40,39 +40,39 @@ type (
UpdatedAt time.Time `db:"updated_at"`
}
StatesOfApplicability []*StateOfApplicability
StatementsOfApplicability []*StatementOfApplicability
)
func (s StateOfApplicability) CursorKey(orderBy StateOfApplicabilityOrderField) page.CursorKey {
func (s StatementOfApplicability) CursorKey(orderBy StatementOfApplicabilityOrderField) page.CursorKey {
switch orderBy {
case StateOfApplicabilityOrderFieldCreatedAt:
case StatementOfApplicabilityOrderFieldCreatedAt:
return page.NewCursorKey(s.ID, s.CreatedAt)
case StateOfApplicabilityOrderFieldName:
case StatementOfApplicabilityOrderFieldName:
return page.NewCursorKey(s.ID, s.Name)
}
panic(fmt.Sprintf("unsupported order by: %s", orderBy))
}
func (s *StateOfApplicability) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) {
q := `SELECT organization_id FROM states_of_applicability WHERE id = $1 LIMIT 1;`
func (s *StatementOfApplicability) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) {
q := `SELECT organization_id FROM statements_of_applicability WHERE id = $1 LIMIT 1;`
var organizationID gid.GID
if err := conn.QueryRow(ctx, q, s.ID).Scan(&organizationID); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrResourceNotFound
}
return nil, fmt.Errorf("cannot query state of applicability authorization attributes: %w", err)
return nil, fmt.Errorf("cannot query statement of applicability authorization attributes: %w", err)
}
return map[string]string{"organization_id": organizationID.String()}, nil
}
func (s *StateOfApplicability) LoadByID(
func (s *StatementOfApplicability) LoadByID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
stateOfApplicabilityID gid.GID,
statementOfApplicabilityID gid.GID,
) error {
q := `
SELECT
@@ -85,43 +85,43 @@ SELECT
created_at,
updated_at
FROM
states_of_applicability
statements_of_applicability
WHERE
%s
AND id = @state_of_applicability_id
AND id = @statement_of_applicability_id
LIMIT 1;
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"state_of_applicability_id": stateOfApplicabilityID}
args := pgx.StrictNamedArgs{"statement_of_applicability_id": statementOfApplicabilityID}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query states_of_applicability: %w", err)
return fmt.Errorf("cannot query statements_of_applicability: %w", err)
}
stateOfApplicability, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[StateOfApplicability])
statementOfApplicability, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[StatementOfApplicability])
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return ErrResourceNotFound
}
return fmt.Errorf("cannot collect state_of_applicability: %w", err)
return fmt.Errorf("cannot collect statement_of_applicability: %w", err)
}
*s = stateOfApplicability
*s = statementOfApplicability
return nil
}
func (s *StatesOfApplicability) LoadByOrganizationID(
func (s *StatementsOfApplicability) LoadByOrganizationID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
organizationID gid.GID,
cursor *page.Cursor[StateOfApplicabilityOrderField],
filter *StateOfApplicabilityFilter,
cursor *page.Cursor[StatementOfApplicabilityOrderField],
filter *StatementOfApplicabilityFilter,
) error {
q := `
SELECT
@@ -134,7 +134,7 @@ SELECT
created_at,
updated_at
FROM
states_of_applicability
statements_of_applicability
WHERE
%s
AND organization_id = @organization_id
@@ -150,30 +150,30 @@ WHERE
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query states_of_applicability: %w", err)
return fmt.Errorf("cannot query statements_of_applicability: %w", err)
}
statesOfApplicability, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[StateOfApplicability])
statementsOfApplicability, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[StatementOfApplicability])
if err != nil {
return fmt.Errorf("cannot collect states_of_applicability: %w", err)
return fmt.Errorf("cannot collect statements_of_applicability: %w", err)
}
*s = statesOfApplicability
*s = statementsOfApplicability
return nil
}
func (s *StatesOfApplicability) CountByOrganizationID(
func (s *StatementsOfApplicability) CountByOrganizationID(
ctx context.Context,
conn pg.Querier,
scope Scoper,
organizationID gid.GID,
filter *StateOfApplicabilityFilter,
filter *StatementOfApplicabilityFilter,
) (int, error) {
q := `
SELECT
COUNT(*)
FROM
states_of_applicability
statements_of_applicability
WHERE
%s
AND organization_id = @organization_id
@@ -190,20 +190,20 @@ WHERE
row := conn.QueryRow(ctx, q, args)
var count int
if err := row.Scan(&count); err != nil {
return 0, fmt.Errorf("cannot count states_of_applicability: %w", err)
return 0, fmt.Errorf("cannot count statements_of_applicability: %w", err)
}
return count, nil
}
func (s *StateOfApplicability) Insert(
func (s *StatementOfApplicability) Insert(
ctx context.Context,
conn pg.Tx,
scope Scoper,
) error {
q := `
INSERT INTO
states_of_applicability (
statements_of_applicability (
tenant_id,
id,
organization_id,
@@ -216,7 +216,7 @@ INSERT INTO
)
VALUES (
@tenant_id,
@state_of_applicability_id,
@statement_of_applicability_id,
@organization_id,
@name,
@source_id,
@@ -228,15 +228,15 @@ VALUES (
`
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"state_of_applicability_id": s.ID,
"organization_id": s.OrganizationID,
"name": s.Name,
"source_id": s.SourceID,
"snapshot_id": s.SnapshotID,
"owner_profile_id": s.OwnerID,
"created_at": s.CreatedAt,
"updated_at": s.UpdatedAt,
"tenant_id": scope.GetTenantID(),
"statement_of_applicability_id": s.ID,
"organization_id": s.OrganizationID,
"name": s.Name,
"source_id": s.SourceID,
"snapshot_id": s.SnapshotID,
"owner_profile_id": s.OwnerID,
"created_at": s.CreatedAt,
"updated_at": s.UpdatedAt,
}
_, err := conn.Exec(ctx, q, args)
@@ -247,35 +247,35 @@ VALUES (
return ErrResourceAlreadyExists
}
}
return fmt.Errorf("cannot insert state_of_applicability: %w", err)
return fmt.Errorf("cannot insert statement_of_applicability: %w", err)
}
return nil
}
func (s *StateOfApplicability) Update(
func (s *StatementOfApplicability) Update(
ctx context.Context,
conn pg.Tx,
scope Scoper,
) error {
q := `
UPDATE states_of_applicability
UPDATE statements_of_applicability
SET
name = @name,
owner_profile_id = @owner_profile_id,
updated_at = @updated_at
WHERE
%s
AND id = @state_of_applicability_id
AND id = @statement_of_applicability_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"state_of_applicability_id": s.ID,
"name": s.Name,
"owner_profile_id": s.OwnerID,
"updated_at": s.UpdatedAt,
"statement_of_applicability_id": s.ID,
"name": s.Name,
"owner_profile_id": s.OwnerID,
"updated_at": s.UpdatedAt,
}
maps.Copy(args, scope.SQLArguments())
@@ -287,7 +287,7 @@ WHERE
return ErrResourceAlreadyExists
}
}
return fmt.Errorf("cannot update state_of_applicability: %w", err)
return fmt.Errorf("cannot update statement_of_applicability: %w", err)
}
if result.RowsAffected() == 0 {
@@ -297,27 +297,27 @@ WHERE
return nil
}
func (s *StateOfApplicability) Delete(
func (s *StatementOfApplicability) Delete(
ctx context.Context,
conn pg.Tx,
scope Scoper,
) error {
q := `
DELETE FROM states_of_applicability
DELETE FROM statements_of_applicability
WHERE
%s
AND id = @state_of_applicability_id
AND id = @statement_of_applicability_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"state_of_applicability_id": s.ID,
"statement_of_applicability_id": s.ID,
}
maps.Copy(args, scope.SQLArguments())
result, err := conn.Exec(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot delete state_of_applicability: %w", err)
return fmt.Errorf("cannot delete statement_of_applicability: %w", err)
}
if result.RowsAffected() == 0 {
@@ -327,19 +327,19 @@ WHERE
return nil
}
func (soas StatesOfApplicability) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error {
if err := soas.insertStateOfApplicabilitySnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil {
return fmt.Errorf("cannot insert state_of_applicability snapshots: %w", err)
func (soas StatementsOfApplicability) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error {
if err := soas.insertStatementOfApplicabilitySnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil {
return fmt.Errorf("cannot insert statement_of_applicability snapshots: %w", err)
}
if err := soas.insertStateOfApplicabilityControlSnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil {
return fmt.Errorf("cannot insert state_of_applicability_control snapshots: %w", err)
if err := soas.insertStatementOfApplicabilityControlSnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil {
return fmt.Errorf("cannot insert statement_of_applicability_control snapshots: %w", err)
}
return nil
}
func (soas StatesOfApplicability) insertStateOfApplicabilitySnapshots(
func (soas StatementsOfApplicability) insertStatementOfApplicabilitySnapshots(
ctx context.Context,
conn pg.Querier,
scope Scoper,
@@ -347,7 +347,7 @@ func (soas StatesOfApplicability) insertStateOfApplicabilitySnapshots(
snapshotID gid.GID,
) error {
query := `
INSERT INTO states_of_applicability (
INSERT INTO statements_of_applicability (
id,
tenant_id,
organization_id,
@@ -359,7 +359,7 @@ INSERT INTO states_of_applicability (
updated_at
)
SELECT
generate_gid(decode_base64_unpadded(@tenant_id), @state_of_applicability_entity_type),
generate_gid(decode_base64_unpadded(@tenant_id), @statement_of_applicability_entity_type),
@tenant_id,
soa.organization_id,
soa.name,
@@ -368,7 +368,7 @@ SELECT
soa.owner_profile_id,
soa.created_at,
soa.updated_at
FROM states_of_applicability soa
FROM statements_of_applicability soa
WHERE
%s
AND soa.organization_id = @organization_id
@@ -378,22 +378,22 @@ WHERE
query = fmt.Sprintf(query, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"snapshot_id": snapshotID,
"organization_id": organizationID,
"state_of_applicability_entity_type": StateOfApplicabilityEntityType,
"tenant_id": scope.GetTenantID(),
"snapshot_id": snapshotID,
"organization_id": organizationID,
"statement_of_applicability_entity_type": StatementOfApplicabilityEntityType,
}
maps.Copy(args, scope.SQLArguments())
_, err := conn.Exec(ctx, query, args)
if err != nil {
return fmt.Errorf("cannot insert state_of_applicability snapshots: %w", err)
return fmt.Errorf("cannot insert statement_of_applicability snapshots: %w", err)
}
return nil
}
func (soas StatesOfApplicability) insertStateOfApplicabilityControlSnapshots(
func (soas StatementsOfApplicability) insertStatementOfApplicabilityControlSnapshots(
ctx context.Context,
conn pg.Querier,
scope Scoper,
@@ -403,7 +403,7 @@ func (soas StatesOfApplicability) insertStateOfApplicabilityControlSnapshots(
query := `
WITH source_soa AS (
SELECT id, organization_id
FROM states_of_applicability
FROM statements_of_applicability
WHERE
%s
AND organization_id = @organization_id
@@ -411,12 +411,12 @@ WITH source_soa AS (
),
snapshot_soa AS (
SELECT id, source_id
FROM states_of_applicability
FROM statements_of_applicability
WHERE snapshot_id = @snapshot_id
)
INSERT INTO applicability_statements (
id,
state_of_applicability_id,
statement_of_applicability_id,
control_id,
organization_id,
tenant_id,
@@ -439,7 +439,7 @@ SELECT
soac.updated_at
FROM applicability_statements soac
INNER JOIN source_soa
ON soac.state_of_applicability_id = source_soa.id
ON soac.statement_of_applicability_id = source_soa.id
INNER JOIN snapshot_soa
ON snapshot_soa.source_id = source_soa.id
WHERE soac.snapshot_id IS NULL
@@ -457,7 +457,7 @@ WHERE soac.snapshot_id IS NULL
_, err := conn.Exec(ctx, query, args)
if err != nil {
return fmt.Errorf("cannot insert state_of_applicability_control snapshots: %w", err)
return fmt.Errorf("cannot insert statement_of_applicability_control snapshots: %w", err)
}
return nil

10
pkg/coredata/state_of_applicability_filter.go → pkg/coredata/statement_of_applicability_filter.go
View File

@@ -20,18 +20,18 @@ import (
)
type (
StateOfApplicabilityFilter struct {
StatementOfApplicabilityFilter struct {
snapshotID **gid.GID
}
)
func NewStateOfApplicabilityFilter(snapshotID **gid.GID) *StateOfApplicabilityFilter {
return &StateOfApplicabilityFilter{
func NewStatementOfApplicabilityFilter(snapshotID **gid.GID) *StatementOfApplicabilityFilter {
return &StatementOfApplicabilityFilter{
snapshotID: snapshotID,
}
}
func (f *StateOfApplicabilityFilter) SQLArguments() pgx.StrictNamedArgs {
func (f *StatementOfApplicabilityFilter) SQLArguments() pgx.StrictNamedArgs {
args := pgx.StrictNamedArgs{}
if f.snapshotID == nil {
@@ -48,7 +48,7 @@ func (f *StateOfApplicabilityFilter) SQLArguments() pgx.StrictNamedArgs {
return args
}
func (f *StateOfApplicabilityFilter) SQLFragment() string {
func (f *StatementOfApplicabilityFilter) SQLFragment() string {
return `
CASE
WHEN @has_snapshot_filter::boolean = false THEN TRUE

26
pkg/coredata/state_of_applicability_order_field.go → pkg/coredata/statement_of_applicability_order_field.go
View File

@@ -19,44 +19,44 @@ import (
)
type (
StateOfApplicabilityOrderField string
StatementOfApplicabilityOrderField string
)
const (
StateOfApplicabilityOrderFieldName StateOfApplicabilityOrderField = "NAME"
StateOfApplicabilityOrderFieldCreatedAt StateOfApplicabilityOrderField = "CREATED_AT"
StatementOfApplicabilityOrderFieldName StatementOfApplicabilityOrderField = "NAME"
StatementOfApplicabilityOrderFieldCreatedAt StatementOfApplicabilityOrderField = "CREATED_AT"
)
func (s StateOfApplicabilityOrderField) Column() string {
func (s StatementOfApplicabilityOrderField) Column() string {
switch s {
case StateOfApplicabilityOrderFieldName:
case StatementOfApplicabilityOrderFieldName:
return "name"
case StateOfApplicabilityOrderFieldCreatedAt:
case StatementOfApplicabilityOrderFieldCreatedAt:
return "created_at"
}
panic(fmt.Sprintf("unsupported order by: %s", s))
}
func (s StateOfApplicabilityOrderField) String() string {
func (s StatementOfApplicabilityOrderField) String() string {
return string(s)
}
func (s StateOfApplicabilityOrderField) IsValid() bool {
func (s StatementOfApplicabilityOrderField) IsValid() bool {
switch s {
case StateOfApplicabilityOrderFieldName, StateOfApplicabilityOrderFieldCreatedAt:
case StatementOfApplicabilityOrderFieldName, StatementOfApplicabilityOrderFieldCreatedAt:
return true
}
return false
}
func (s StateOfApplicabilityOrderField) MarshalText() ([]byte, error) {
func (s StatementOfApplicabilityOrderField) MarshalText() ([]byte, error) {
return []byte(s.String()), nil
}
func (s *StateOfApplicabilityOrderField) UnmarshalText(text []byte) error {
*s = StateOfApplicabilityOrderField(text)
func (s *StatementOfApplicabilityOrderField) UnmarshalText(text []byte) error {
*s = StatementOfApplicabilityOrderField(text)
if !s.IsValid() {
return fmt.Errorf("%s is not a valid StateOfApplicabilityOrderField", string(text))
return fmt.Errorf("%s is not a valid StatementOfApplicabilityOrderField", string(text))
}
return nil
}