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

Fix control order in SOA

Browse Source 
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
2026-02-16 10:51:03 +01:00
parent 0f40c7e27e
commit d0af53e1f4
13 changed files with 1259 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
pkg/coredata/applicability_statement.go
View File

@@ -39,6 +39,9 @@ type (
Justification *string `db:"justification"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
// Ordering only.
SectionTitle string `db:"section_title"`
}
ApplicabilityStatements []*ApplicabilityStatement
@@ -48,6 +51,8 @@ func (s ApplicabilityStatement) CursorKey(orderBy ApplicabilityStatementOrderFie
switch orderBy {
case ApplicabilityStatementOrderFieldCreatedAt:
return page.NewCursorKey(s.ID, s.CreatedAt)
case ApplicabilityStatementOrderFieldControlSectionTitle:
return page.NewCursorKey(s.ID, s.SectionTitle)
}
panic(fmt.Sprintf("unsupported order by: %s", orderBy))
@@ -74,6 +79,29 @@ func (sac *ApplicabilityStatement) LoadByID(
id gid.GID,
) error {
q := `
WITH stmt AS (
SELECT
a.id,
a.state_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
a.applicability,
a.justification,
a.created_at,
a.updated_at,
a.tenant_id,
f.name || ' - ' || c.section_title AS section_title
FROM
applicability_statements a
INNER JOIN
controls c ON c.id = a.control_id
INNER JOIN
frameworks f ON f.id = c.framework_id
WHERE
a.%s
AND a.id = @id
)
SELECT
id,
state_of_applicability_id,
@@ -83,15 +111,15 @@ SELECT
applicability,
justification,
created_at,
updated_at
updated_at,
section_title
FROM
applicability_statements
stmt
WHERE
%s
AND id = @id
LIMIT 1;
`
q = fmt.Sprintf(q, scope.SQLFragment())
q = fmt.Sprintf(q, scope.SQLFragment(), scope.SQLFragment())
args := pgx.StrictNamedArgs{"id": id}
maps.Copy(args, scope.SQLArguments())
@@ -139,11 +167,16 @@ SELECT
soac.applicability,
soac.justification,
soac.created_at,
soac.updated_at
soac.updated_at,
f.name || ' - ' || c.section_title AS section_title
FROM
applicability_statements soac
INNER JOIN
current_soa ON soac.state_of_applicability_id = current_soa.id
INNER JOIN
controls c ON c.id = soac.control_id
INNER JOIN
frameworks f ON f.id = c.framework_id
WHERE
soac.control_id = @control_id
LIMIT 1;
@@ -373,6 +406,29 @@ func (sacs *ApplicabilityStatements) LoadByStateOfApplicabilityID(
cursor *page.Cursor[ApplicabilityStatementOrderField],
) error {
q := `
WITH stmt AS (
SELECT
a.id,
a.state_of_applicability_id,
a.control_id,
a.organization_id,
a.snapshot_id,
a.applicability,
a.justification,
a.created_at,
a.updated_at,
a.tenant_id,
f.name || ' - ' || c.section_title AS section_title
FROM
applicability_statements a
INNER JOIN
controls c ON c.id = a.control_id
INNER JOIN
frameworks f ON f.id = c.framework_id
WHERE
a.%[1]s
AND a.state_of_applicability_id = @state_of_applicability_id
)
SELECT
id,
state_of_applicability_id,
@@ -382,13 +438,12 @@ SELECT
applicability,
justification,
created_at,
updated_at
updated_at,
section_title
FROM
applicability_statements
stmt
WHERE
%[1]s
AND state_of_applicability_id = @state_of_applicability_id
AND %[2]s
%[2]s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
@@ -459,11 +514,16 @@ WITH soac_ctrl AS (
soac.justification,
soac.created_at,
soac.updated_at,
soac.tenant_id
soac.tenant_id,
f.name || ' - ' || c.section_title AS section_title
FROM
applicability_statements soac
INNER JOIN
states_of_applicability soa ON soac.state_of_applicability_id = soa.id
INNER JOIN
controls c ON c.id = soac.control_id
INNER JOIN
frameworks f ON f.id = c.framework_id
WHERE
soac.%[1]s
AND soac.control_id = @control_id
@@ -478,7 +538,8 @@ SELECT
applicability,
justification,
created_at,
updated_at
updated_at,
section_title
FROM
soac_ctrl
WHERE

8
pkg/coredata/applicability_statement_order_field.go
View File

@@ -21,13 +21,16 @@ import (
type ApplicabilityStatementOrderField string
const (
ApplicabilityStatementOrderFieldCreatedAt ApplicabilityStatementOrderField = "CREATED_AT"
ApplicabilityStatementOrderFieldCreatedAt ApplicabilityStatementOrderField = "CREATED_AT"
ApplicabilityStatementOrderFieldControlSectionTitle ApplicabilityStatementOrderField = "CONTROL_SECTION_TITLE"
)
func (p ApplicabilityStatementOrderField) Column() string {
switch p {
case ApplicabilityStatementOrderFieldCreatedAt:
return "created_at"
case ApplicabilityStatementOrderFieldControlSectionTitle:
return "section_title_sort_key(section_title)"
}
panic("unknown ApplicabilityStatementOrderField")
@@ -44,7 +47,8 @@ func (p ApplicabilityStatementOrderField) MarshalText() ([]byte, error) {
func (p *ApplicabilityStatementOrderField) UnmarshalText(text []byte) error {
val := string(text)
switch val {
case string(ApplicabilityStatementOrderFieldCreatedAt):
case string(ApplicabilityStatementOrderFieldCreatedAt),
string(ApplicabilityStatementOrderFieldControlSectionTitle):
*p = ApplicabilityStatementOrderField(val)
return nil
}

2
pkg/probo/state_of_applicability_service.go
View File

@@ -457,7 +457,7 @@ func (s StateOfApplicabilityService) ExportPDF(
nil,
page.Head,
page.OrderBy[coredata.ApplicabilityStatementOrderField]{
Field: coredata.ApplicabilityStatementOrderFieldCreatedAt,
Field: coredata.ApplicabilityStatementOrderFieldControlSectionTitle,
Direction: page.OrderDirectionAsc,
},
)

4
pkg/server/api/console/v1/schema.graphql
View File

@@ -615,6 +615,10 @@ enum ApplicabilityStatementOrderField
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.ApplicabilityStatementOrderFieldCreatedAt"
)
CONTROL_SECTION_TITLE
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.ApplicabilityStatementOrderFieldControlSectionTitle"
)
}
enum CountryCode

1486
pkg/server/api/console/v1/schema/schema.go
View File

File diff suppressed because it is too large Load Diff

34
pkg/server/api/console/v1/types/types.go
View File

@@ -1517,7 +1517,7 @@ type Organization struct {
TrustCenterFiles *TrustCenterFileConnection `json:"trustCenterFiles"`
TrustCenter *TrustCenter `json:"trustCenter,omitempty"`
CustomDomain *CustomDomain `json:"customDomain,omitempty"`
WebhookSubscriptions *WebhookSubscriptionConnection `json:"webhookSubscriptions"`
WebhookSubscriptions *WebhookSubscriptionConnection `json:"webhookSubscriptions"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
Permission bool `json:"permission"`
@@ -2623,6 +2623,22 @@ type Viewer struct {
SignableDocument *SignableDocument `json:"signableDocument,omitempty"`
}
type WebhookEvent struct {
ID gid.GID `json:"id"`
WebhookSubscriptionID gid.GID `json:"webhookSubscriptionId"`
Status coredata.WebhookEventStatus `json:"status"`
Response *string `json:"response,omitempty"`
CreatedAt time.Time `json:"createdAt"`
}
func (WebhookEvent) IsNode() {}
func (this WebhookEvent) GetID() gid.GID { return this.ID }
type WebhookEventEdge struct {
Cursor page.CursorKey `json:"cursor"`
Node *WebhookEvent `json:"node"`
}
type WebhookSubscription struct {
ID gid.GID `json:"id"`
Organization *Organization `json:"organization,omitempty"`
@@ -2642,19 +2658,3 @@ type WebhookSubscriptionEdge struct {
Cursor page.CursorKey `json:"cursor"`
Node *WebhookSubscription `json:"node"`
}
type WebhookEvent struct {
ID gid.GID `json:"id"`
WebhookSubscriptionID gid.GID `json:"webhookSubscriptionId"`
Status coredata.WebhookEventStatus `json:"status"`
Response *string `json:"response,omitempty"`
CreatedAt time.Time `json:"createdAt"`
}
func (WebhookEvent) IsNode() {}
func (this WebhookEvent) GetID() gid.GID { return this.ID }
type WebhookEventEdge struct {
Cursor page.CursorKey `json:"cursor"`
Node *WebhookEvent `json:"node"`
}