From c6468088283ac184116630302536c327dbc0b238 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Thu, 22 May 2025 16:16:06 -0700 Subject: [PATCH] Add risk sort keys Signed-off-by: Bryan Frimin --- pkg/coredata/risk.go | 10 ++++++ pkg/coredata/risk_order_field.go | 8 ++++- pkg/server/api/console/v1/schema.graphql | 22 +++++++++++++ pkg/server/api/console/v1/schema/schema.go | 38 ++++++++++++++++++++-- 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/pkg/coredata/risk.go b/pkg/coredata/risk.go index c8e75b18a..a585117fd 100644 --- a/pkg/coredata/risk.go +++ b/pkg/coredata/risk.go @@ -53,6 +53,16 @@ func (r *Risk) CursorKey(orderBy RiskOrderField) page.CursorKey { switch orderBy { case RiskOrderFieldCreatedAt: return page.CursorKey{ID: r.ID, Value: r.CreatedAt} + case RiskOrderFieldName: + return page.CursorKey{ID: r.ID, Value: r.Name} + case RiskOrderFieldCategory: + return page.CursorKey{ID: r.ID, Value: r.Category} + case RiskOrderFieldTreatment: + return page.CursorKey{ID: r.ID, Value: r.Treatment} + case RiskOrderFieldInitialRiskScore: + return page.CursorKey{ID: r.ID, Value: r.InherentRiskScore} + case RiskOrderFieldResidualRiskScore: + return page.CursorKey{ID: r.ID, Value: r.ResidualRiskScore} } panic(fmt.Sprintf("unsupported order by: %s", orderBy)) diff --git a/pkg/coredata/risk_order_field.go b/pkg/coredata/risk_order_field.go index 6da4ce1eb..c291c5a87 100644 --- a/pkg/coredata/risk_order_field.go +++ b/pkg/coredata/risk_order_field.go @@ -19,7 +19,13 @@ type ( ) const ( - RiskOrderFieldCreatedAt RiskOrderField = "CREATED_AT" + RiskOrderFieldCreatedAt RiskOrderField = "CREATED_AT" + RiskOrderFieldUpdatedAt RiskOrderField = "UPDATED_AT" + RiskOrderFieldName RiskOrderField = "NAME" + RiskOrderFieldCategory RiskOrderField = "CATEGORY" + RiskOrderFieldTreatment RiskOrderField = "TREATMENT" + RiskOrderFieldInitialRiskScore RiskOrderField = "INITIAL_RISK_SCORE" + RiskOrderFieldResidualRiskScore RiskOrderField = "RESIDUAL_RISK_SCORE" ) func (p RiskOrderField) Column() string { diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql index 7036e60d4..7199617ce 100644 --- a/pkg/server/api/console/v1/schema.graphql +++ b/pkg/server/api/console/v1/schema.graphql @@ -202,6 +202,28 @@ enum RiskOrderField @goEnum( value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldCreatedAt" ) + UPDATED_AT + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldUpdatedAt" + ) + NAME + @goEnum(value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldName") + CATEGORY + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldCategory" + ) + TREATMENT + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldTreatment" + ) + INITIAL_RISK_SCORE + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldInitialRiskScore" + ) + RESIDUAL_RISK_SCORE + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldResidualRiskScore" + ) } enum EvidenceOrderField diff --git a/pkg/server/api/console/v1/schema/schema.go b/pkg/server/api/console/v1/schema/schema.go index fcd582205..489fb7d96 100644 --- a/pkg/server/api/console/v1/schema/schema.go +++ b/pkg/server/api/console/v1/schema/schema.go @@ -4173,6 +4173,28 @@ enum RiskOrderField @goEnum( value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldCreatedAt" ) + UPDATED_AT + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldUpdatedAt" + ) + NAME + @goEnum(value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldName") + CATEGORY + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldCategory" + ) + TREATMENT + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldTreatment" + ) + INITIAL_RISK_SCORE + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldInitialRiskScore" + ) + RESIDUAL_RISK_SCORE + @goEnum( + value: "github.com/getprobo/probo/pkg/coredata.RiskOrderFieldResidualRiskScore" + ) } enum EvidenceOrderField @@ -42806,10 +42828,22 @@ func (ec *executionContext) marshalNRiskOrderField2githubᚗcomᚋgetproboᚋpro var ( unmarshalNRiskOrderField2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐRiskOrderField = map[string]coredata.RiskOrderField{ - "CREATED_AT": coredata.RiskOrderFieldCreatedAt, + "CREATED_AT": coredata.RiskOrderFieldCreatedAt, + "UPDATED_AT": coredata.RiskOrderFieldUpdatedAt, + "NAME": coredata.RiskOrderFieldName, + "CATEGORY": coredata.RiskOrderFieldCategory, + "TREATMENT": coredata.RiskOrderFieldTreatment, + "INITIAL_RISK_SCORE": coredata.RiskOrderFieldInitialRiskScore, + "RESIDUAL_RISK_SCORE": coredata.RiskOrderFieldResidualRiskScore, } marshalNRiskOrderField2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐRiskOrderField = map[coredata.RiskOrderField]string{ - coredata.RiskOrderFieldCreatedAt: "CREATED_AT", + coredata.RiskOrderFieldCreatedAt: "CREATED_AT", + coredata.RiskOrderFieldUpdatedAt: "UPDATED_AT", + coredata.RiskOrderFieldName: "NAME", + coredata.RiskOrderFieldCategory: "CATEGORY", + coredata.RiskOrderFieldTreatment: "TREATMENT", + coredata.RiskOrderFieldInitialRiskScore: "INITIAL_RISK_SCORE", + coredata.RiskOrderFieldResidualRiskScore: "RESIDUAL_RISK_SCORE", } )