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

Fix typo on measure

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2025-04-30 14:07:14 -07:00
parent 29a40f5792
commit 1cac29f8ef
100 changed files with 7289 additions and 2664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/coredata/control.go
View File

@@ -116,11 +116,11 @@ WHERE %s
return nil
}
func (c *Controls) LoadByMesureID(
func (c *Controls) LoadByMeasureID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
mesureID gid.GID,
measureID gid.GID,
cursor *page.Cursor[ControlOrderField],
) error {
q := `
@@ -137,9 +137,9 @@ WITH ctrl AS (
FROM
controls c
INNER JOIN
controls_mesures cm ON c.id = cm.control_id
controls_measures cm ON c.id = cm.control_id
WHERE
cm.mesure_id = @mesure_id
cm.measure_id = @measure_id
)
SELECT
id,
@@ -157,7 +157,7 @@ WHERE %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.NamedArgs{"mesure_id": mesureID}
args := pgx.NamedArgs{"measure_id": measureID}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)
@@ -200,9 +200,9 @@ WITH ctrl AS (
LEFT JOIN
risks_policies rp ON cp.policy_id = rp.policy_id
LEFT JOIN
controls_mesures cm ON c.id = cm.control_id
controls_measures cm ON c.id = cm.control_id
LEFT JOIN
risks_mesures rm ON (rm.mesure_id = cm.mesure_id)
risks_measures rm ON (rm.measure_id = cm.measure_id)
WHERE
rp.risk_id = @risk_id OR rm.risk_id = @risk_id
)

56
pkg/coredata/control_mesure.go
View File

@@ -26,41 +26,41 @@ import (
)
type (
ControlMesure struct {
ControlMeasure struct {
ControlID gid.GID `db:"control_id"`
MesureID gid.GID `db:"mesure_id"`
MeasureID gid.GID `db:"measure_id"`
TenantID gid.TenantID `db:"tenant_id"`
CreatedAt time.Time `db:"created_at"`
}
ControlMesures []*ControlMesure
ControlMeasures []*ControlMeasure
)
func (cm ControlMesure) Upsert(
func (cm ControlMeasure) Upsert(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
INSERT INTO
controls_mesures (
controls_measures (
control_id,
mesure_id,
measure_id,
tenant_id,
created_at
)
VALUES (
@control_id,
@mesure_id,
@measure_id,
@tenant_id,
@created_at
)
ON CONFLICT (control_id, mesure_id) DO NOTHING;
ON CONFLICT (control_id, measure_id) DO NOTHING;
`
args := pgx.StrictNamedArgs{
"control_id": cm.ControlID,
"mesure_id": cm.MesureID,
"measure_id": cm.MeasureID,
"tenant_id": scope.GetTenantID(),
"created_at": cm.CreatedAt,
}
@@ -68,22 +68,22 @@ ON CONFLICT (control_id, mesure_id) DO NOTHING;
return err
}
func (cm ControlMesure) Insert(
func (cm ControlMeasure) Insert(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
INSERT INTO
controls_mesures (
controls_measures (
control_id,
mesure_id,
measure_id,
tenant_id,
created_at
)
VALUES (
@control_id,
@mesure_id,
@measure_id,
@tenant_id,
@created_at
);
@@ -91,7 +91,7 @@ VALUES (
args := pgx.StrictNamedArgs{
"control_id": cm.ControlID,
"mesure_id": cm.MesureID,
"measure_id": cm.MeasureID,
"tenant_id": scope.GetTenantID(),
"created_at": cm.CreatedAt,
}
@@ -99,7 +99,7 @@ VALUES (
return err
}
func (cm ControlMesure) Delete(
func (cm ControlMeasure) Delete(
ctx context.Context,
conn pg.Conn,
scope Scoper,
@@ -107,16 +107,16 @@ func (cm ControlMesure) Delete(
q := `
DELETE
FROM
controls_mesures
controls_measures
WHERE
%s
AND control_id = @control_id
AND mesure_id = @mesure_id;
AND measure_id = @measure_id;
`
args := pgx.StrictNamedArgs{
"control_id": cm.ControlID,
"mesure_id": cm.MesureID,
"measure_id": cm.MeasureID,
}
maps.Copy(args, scope.SQLArguments())
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -125,39 +125,39 @@ WHERE
return err
}
func (cms *ControlMesures) LoadByMesureID(
func (cms *ControlMeasures) LoadByMeasureID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
mesureID gid.GID,
measureID gid.GID,
) error {
q := `
SELECT
control_id,
mesure_id,
measure_id,
tenant_id,
created_at
FROM
controls_mesures
controls_measures
WHERE
%s
AND mesure_id = @mesure_id
AND measure_id = @measure_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"mesure_id": mesureID}
args := pgx.StrictNamedArgs{"measure_id": measureID}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query control_mesures: %w", err)
return fmt.Errorf("cannot query control_measures: %w", err)
}
controlMesures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[ControlMesure])
controlMeasures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[ControlMeasure])
if err != nil {
return fmt.Errorf("cannot collect control_mesures: %w", err)
return fmt.Errorf("cannot collect control_measures: %w", err)
}
*cms = controlMesures
*cms = controlMeasures
return nil
}

2
pkg/coredata/entity_type_reg.go
View File

@@ -17,7 +17,7 @@ package coredata
const (
OrganizationEntityType uint16 = iota
FrameworkEntityType
MesureEntityType
MeasureEntityType
TaskEntityType
EvidenceEntityType
ConnectorEntityType

114
pkg/coredata/mesure.go
View File

@@ -28,37 +28,37 @@ import (
)
type (
Mesure struct {
Measure struct {
ID gid.GID `db:"id"`
TenantID gid.TenantID `db:"tenant_id"`
OrganizationID gid.GID `db:"organization_id"`
Category string `db:"category"`
Name string `db:"name"`
Description string `db:"description"`
State MesureState `db:"state"`
State MeasureState `db:"state"`
ReferenceID string `db:"reference_id"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
}
Mesures []*Mesure
Measures []*Measure
)
func (m Mesure) CursorKey(orderBy MesureOrderField) page.CursorKey {
func (m Measure) CursorKey(orderBy MeasureOrderField) page.CursorKey {
switch orderBy {
case MesureOrderFieldCreatedAt:
case MeasureOrderFieldCreatedAt:
return page.NewCursorKey(m.ID, m.CreatedAt)
}
panic(fmt.Sprintf("unsupported order by: %s", orderBy))
}
func (m *Mesures) LoadByRiskID(
func (m *Measures) LoadByRiskID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
riskID gid.GID,
cursor *page.Cursor[MesureOrderField],
cursor *page.Cursor[MeasureOrderField],
) error {
q := `
WITH msrs AS (
@@ -74,9 +74,9 @@ WITH msrs AS (
m.created_at,
m.updated_at
FROM
mesures m
measures m
INNER JOIN
risks_mesures rm ON m.id = rm.mesure_id
risks_measures rm ON m.id = rm.measure_id
WHERE
rm.risk_id = @risk_id
)
@@ -104,25 +104,25 @@ WHERE %s
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query mesures: %w", err)
return fmt.Errorf("cannot query measures: %w", err)
}
mesures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Mesure])
measures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Measure])
if err != nil {
return fmt.Errorf("cannot collect mesures: %w", err)
return fmt.Errorf("cannot collect measures: %w", err)
}
*m = mesures
*m = measures
return nil
}
func (m *Mesures) LoadByControlID(
func (m *Measures) LoadByControlID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
controlID gid.GID,
cursor *page.Cursor[MesureOrderField],
cursor *page.Cursor[MeasureOrderField],
) error {
q := `
WITH mtgtns AS (
@@ -138,9 +138,9 @@ WITH mtgtns AS (
m.created_at,
m.updated_at
FROM
mesures m
measures m
INNER JOIN
controls_mesures cm ON m.id = cm.mesure_id
controls_measures cm ON m.id = cm.measure_id
WHERE
cm.control_id = @control_id
)
@@ -168,25 +168,25 @@ WHERE %s
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query mesures: %w", err)
return fmt.Errorf("cannot query measures: %w", err)
}
mesures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Mesure])
measures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Measure])
if err != nil {
return fmt.Errorf("cannot collect mesures: %w", err)
return fmt.Errorf("cannot collect measures: %w", err)
}
*m = mesures
*m = measures
return nil
}
func (m *Mesures) LoadByOrganizationID(
func (m *Measures) LoadByOrganizationID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
organizationID gid.GID,
cursor *page.Cursor[MesureOrderField],
cursor *page.Cursor[MeasureOrderField],
) error {
q := `
SELECT
@@ -201,7 +201,7 @@ SELECT
created_at,
updated_at
FROM
mesures
measures
WHERE
%s
AND organization_id = @organization_id
@@ -215,24 +215,24 @@ WHERE
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query mesures: %w", err)
return fmt.Errorf("cannot query measures: %w", err)
}
mesures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Mesure])
measures, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Measure])
if err != nil {
return fmt.Errorf("cannot collect mesures: %w", err)
return fmt.Errorf("cannot collect measures: %w", err)
}
*m = mesures
*m = measures
return nil
}
func (m *Mesure) LoadByID(
func (m *Measure) LoadByID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
mesureID gid.GID,
measureID gid.GID,
) error {
q := `
SELECT
@@ -247,41 +247,41 @@ SELECT
created_at,
updated_at
FROM
mesures
measures
WHERE
%s
AND id = @mesure_id
AND id = @measure_id
LIMIT 1;
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"mesure_id": mesureID}
args := pgx.StrictNamedArgs{"measure_id": measureID}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query mesures: %w", err)
return fmt.Errorf("cannot query measures: %w", err)
}
mesure, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[Mesure])
measure, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[Measure])
if err != nil {
return fmt.Errorf("cannot collect mesures: %w", err)
return fmt.Errorf("cannot collect measures: %w", err)
}
*m = mesure
*m = measure
return nil
}
func (m *Mesure) Upsert(
func (m *Measure) Upsert(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
INSERT INTO
mesures (
measures (
tenant_id,
id,
organization_id,
@@ -295,7 +295,7 @@ INSERT INTO
)
VALUES (
@tenant_id,
@mesure_id,
@measure_id,
@organization_id,
@category,
@name,
@@ -325,7 +325,7 @@ RETURNING
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"mesure_id": m.ID,
"measure_id": m.ID,
"organization_id": m.OrganizationID,
"category": m.Category,
"name": m.Name,
@@ -338,27 +338,27 @@ RETURNING
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query mesures: %w", err)
return fmt.Errorf("cannot query measures: %w", err)
}
mesure, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[Mesure])
measure, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[Measure])
if err != nil {
return fmt.Errorf("cannot collect mesures: %w", err)
return fmt.Errorf("cannot collect measures: %w", err)
}
*m = mesure
*m = measure
return nil
}
func (m Mesure) Insert(
func (m Measure) Insert(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
INSERT INTO
mesures (
measures (
tenant_id,
id,
organization_id,
@@ -372,7 +372,7 @@ INSERT INTO
)
VALUES (
@tenant_id,
@mesure_id,
@measure_id,
@organization_id,
@category,
@name,
@@ -386,7 +386,7 @@ VALUES (
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"mesure_id": m.ID,
"measure_id": m.ID,
"organization_id": m.OrganizationID,
"category": m.Category,
"name": m.Name,
@@ -400,13 +400,13 @@ VALUES (
return err
}
func (m *Mesure) Update(
func (m *Measure) Update(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
UPDATE mesures
UPDATE measures
SET
name = @name,
description = @description,
@@ -414,12 +414,12 @@ SET
state = @state,
updated_at = @updated_at
WHERE %s
AND id = @mesure_id
AND id = @measure_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.NamedArgs{
"mesure_id": m.ID,
"measure_id": m.ID,
"name": m.Name,
"description": m.Description,
"category": m.Category,
@@ -433,19 +433,19 @@ WHERE %s
return err
}
func (m *Mesure) Delete(
func (m *Measure) Delete(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
DELETE FROM mesures
DELETE FROM measures
WHERE %s
AND id = @mesure_id
AND id = @measure_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"mesure_id": m.ID}
args := pgx.StrictNamedArgs{"measure_id": m.ID}
maps.Copy(args, scope.SQLArguments())
_, err := conn.Exec(ctx, q, args)

14
pkg/coredata/mesure_order_field.go
View File

@@ -15,26 +15,26 @@
package coredata
type (
MesureOrderField string
MeasureOrderField string
)
const (
MesureOrderFieldCreatedAt MesureOrderField = "CREATED_AT"
MeasureOrderFieldCreatedAt MeasureOrderField = "CREATED_AT"
)
func (p MesureOrderField) Column() string {
func (p MeasureOrderField) Column() string {
return string(p)
}
func (p MesureOrderField) String() string {
func (p MeasureOrderField) String() string {
return string(p)
}
func (p MesureOrderField) MarshalText() ([]byte, error) {
func (p MeasureOrderField) MarshalText() ([]byte, error) {
return []byte(p.String()), nil
}
func (p *MesureOrderField) UnmarshalText(text []byte) error {
*p = MesureOrderField(text)
func (p *MeasureOrderField) UnmarshalText(text []byte) error {
*p = MeasureOrderField(text)
return nil
}

48
pkg/coredata/mesure_state.go
View File

@@ -20,65 +20,65 @@ import (
)
type (
MesureState uint8
MeasureState uint8
)
const (
MesureStateNotStarted MesureState = iota
MesureStateInProgress
MesureStateNotApplicable
MesureStateImplemented
MeasureStateNotStarted MeasureState = iota
MeasureStateInProgress
MeasureStateNotApplicable
MeasureStateImplemented
)
func (ms MesureState) MarshalText() ([]byte, error) {
func (ms MeasureState) MarshalText() ([]byte, error) {
return []byte(ms.String()), nil
}
func (ms *MesureState) UnmarshalText(data []byte) error {
func (ms *MeasureState) UnmarshalText(data []byte) error {
val := string(data)
switch val {
case MesureStateNotStarted.String():
*ms = MesureStateNotStarted
case MesureStateInProgress.String():
*ms = MesureStateInProgress
case MesureStateNotApplicable.String():
*ms = MesureStateNotApplicable
case MesureStateImplemented.String():
*ms = MesureStateImplemented
case MeasureStateNotStarted.String():
*ms = MeasureStateNotStarted
case MeasureStateInProgress.String():
*ms = MeasureStateInProgress
case MeasureStateNotApplicable.String():
*ms = MeasureStateNotApplicable
case MeasureStateImplemented.String():
*ms = MeasureStateImplemented
default:
return fmt.Errorf("invalid MesureState value: %q", val)
return fmt.Errorf("invalid MeasureState value: %q", val)
}
return nil
}
func (ms MesureState) String() string {
func (ms MeasureState) String() string {
var val string
switch ms {
case MesureStateNotStarted:
case MeasureStateNotStarted:
val = "NOT_STARTED"
case MesureStateInProgress:
case MeasureStateInProgress:
val = "IN_PROGRESS"
case MesureStateNotApplicable:
case MeasureStateNotApplicable:
val = "NOT_APPLICABLE"
case MesureStateImplemented:
case MeasureStateImplemented:
val = "IMPLEMENTED"
}
return val
}
func (ms *MesureState) Scan(value any) error {
func (ms *MeasureState) Scan(value any) error {
val, ok := value.(string)
if !ok {
return fmt.Errorf("invalid scan source for MesureState, expected string got %T", value)
return fmt.Errorf("invalid scan source for MeasureState, expected string got %T", value)
}
return ms.UnmarshalText([]byte(val))
}
func (ms MesureState) Value() (driver.Value, error) {
func (ms MeasureState) Value() (driver.Value, error) {
return ms.String(), nil
}

6
pkg/coredata/migrations/20250430T140000Z.sql Normal file
View File

@@ -0,0 +1,6 @@
ALTER TABLE mesures RENAME TO measures;
ALTER TABLE controls_mesures RENAME TO controls_measures;
ALTER TABLE risks_mesures RENAME TO risks_measures;
ALTER TABLE tasks RENAME COLUMN mesure_id TO measure_id;
ALTER TABLE controls_measures RENAME COLUMN mesure_id TO measure_id;
ALTER TABLE risks_measures RENAME COLUMN mesure_id TO measure_id;

10
pkg/coredata/risk.go
View File

@@ -64,11 +64,11 @@ func (r *Risk) ResidualSeverity() int {
return r.ResidualLikelihood * r.ResidualImpact
}
func (r *Risks) LoadByMesureID(
func (r *Risks) LoadByMeasureID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
mesureID gid.GID,
measureID gid.GID,
cursor *page.Cursor[RiskOrderField],
) error {
q := `
@@ -92,9 +92,9 @@ WITH rsks AS (
FROM
risks r
INNER JOIN
risks_mesures rm ON r.id = rm.risk_id
risks_measures rm ON r.id = rm.risk_id
WHERE
rm.mesure_id = @mesure_id
rm.measure_id = @measure_id
)
SELECT
id,
@@ -118,7 +118,7 @@ WHERE %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.NamedArgs{"mesure_id": mesureID}
args := pgx.NamedArgs{"measure_id": measureID}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)

26
pkg/coredata/risk_mesure.go
View File

@@ -26,32 +26,32 @@ import (
)
type (
RiskMesure struct {
RiskMeasure struct {
RiskID gid.GID `db:"risk_id"`
MesureID gid.GID `db:"mesure_id"`
MeasureID gid.GID `db:"measure_id"`
TenantID gid.TenantID `db:"tenant_id"`
CreatedAt time.Time `db:"created_at"`
}
RiskMesures []*RiskMesure
RiskMeasures []*RiskMeasure
)
func (rm RiskMesure) Insert(
func (rm RiskMeasure) Insert(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
INSERT INTO
risks_mesures (
risks_measures (
risk_id,
mesure_id,
measure_id,
tenant_id,
created_at
)
VALUES (
@risk_id,
@mesure_id,
@measure_id,
@tenant_id,
@created_at
);
@@ -59,7 +59,7 @@ VALUES (
args := pgx.StrictNamedArgs{
"risk_id": rm.RiskID,
"mesure_id": rm.MesureID,
"measure_id": rm.MeasureID,
"tenant_id": scope.GetTenantID(),
"created_at": rm.CreatedAt,
}
@@ -67,7 +67,7 @@ VALUES (
return err
}
func (rm RiskMesure) Delete(
func (rm RiskMeasure) Delete(
ctx context.Context,
conn pg.Conn,
scope Scoper,
@@ -75,18 +75,18 @@ func (rm RiskMesure) Delete(
q := `
DELETE
FROM
risks_mesures
risks_measures
WHERE
%s
AND risk_id = @risk_id
AND mesure_id = @mesure_id;
AND measure_id = @measure_id;
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{
"risk_id": rm.RiskID,
"mesure_id": rm.MesureID,
"risk_id": rm.RiskID,
"measure_id": rm.MeasureID,
}
maps.Copy(args, scope.SQLArguments())

34
pkg/coredata/task.go
View File

@@ -30,7 +30,7 @@ import (
type (
Task struct {
ID gid.GID `db:"id"`
MesureID gid.GID `db:"mesure_id"`
MeasureID gid.GID `db:"measure_id"`
Name string `db:"name"`
Description string `db:"description"`
State TaskState `db:"state"`
@@ -62,7 +62,7 @@ func (c *Task) LoadByID(
q := `
SELECT
id,
mesure_id,
measure_id,
name,
description,
state,
@@ -109,7 +109,7 @@ INSERT INTO
tasks (
tenant_id,
id,
mesure_id,
measure_id,
name,
description,
reference_id,
@@ -122,7 +122,7 @@ INSERT INTO
VALUES (
@tenant_id,
@task_id,
@mesure_id,
@measure_id,
@name,
@description,
@reference_id,
@@ -137,7 +137,7 @@ VALUES (
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"task_id": c.ID,
"mesure_id": c.MesureID,
"measure_id": c.MeasureID,
"name": c.Name,
"description": c.Description,
"reference_id": c.ReferenceID,
@@ -161,7 +161,7 @@ INSERT INTO
tasks (
tenant_id,
id,
mesure_id,
measure_id,
name,
description,
reference_id,
@@ -174,7 +174,7 @@ INSERT INTO
VALUES (
@tenant_id,
@task_id,
@mesure_id,
@measure_id,
@name,
@description,
@reference_id,
@@ -184,13 +184,13 @@ VALUES (
@created_at,
@updated_at
)
ON CONFLICT (mesure_id, reference_id) DO UPDATE SET
ON CONFLICT (measure_id, reference_id) DO UPDATE SET
name = @name,
description = @description,
updated_at = @updated_at
RETURNING
id,
mesure_id,
measure_id,
name,
description,
reference_id,
@@ -204,7 +204,7 @@ RETURNING
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"task_id": c.ID,
"mesure_id": c.MesureID,
"measure_id": c.MeasureID,
"name": c.Name,
"description": c.Description,
"reference_id": c.ReferenceID,
@@ -229,17 +229,17 @@ RETURNING
return nil
}
func (c *Tasks) LoadByMesureID(
func (c *Tasks) LoadByMeasureID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
mesureID gid.GID,
measureID gid.GID,
cursor *page.Cursor[TaskOrderField],
) error {
q := `
SELECT
id,
mesure_id,
measure_id,
name,
description,
state,
@@ -252,12 +252,12 @@ FROM
tasks
WHERE
%s
AND mesure_id = @mesure_id
AND measure_id = @measure_id
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.StrictNamedArgs{"mesure_id": mesureID}
args := pgx.StrictNamedArgs{"measure_id": measureID}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, cursor.SQLArguments())
@@ -323,7 +323,7 @@ WHERE %s
AND id = @task_id
RETURNING
id,
mesure_id,
measure_id,
name,
description,
reference_id,
@@ -371,7 +371,7 @@ WHERE %s
AND id = @task_id
RETURNING
id,
mesure_id,
measure_id,
name,
description,
reference_id,

26
pkg/probo/control_service.go
View File

@@ -76,9 +76,9 @@ func (s ControlService) ListForPolicyID(
return page.NewPage(controls, cursor), nil
}
func (s ControlService) ListForMesureID(
func (s ControlService) ListForMeasureID(
ctx context.Context,
mesureID gid.GID,
measureID gid.GID,
cursor *page.Cursor[coredata.ControlOrderField],
) (*page.Page[*coredata.Control, coredata.ControlOrderField], error) {
var controls coredata.Controls
@@ -86,7 +86,7 @@ func (s ControlService) ListForMesureID(
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return controls.LoadByMesureID(ctx, conn, s.svc.scope, mesureID, cursor)
return controls.LoadByMeasureID(ctx, conn, s.svc.scope, measureID, cursor)
},
)
@@ -97,14 +97,14 @@ func (s ControlService) ListForMesureID(
return page.NewPage(controls, cursor), nil
}
func (s ControlService) CreateMesureMapping(
func (s ControlService) CreateMeasureMapping(
ctx context.Context,
controlID gid.GID,
mesureID gid.GID,
measureID gid.GID,
) error {
controlMesure := &coredata.ControlMesure{
controlMeasure := &coredata.ControlMeasure{
ControlID: controlID,
MesureID: mesureID,
MeasureID: measureID,
TenantID: s.svc.scope.GetTenantID(),
CreatedAt: time.Now(),
}
@@ -112,19 +112,19 @@ func (s ControlService) CreateMesureMapping(
return s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return controlMesure.Insert(ctx, conn, s.svc.scope)
return controlMeasure.Insert(ctx, conn, s.svc.scope)
},
)
}
func (s ControlService) DeleteMesureMapping(
func (s ControlService) DeleteMeasureMapping(
ctx context.Context,
controlID gid.GID,
mesureID gid.GID,
measureID gid.GID,
) error {
controlMesure := &coredata.ControlMesure{
controlMeasure := &coredata.ControlMeasure{
ControlID: controlID,
MesureID: mesureID,
MeasureID: measureID,
TenantID: s.svc.scope.GetTenantID(),
CreatedAt: time.Now(),
}
@@ -132,7 +132,7 @@ func (s ControlService) DeleteMesureMapping(
return s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return controlMesure.Delete(ctx, conn, s.svc.scope)
return controlMeasure.Delete(ctx, conn, s.svc.scope)
},
)
}

192
pkg/probo/mesure_service.go
View File

@@ -27,27 +27,27 @@ import (
)
type (
MesureService struct {
MeasureService struct {
svc *TenantService
}
CreateMesureRequest struct {
CreateMeasureRequest struct {
OrganizationID gid.GID
Name string
Description string
Category string
}
UpdateMesureRequest struct {
UpdateMeasureRequest struct {
ID gid.GID
Name *string
Description *string
Category *string
State *coredata.MesureState
State *coredata.MeasureState
}
ImportMesureRequest struct {
Mesures []struct {
ImportMeasureRequest struct {
Measures []struct {
Name string `json:"name"`
Category string `json:"category"`
ReferenceID string `json:"reference-id"`
@@ -65,21 +65,21 @@ type (
Name string `json:"name"`
} `json:"requested-evidences"`
} `json:"tasks"`
} `json:"mesures"`
} `json:"measures"`
}
)
func (s MesureService) ListForRiskID(
func (s MeasureService) ListForRiskID(
ctx context.Context,
riskID gid.GID,
cursor *page.Cursor[coredata.MesureOrderField],
) (*page.Page[*coredata.Mesure, coredata.MesureOrderField], error) {
var mesures coredata.Mesures
cursor *page.Cursor[coredata.MeasureOrderField],
) (*page.Page[*coredata.Measure, coredata.MeasureOrderField], error) {
var measures coredata.Measures
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return mesures.LoadByRiskID(ctx, conn, s.svc.scope, riskID, cursor)
return measures.LoadByRiskID(ctx, conn, s.svc.scope, riskID, cursor)
},
)
@@ -87,20 +87,20 @@ func (s MesureService) ListForRiskID(
return nil, err
}
return page.NewPage(mesures, cursor), nil
return page.NewPage(measures, cursor), nil
}
func (s MesureService) ListForControlID(
func (s MeasureService) ListForControlID(
ctx context.Context,
controlID gid.GID,
cursor *page.Cursor[coredata.MesureOrderField],
) (*page.Page[*coredata.Mesure, coredata.MesureOrderField], error) {
var mesures coredata.Mesures
cursor *page.Cursor[coredata.MeasureOrderField],
) (*page.Page[*coredata.Measure, coredata.MeasureOrderField], error) {
var measures coredata.Measures
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return mesures.LoadByControlID(ctx, conn, s.svc.scope, controlID, cursor)
return measures.LoadByControlID(ctx, conn, s.svc.scope, controlID, cursor)
},
)
@@ -108,19 +108,19 @@ func (s MesureService) ListForControlID(
return nil, err
}
return page.NewPage(mesures, cursor), nil
return page.NewPage(measures, cursor), nil
}
func (s MesureService) Get(
func (s MeasureService) Get(
ctx context.Context,
mesureID gid.GID,
) (*coredata.Mesure, error) {
mesure := &coredata.Mesure{}
measureID gid.GID,
) (*coredata.Measure, error) {
measure := &coredata.Measure{}
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return mesure.LoadByID(ctx, conn, s.svc.scope, mesureID)
return measure.LoadByID(ctx, conn, s.svc.scope, measureID)
},
)
@@ -128,46 +128,46 @@ func (s MesureService) Get(
return nil, err
}
return mesure, nil
return measure, nil
}
func (s MesureService) Import(
func (s MeasureService) Import(
ctx context.Context,
organizationID gid.GID,
req ImportMesureRequest,
) (*page.Page[*coredata.Mesure, coredata.MesureOrderField], error) {
importedMesures := coredata.Mesures{}
req ImportMeasureRequest,
) (*page.Page[*coredata.Measure, coredata.MeasureOrderField], error) {
importedMeasures := coredata.Measures{}
err := s.svc.pg.WithTx(
ctx,
func(tx pg.Conn) error {
for i := range req.Mesures {
for i := range req.Measures {
now := time.Now()
mesureID, err := gid.NewGID(organizationID.TenantID(), coredata.MesureEntityType)
measureID, err := gid.NewGID(organizationID.TenantID(), coredata.MeasureEntityType)
if err != nil {
return fmt.Errorf("cannot create global id: %w", err)
}
mesure := &coredata.Mesure{
ID: mesureID,
measure := &coredata.Measure{
ID: measureID,
OrganizationID: organizationID,
Name: req.Mesures[i].Name,
Name: req.Measures[i].Name,
Description: "",
Category: req.Mesures[i].Category,
State: coredata.MesureStateNotStarted,
ReferenceID: req.Mesures[i].ReferenceID,
Category: req.Measures[i].Category,
State: coredata.MeasureStateNotStarted,
ReferenceID: req.Measures[i].ReferenceID,
CreatedAt: now,
UpdatedAt: now,
}
importedMesures = append(importedMesures, mesure)
importedMeasures = append(importedMeasures, measure)
if err := mesure.Upsert(ctx, tx, s.svc.scope); err != nil {
return fmt.Errorf("cannot upsert mesure: %w", err)
if err := measure.Upsert(ctx, tx, s.svc.scope); err != nil {
return fmt.Errorf("cannot upsert measure: %w", err)
}
for j := range req.Mesures[i].Tasks {
for j := range req.Measures[i].Tasks {
taskID, err := gid.NewGID(organizationID.TenantID(), coredata.TaskEntityType)
if err != nil {
return fmt.Errorf("cannot create global id: %w", err)
@@ -175,10 +175,10 @@ func (s MesureService) Import(
task := &coredata.Task{
ID: taskID,
MesureID: mesure.ID,
Name: req.Mesures[i].Tasks[j].Name,
Description: req.Mesures[i].Tasks[j].Description,
ReferenceID: req.Mesures[i].Tasks[j].ReferenceID,
MeasureID: measure.ID,
Name: req.Measures[i].Tasks[j].Name,
Description: req.Measures[i].Tasks[j].Description,
ReferenceID: req.Measures[i].Tasks[j].ReferenceID,
State: coredata.TaskStateTodo,
CreatedAt: now,
UpdatedAt: now,
@@ -188,7 +188,7 @@ func (s MesureService) Import(
return fmt.Errorf("cannot upsert task: %w", err)
}
for k := range req.Mesures[i].Tasks[j].RequestedEvidences {
for k := range req.Measures[i].Tasks[j].RequestedEvidences {
evidenceID, err := gid.NewGID(organizationID.TenantID(), coredata.EvidenceEntityType)
if err != nil {
return fmt.Errorf("cannot create global id: %w", err)
@@ -198,9 +198,9 @@ func (s MesureService) Import(
State: coredata.EvidenceStateRequested,
ID: evidenceID,
TaskID: task.ID,
ReferenceID: req.Mesures[i].Tasks[j].RequestedEvidences[k].ReferenceID,
Type: req.Mesures[i].Tasks[j].RequestedEvidences[k].Type,
Description: req.Mesures[i].Tasks[j].RequestedEvidences[k].Name,
ReferenceID: req.Measures[i].Tasks[j].RequestedEvidences[k].ReferenceID,
Type: req.Measures[i].Tasks[j].RequestedEvidences[k].Type,
Description: req.Measures[i].Tasks[j].RequestedEvidences[k].Name,
CreatedAt: now,
UpdatedAt: now,
}
@@ -211,7 +211,7 @@ func (s MesureService) Import(
}
}
for _, standard := range req.Mesures[i].Standards {
for _, standard := range req.Measures[i].Standards {
framework := &coredata.Framework{}
if err := framework.LoadByReferenceID(ctx, tx, s.svc.scope, standard.Framework); err != nil {
continue
@@ -222,14 +222,14 @@ func (s MesureService) Import(
continue
}
controlMesure := &coredata.ControlMesure{
controlMeasure := &coredata.ControlMeasure{
ControlID: control.ID,
MesureID: mesure.ID,
MeasureID: measure.ID,
CreatedAt: now,
}
if err := controlMesure.Upsert(ctx, tx, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert control mesure: %w", err)
if err := controlMeasure.Upsert(ctx, tx, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert control measure: %w", err)
}
}
}
@@ -239,55 +239,55 @@ func (s MesureService) Import(
)
if err != nil {
return nil, fmt.Errorf("cannot import mesures: %w", err)
return nil, fmt.Errorf("cannot import measures: %w", err)
}
cursor := page.NewCursor(
len(importedMesures),
len(importedMeasures),
nil,
page.Head,
page.OrderBy[coredata.MesureOrderField]{
Field: coredata.MesureOrderFieldCreatedAt,
page.OrderBy[coredata.MeasureOrderField]{
Field: coredata.MeasureOrderFieldCreatedAt,
Direction: page.OrderDirectionAsc,
},
)
return page.NewPage(importedMesures, cursor), nil
return page.NewPage(importedMeasures, cursor), nil
}
func (s MesureService) Update(
func (s MeasureService) Update(
ctx context.Context,
req UpdateMesureRequest,
) (*coredata.Mesure, error) {
mesure := &coredata.Mesure{ID: req.ID}
req UpdateMeasureRequest,
) (*coredata.Measure, error) {
measure := &coredata.Measure{ID: req.ID}
err := s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
if err := mesure.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil {
return fmt.Errorf("cannot load mesure: %w", err)
if err := measure.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil {
return fmt.Errorf("cannot load measure: %w", err)
}
if req.Name != nil {
mesure.Name = *req.Name
measure.Name = *req.Name
}
if req.Description != nil {
mesure.Description = *req.Description
measure.Description = *req.Description
}
if req.Category != nil {
mesure.Category = *req.Category
measure.Category = *req.Category
}
if req.State != nil {
mesure.State = *req.State
measure.State = *req.State
}
mesure.UpdatedAt = time.Now()
measure.UpdatedAt = time.Now()
if err := mesure.Update(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot update mesure: %w", err)
if err := measure.Update(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot update measure: %w", err)
}
return nil
@@ -297,20 +297,20 @@ func (s MesureService) Update(
return nil, err
}
return mesure, nil
return measure, nil
}
func (s MesureService) ListForOrganizationID(
func (s MeasureService) ListForOrganizationID(
ctx context.Context,
organizationID gid.GID,
cursor *page.Cursor[coredata.MesureOrderField],
) (*page.Page[*coredata.Mesure, coredata.MesureOrderField], error) {
var mesures coredata.Mesures
cursor *page.Cursor[coredata.MeasureOrderField],
) (*page.Page[*coredata.Measure, coredata.MeasureOrderField], error) {
var measures coredata.Measures
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return mesures.LoadByOrganizationID(
return measures.LoadByOrganizationID(
ctx,
conn,
s.svc.scope,
@@ -324,17 +324,17 @@ func (s MesureService) ListForOrganizationID(
return nil, err
}
return page.NewPage(mesures, cursor), nil
return page.NewPage(measures, cursor), nil
}
func (s MesureService) Create(
func (s MeasureService) Create(
ctx context.Context,
req CreateMesureRequest,
) (*coredata.Mesure, error) {
req CreateMeasureRequest,
) (*coredata.Measure, error) {
now := time.Now()
mesureID, err := gid.NewGID(s.svc.scope.GetTenantID(), coredata.MesureEntityType)
measureID, err := gid.NewGID(s.svc.scope.GetTenantID(), coredata.MeasureEntityType)
if err != nil {
return nil, fmt.Errorf("cannot create mesure global id: %w", err)
return nil, fmt.Errorf("cannot create measure global id: %w", err)
}
referenceID, err := uuid.NewV4()
@@ -342,14 +342,14 @@ func (s MesureService) Create(
return nil, fmt.Errorf("cannot generate reference id: %w", err)
}
mesure := &coredata.Mesure{
ID: mesureID,
measure := &coredata.Measure{
ID: measureID,
OrganizationID: req.OrganizationID,
Name: req.Name,
Description: req.Description,
Category: req.Category,
ReferenceID: "custom-mesure-" + referenceID.String(),
State: coredata.MesureStateNotStarted,
ReferenceID: "custom-measure-" + referenceID.String(),
State: coredata.MeasureStateNotStarted,
CreatedAt: now,
UpdatedAt: now,
}
@@ -357,8 +357,8 @@ func (s MesureService) Create(
err = s.svc.pg.WithTx(
ctx,
func(conn pg.Conn) error {
if err := mesure.Insert(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert mesure: %w", err)
if err := measure.Insert(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot insert measure: %w", err)
}
return nil
@@ -369,18 +369,18 @@ func (s MesureService) Create(
return nil, err
}
return mesure, nil
return measure, nil
}
func (s MesureService) Delete(
func (s MeasureService) Delete(
ctx context.Context,
mesureID gid.GID,
measureID gid.GID,
) error {
return s.svc.pg.WithTx(ctx, func(conn pg.Conn) error {
mesure := &coredata.Mesure{ID: mesureID}
measure := &coredata.Measure{ID: measureID}
if err := mesure.Delete(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot delete mesure: %w", err)
if err := measure.Delete(ctx, conn, s.svc.scope); err != nil {
return fmt.Errorf("cannot delete measure: %w", err)
}
return nil

26
pkg/probo/risk_service.go
View File

@@ -59,9 +59,9 @@ type (
}
)
func (s RiskService) ListForMesureID(
func (s RiskService) ListForMeasureID(
ctx context.Context,
mesureID gid.GID,
measureID gid.GID,
cursor *page.Cursor[coredata.RiskOrderField],
) (*page.Page[*coredata.Risk, coredata.RiskOrderField], error) {
var risks coredata.Risks
@@ -69,7 +69,7 @@ func (s RiskService) ListForMesureID(
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return risks.LoadByMesureID(ctx, conn, s.svc.scope, mesureID, cursor)
return risks.LoadByMeasureID(ctx, conn, s.svc.scope, measureID, cursor)
},
)
@@ -120,14 +120,14 @@ func (s RiskService) DeletePolicyMapping(
)
}
func (s RiskService) CreateMesureMapping(
func (s RiskService) CreateMeasureMapping(
ctx context.Context,
riskID gid.GID,
mesureID gid.GID,
measureID gid.GID,
) error {
riskMesure := &coredata.RiskMesure{
riskMeasure := &coredata.RiskMeasure{
RiskID: riskID,
MesureID: mesureID,
MeasureID: measureID,
TenantID: s.svc.scope.GetTenantID(),
CreatedAt: time.Now(),
}
@@ -135,19 +135,19 @@ func (s RiskService) CreateMesureMapping(
return s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return riskMesure.Insert(ctx, conn, s.svc.scope)
return riskMeasure.Insert(ctx, conn, s.svc.scope)
},
)
}
func (s RiskService) DeleteMesureMapping(
func (s RiskService) DeleteMeasureMapping(
ctx context.Context,
riskID gid.GID,
mesureID gid.GID,
measureID gid.GID,
) error {
riskMesure := &coredata.RiskMesure{
riskMeasure := &coredata.RiskMeasure{
RiskID: riskID,
MesureID: mesureID,
MeasureID: measureID,
TenantID: s.svc.scope.GetTenantID(),
CreatedAt: time.Now(),
}
@@ -155,7 +155,7 @@ func (s RiskService) DeleteMesureMapping(
return s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return riskMesure.Delete(ctx, conn, s.svc.scope)
return riskMeasure.Delete(ctx, conn, s.svc.scope)
},
)
}

4
pkg/probo/service.go
View File

@@ -44,7 +44,7 @@ type (
hostname string
tokenSecret string
Frameworks *FrameworkService
Mesures *MesureService
Measures *MeasureService
Tasks *TaskService
Evidences *EvidenceService
Organizations *OrganizationService
@@ -95,7 +95,7 @@ func (s *Service) WithTenant(tenantID gid.TenantID) *TenantService {
}
tenantService.Frameworks = &FrameworkService{svc: tenantService}
tenantService.Mesures = &MesureService{svc: tenantService}
tenantService.Measures = &MeasureService{svc: tenantService}
tenantService.Tasks = &TaskService{svc: tenantService}
tenantService.Evidences = &EvidenceService{svc: tenantService}
tenantService.Peoples = &PeopleService{svc: tenantService}

12
pkg/probo/task_service.go
View File

@@ -32,7 +32,7 @@ type (
}
CreateTaskRequest struct {
MesureID gid.GID
MeasureID gid.GID
Name string
Description string
TimeEstimate *time.Duration
@@ -65,7 +65,7 @@ func (s TaskService) Create(
task := &coredata.Task{
ID: taskID,
MesureID: req.MesureID,
MeasureID: req.MeasureID,
Name: req.Name,
Description: req.Description,
TimeEstimate: req.TimeEstimate,
@@ -215,9 +215,9 @@ func (s TaskService) Delete(
return nil
}
func (s TaskService) ListForMesureID(
func (s TaskService) ListForMeasureID(
ctx context.Context,
mesureID gid.GID,
measureID gid.GID,
cursor *page.Cursor[coredata.TaskOrderField],
) (*page.Page[*coredata.Task, coredata.TaskOrderField], error) {
var tasks coredata.Tasks
@@ -225,11 +225,11 @@ func (s TaskService) ListForMesureID(
err := s.svc.pg.WithConn(
ctx,
func(conn pg.Conn) error {
return tasks.LoadByMesureID(
return tasks.LoadByMeasureID(
ctx,
conn,
s.svc.scope,
mesureID,
measureID,
cursor,
)
},

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

@@ -40,23 +40,23 @@ enum OrderDirection
DESC @goEnum(value: "github.com/getprobo/probo/pkg/page.OrderDirectionDesc")
}
enum MesureState
@goModel(model: "github.com/getprobo/probo/pkg/coredata.MesureState") {
enum MeasureState
@goModel(model: "github.com/getprobo/probo/pkg/coredata.MeasureState") {
NOT_STARTED
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.MesureStateNotStarted"
value: "github.com/getprobo/probo/pkg/coredata.MeasureStateNotStarted"
)
IN_PROGRESS
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.MesureStateInProgress"
value: "github.com/getprobo/probo/pkg/coredata.MeasureStateInProgress"
)
NOT_APPLICABLE
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.MesureStateNotApplicable"
value: "github.com/getprobo/probo/pkg/coredata.MeasureStateNotApplicable"
)
IMPLEMENTED
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.MesureStateImplemented"
value: "github.com/getprobo/probo/pkg/coredata.MeasureStateImplemented"
)
}
@@ -170,11 +170,11 @@ enum ControlOrderField
)
}
enum MesureOrderField
@goModel(model: "github.com/getprobo/probo/pkg/coredata.MesureOrderField") {
enum MeasureOrderField
@goModel(model: "github.com/getprobo/probo/pkg/coredata.MeasureOrderField") {
CREATED_AT
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.MesureOrderFieldCreatedAt"
value: "github.com/getprobo/probo/pkg/coredata.MeasureOrderFieldCreatedAt"
)
}
@@ -321,12 +321,12 @@ input ControlOrder
field: ControlOrderField!
}
input MesureOrder
input MeasureOrder
@goModel(
model: "github.com/getprobo/probo/pkg/server/api/console/v1/types.MesureOrderBy"
model: "github.com/getprobo/probo/pkg/server/api/console/v1/types.MeasureOrderBy"
) {
direction: OrderDirection!
field: MesureOrderField!
field: MeasureOrderField!
}
input TaskOrder
@@ -445,13 +445,13 @@ type Organization implements Node {
orderBy: PolicyOrder
): PolicyConnection! @goField(forceResolver: true)
mesures(
measures(
first: Int
after: CursorKey
last: Int
before: CursorKey
orderBy: MesureOrder
): MesureConnection! @goField(forceResolver: true)
orderBy: MeasureOrder
): MeasureConnection! @goField(forceResolver: true)
risks(
first: Int
@@ -571,13 +571,13 @@ type Control implements Node {
name: String!
description: String!
mesures(
measures(
first: Int
after: CursorKey
last: Int
before: CursorKey
orderBy: MesureOrder
): MesureConnection! @goField(forceResolver: true)
orderBy: MeasureOrder
): MeasureConnection! @goField(forceResolver: true)
policies(
first: Int
@@ -591,12 +591,12 @@ type Control implements Node {
updatedAt: Datetime!
}
type Mesure implements Node {
type Measure implements Node {
id: ID!
category: String!
name: String!
description: String!
state: MesureState!
state: MeasureState!
tasks(
first: Int
@@ -705,13 +705,13 @@ type Risk implements Node {
owner: People @goField(forceResolver: true)
mesures(
measures(
first: Int
after: CursorKey
last: Int
before: CursorKey
orderBy: MesureOrder
): MesureConnection! @goField(forceResolver: true)
orderBy: MeasureOrder
): MeasureConnection! @goField(forceResolver: true)
policies(
first: Int
@@ -812,14 +812,14 @@ type ControlEdge {
node: Control!
}
type MesureConnection {
edges: [MesureEdge!]!
type MeasureConnection {
edges: [MeasureEdge!]!
pageInfo: PageInfo!
}
type MesureEdge {
type MeasureEdge {
cursor: CursorKey!
node: Mesure!
node: Measure!
}
type TaskConnection {
@@ -941,22 +941,22 @@ type Mutation {
importFramework(input: ImportFrameworkInput!): ImportFrameworkPayload!
deleteFramework(input: DeleteFrameworkInput!): DeleteFrameworkPayload!
# Mesure mutations
createMesure(input: CreateMesureInput!): CreateMesurePayload!
updateMesure(input: UpdateMesureInput!): UpdateMesurePayload!
importMesure(input: ImportMesureInput!): ImportMesurePayload!
deleteMesure(input: DeleteMesureInput!): DeleteMesurePayload!
# Measure mutations
createMeasure(input: CreateMeasureInput!): CreateMeasurePayload!
updateMeasure(input: UpdateMeasureInput!): UpdateMeasurePayload!
importMeasure(input: ImportMeasureInput!): ImportMeasurePayload!
deleteMeasure(input: DeleteMeasureInput!): DeleteMeasurePayload!
# Control mutations
createControlMesureMapping(
input: CreateControlMesureMappingInput!
): CreateControlMesureMappingPayload!
createControlMeasureMapping(
input: CreateControlMeasureMappingInput!
): CreateControlMeasureMappingPayload!
createControlPolicyMapping(
input: CreateControlPolicyMappingInput!
): CreateControlPolicyMappingPayload!
deleteControlMesureMapping(
input: DeleteControlMesureMappingInput!
): DeleteControlMesureMappingPayload!
deleteControlMeasureMapping(
input: DeleteControlMeasureMappingInput!
): DeleteControlMeasureMappingPayload!
deleteControlPolicyMapping(
input: DeleteControlPolicyMappingInput!
): DeleteControlPolicyMappingPayload!
@@ -972,12 +972,12 @@ type Mutation {
createRisk(input: CreateRiskInput!): CreateRiskPayload!
updateRisk(input: UpdateRiskInput!): UpdateRiskPayload!
deleteRisk(input: DeleteRiskInput!): DeleteRiskPayload!
createRiskMesureMapping(
input: CreateRiskMesureMappingInput!
): CreateRiskMesureMappingPayload!
deleteRiskMesureMapping(
input: DeleteRiskMesureMappingInput!
): DeleteRiskMesureMappingPayload!
createRiskMeasureMapping(
input: CreateRiskMeasureMappingInput!
): CreateRiskMeasureMappingPayload!
deleteRiskMeasureMapping(
input: DeleteRiskMeasureMappingInput!
): DeleteRiskMeasureMappingPayload!
createRiskPolicyMapping(
input: CreateRiskPolicyMappingInput!
@@ -1116,28 +1116,28 @@ input DeleteFrameworkInput {
frameworkId: ID!
}
input CreateMesureInput {
input CreateMeasureInput {
organizationId: ID!
name: String!
description: String!
category: String!
}
input UpdateMesureInput {
input UpdateMeasureInput {
id: ID!
name: String
description: String
category: String
state: MesureState
state: MeasureState
}
input ImportMesureInput {
input ImportMeasureInput {
organizationId: ID!
file: Upload!
}
input CreateTaskInput {
mesureId: ID!
measureId: ID!
name: String!
description: String!
timeEstimate: Duration
@@ -1165,9 +1165,9 @@ input UnassignTaskInput {
taskId: ID!
}
input CreateControlMesureMappingInput {
input CreateControlMeasureMappingInput {
controlId: ID!
mesureId: ID!
measureId: ID!
}
input CreateControlPolicyMappingInput {
@@ -1175,9 +1175,9 @@ input CreateControlPolicyMappingInput {
policyId: ID!
}
input DeleteControlMesureMappingInput {
input DeleteControlMeasureMappingInput {
controlId: ID!
mesureId: ID!
measureId: ID!
}
input DeleteControlPolicyMappingInput {
@@ -1217,14 +1217,14 @@ input DeleteRiskInput {
riskId: ID!
}
input CreateRiskMesureMappingInput {
input CreateRiskMeasureMappingInput {
riskId: ID!
mesureId: ID!
measureId: ID!
}
input DeleteRiskMesureMappingInput {
input DeleteRiskMeasureMappingInput {
riskId: ID!
mesureId: ID!
measureId: ID!
}
input CreateRiskPolicyMappingInput {
@@ -1363,16 +1363,16 @@ type DeleteFrameworkPayload {
deletedFrameworkId: ID!
}
type CreateMesurePayload {
mesureEdge: MesureEdge!
type CreateMeasurePayload {
measureEdge: MeasureEdge!
}
type UpdateMesurePayload {
mesure: Mesure!
type UpdateMeasurePayload {
measure: Measure!
}
type ImportMesurePayload {
mesureEdges: [MesureEdge!]!
type ImportMeasurePayload {
measureEdges: [MeasureEdge!]!
}
type CreateTaskPayload {
@@ -1395,7 +1395,7 @@ type UnassignTaskPayload {
task: Task!
}
type CreateControlMesureMappingPayload {
type CreateControlMeasureMappingPayload {
success: Boolean!
}
@@ -1403,7 +1403,7 @@ type CreateControlPolicyMappingPayload {
success: Boolean!
}
type DeleteControlMesureMappingPayload {
type DeleteControlMeasureMappingPayload {
success: Boolean!
}
@@ -1423,11 +1423,11 @@ type DeleteRiskPayload {
deletedRiskId: ID!
}
type CreateRiskMesureMappingPayload {
type CreateRiskMeasureMappingPayload {
success: Boolean!
}
type DeleteRiskMesureMappingPayload {
type DeleteRiskMeasureMappingPayload {
success: Boolean!
}
@@ -1535,12 +1535,12 @@ type CreateVendorRiskAssessmentPayload {
vendorRiskAssessmentEdge: VendorRiskAssessmentEdge!
}
input DeleteMesureInput {
mesureId: ID!
input DeleteMeasureInput {
measureId: ID!
}
type DeleteMesurePayload {
deletedMesureId: ID!
type DeleteMeasurePayload {
deletedMeasureId: ID!
}
type PolicyVersion implements Node {

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

File diff suppressed because it is too large Load Diff

20
pkg/server/api/console/v1/types/mesure.go
View File

@@ -20,31 +20,31 @@ import (
)
type (
MesureOrderBy OrderBy[coredata.MesureOrderField]
MeasureOrderBy OrderBy[coredata.MeasureOrderField]
)
func NewMesureConnection(p *page.Page[*coredata.Mesure, coredata.MesureOrderField]) *MesureConnection {
var edges = make([]*MesureEdge, len(p.Data))
func NewMeasureConnection(p *page.Page[*coredata.Measure, coredata.MeasureOrderField]) *MeasureConnection {
var edges = make([]*MeasureEdge, len(p.Data))
for i := range edges {
edges[i] = NewMesureEdge(p.Data[i], p.Cursor.OrderBy.Field)
edges[i] = NewMeasureEdge(p.Data[i], p.Cursor.OrderBy.Field)
}
return &MesureConnection{
return &MeasureConnection{
Edges: edges,
PageInfo: NewPageInfo(p),
}
}
func NewMesureEdge(c *coredata.Mesure, orderBy coredata.MesureOrderField) *MesureEdge {
return &MesureEdge{
func NewMeasureEdge(c *coredata.Measure, orderBy coredata.MeasureOrderField) *MeasureEdge {
return &MeasureEdge{
Cursor: c.CursorKey(orderBy),
Node: NewMesure(c),
Node: NewMeasure(c),
}
}
func NewMesure(c *coredata.Mesure) *Mesure {
return &Mesure{
func NewMeasure(c *coredata.Measure) *Measure {
return &Measure{
ID: c.ID,
Category: c.Category,
Name: c.Name,

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

@@ -63,14 +63,14 @@ type ConnectorOrder struct {
}
type Control struct {
ID gid.GID `json:"id"`
ReferenceID string `json:"referenceId"`
Name string `json:"name"`
Description string `json:"description"`
Mesures *MesureConnection `json:"mesures"`
Policies *PolicyConnection `json:"policies"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
ID gid.GID `json:"id"`
ReferenceID string `json:"referenceId"`
Name string `json:"name"`
Description string `json:"description"`
Measures *MeasureConnection `json:"measures"`
Policies *PolicyConnection `json:"policies"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
func (Control) IsNode() {}
@@ -86,12 +86,12 @@ type ControlEdge struct {
Node *Control `json:"node"`
}
type CreateControlMesureMappingInput struct {
type CreateControlMeasureMappingInput struct {
ControlID gid.GID `json:"controlId"`
MesureID gid.GID `json:"mesureId"`
MeasureID gid.GID `json:"measureId"`
}
type CreateControlMesureMappingPayload struct {
type CreateControlMeasureMappingPayload struct {
Success bool `json:"success"`
}
@@ -135,15 +135,15 @@ type CreateFrameworkPayload struct {
FrameworkEdge *FrameworkEdge `json:"frameworkEdge"`
}
type CreateMesureInput struct {
type CreateMeasureInput struct {
OrganizationID gid.GID `json:"organizationId"`
Name string `json:"name"`
Description string `json:"description"`
Category string `json:"category"`
}
type CreateMesurePayload struct {
MesureEdge *MesureEdge `json:"mesureEdge"`
type CreateMeasurePayload struct {
MeasureEdge *MeasureEdge `json:"measureEdge"`
}
type CreateOrganizationInput struct {
@@ -192,12 +192,12 @@ type CreateRiskInput struct {
Note *string `json:"note,omitempty"`
}
type CreateRiskMesureMappingInput struct {
RiskID gid.GID `json:"riskId"`
MesureID gid.GID `json:"mesureId"`
type CreateRiskMeasureMappingInput struct {
RiskID gid.GID `json:"riskId"`
MeasureID gid.GID `json:"measureId"`
}
type CreateRiskMesureMappingPayload struct {
type CreateRiskMeasureMappingPayload struct {
Success bool `json:"success"`
}
@@ -215,7 +215,7 @@ type CreateRiskPolicyMappingPayload struct {
}
type CreateTaskInput struct {
MesureID gid.GID `json:"mesureId"`
MeasureID gid.GID `json:"measureId"`
Name string `json:"name"`
Description string `json:"description"`
TimeEstimate *time.Duration `json:"timeEstimate,omitempty"`
@@ -265,12 +265,12 @@ type CreateVendorRiskAssessmentPayload struct {
VendorRiskAssessmentEdge *VendorRiskAssessmentEdge `json:"vendorRiskAssessmentEdge"`
}
type DeleteControlMesureMappingInput struct {
type DeleteControlMeasureMappingInput struct {
ControlID gid.GID `json:"controlId"`
MesureID gid.GID `json:"mesureId"`
MeasureID gid.GID `json:"measureId"`
}
type DeleteControlMesureMappingPayload struct {
type DeleteControlMeasureMappingPayload struct {
Success bool `json:"success"`
}
@@ -299,12 +299,12 @@ type DeleteFrameworkPayload struct {
DeletedFrameworkID gid.GID `json:"deletedFrameworkId"`
}
type DeleteMesureInput struct {
MesureID gid.GID `json:"mesureId"`
type DeleteMeasureInput struct {
MeasureID gid.GID `json:"measureId"`
}
type DeleteMesurePayload struct {
DeletedMesureID gid.GID `json:"deletedMesureId"`
type DeleteMeasurePayload struct {
DeletedMeasureID gid.GID `json:"deletedMeasureId"`
}
type DeleteOrganizationInput struct {
@@ -335,12 +335,12 @@ type DeleteRiskInput struct {
RiskID gid.GID `json:"riskId"`
}
type DeleteRiskMesureMappingInput struct {
RiskID gid.GID `json:"riskId"`
MesureID gid.GID `json:"mesureId"`
type DeleteRiskMeasureMappingInput struct {
RiskID gid.GID `json:"riskId"`
MeasureID gid.GID `json:"measureId"`
}
type DeleteRiskMesureMappingPayload struct {
type DeleteRiskMeasureMappingPayload struct {
Success bool `json:"success"`
}
@@ -450,13 +450,13 @@ type ImportFrameworkPayload struct {
FrameworkEdge *FrameworkEdge `json:"frameworkEdge"`
}
type ImportMesureInput struct {
type ImportMeasureInput struct {
OrganizationID gid.GID `json:"organizationId"`
File graphql.Upload `json:"file"`
}
type ImportMesurePayload struct {
MesureEdges []*MesureEdge `json:"mesureEdges"`
type ImportMeasurePayload struct {
MeasureEdges []*MeasureEdge `json:"measureEdges"`
}
type InviteUserInput struct {
@@ -469,30 +469,30 @@ type InviteUserPayload struct {
Success bool `json:"success"`
}
type Mesure struct {
ID gid.GID `json:"id"`
Category string `json:"category"`
Name string `json:"name"`
Description string `json:"description"`
State coredata.MesureState `json:"state"`
Tasks *TaskConnection `json:"tasks"`
Risks *RiskConnection `json:"risks"`
Controls *ControlConnection `json:"controls"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
type Measure struct {
ID gid.GID `json:"id"`
Category string `json:"category"`
Name string `json:"name"`
Description string `json:"description"`
State coredata.MeasureState `json:"state"`
Tasks *TaskConnection `json:"tasks"`
Risks *RiskConnection `json:"risks"`
Controls *ControlConnection `json:"controls"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
func (Mesure) IsNode() {}
func (this Mesure) GetID() gid.GID { return this.ID }
func (Measure) IsNode() {}
func (this Measure) GetID() gid.GID { return this.ID }
type MesureConnection struct {
Edges []*MesureEdge `json:"edges"`
PageInfo *PageInfo `json:"pageInfo"`
type MeasureConnection struct {
Edges []*MeasureEdge `json:"edges"`
PageInfo *PageInfo `json:"pageInfo"`
}
type MesureEdge struct {
type MeasureEdge struct {
Cursor page.CursorKey `json:"cursor"`
Node *Mesure `json:"node"`
Node *Measure `json:"node"`
}
type Mutation struct {
@@ -508,7 +508,7 @@ type Organization struct {
Vendors *VendorConnection `json:"vendors"`
Peoples *PeopleConnection `json:"peoples"`
Policies *PolicyConnection `json:"policies"`
Mesures *MesureConnection `json:"mesures"`
Measures *MeasureConnection `json:"measures"`
Risks *RiskConnection `json:"risks"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
@@ -703,7 +703,7 @@ type Risk struct {
ResidualSeverity int `json:"residualSeverity"`
Note string `json:"note"`
Owner *People `json:"owner,omitempty"`
Mesures *MesureConnection `json:"mesures"`
Measures *MeasureConnection `json:"measures"`
Policies *PolicyConnection `json:"policies"`
Controls *ControlConnection `json:"controls"`
CreatedAt time.Time `json:"createdAt"`
@@ -779,16 +779,16 @@ type UpdateFrameworkPayload struct {
Framework *Framework `json:"framework"`
}
type UpdateMesureInput struct {
ID gid.GID `json:"id"`
Name *string `json:"name,omitempty"`
Description *string `json:"description,omitempty"`
Category *string `json:"category,omitempty"`
State *coredata.MesureState `json:"state,omitempty"`
type UpdateMeasureInput struct {
ID gid.GID `json:"id"`
Name *string `json:"name,omitempty"`
Description *string `json:"description,omitempty"`
Category *string `json:"category,omitempty"`
State *coredata.MeasureState `json:"state,omitempty"`
}
type UpdateMesurePayload struct {
Mesure *Mesure `json:"mesure"`
type UpdateMeasurePayload struct {
Measure *Measure `json:"measure"`
}
type UpdateOrganizationInput struct {

190
pkg/server/api/console/v1/v1_resolver.go
View File

@@ -20,16 +20,16 @@ import (
"github.com/vektah/gqlparser/v2/gqlerror"
)
// Mesures is the resolver for the mesures field.
func (r *controlResolver) Mesures(ctx context.Context, obj *types.Control, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MesureOrderBy) (*types.MesureConnection, error) {
// Measures is the resolver for the measures field.
func (r *controlResolver) Measures(ctx context.Context, obj *types.Control, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MeasureOrderBy) (*types.MeasureConnection, error) {
svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.MesureOrderField]{
Field: coredata.MesureOrderFieldCreatedAt,
pageOrderBy := page.OrderBy[coredata.MeasureOrderField]{
Field: coredata.MeasureOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
if orderBy != nil {
pageOrderBy = page.OrderBy[coredata.MesureOrderField]{
pageOrderBy = page.OrderBy[coredata.MeasureOrderField]{
Field: orderBy.Field,
Direction: orderBy.Direction,
}
@@ -37,12 +37,12 @@ func (r *controlResolver) Mesures(ctx context.Context, obj *types.Control, first
cursor := types.NewCursor(first, after, last, before, pageOrderBy)
page, err := svc.Mesures.ListForControlID(ctx, obj.ID, cursor)
page, err := svc.Measures.ListForControlID(ctx, obj.ID, cursor)
if err != nil {
return nil, fmt.Errorf("cannot list mesures: %w", err)
return nil, fmt.Errorf("cannot list measures: %w", err)
}
return types.NewMesureConnection(page), nil
return types.NewMeasureConnection(page), nil
}
// Policies is the resolver for the policies field.
@@ -113,7 +113,7 @@ func (r *frameworkResolver) Controls(ctx context.Context, obj *types.Framework,
}
// Tasks is the resolver for the tasks field.
func (r *mesureResolver) Tasks(ctx context.Context, obj *types.Mesure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.TaskOrderBy) (*types.TaskConnection, error) {
func (r *measureResolver) Tasks(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.TaskOrderBy) (*types.TaskConnection, error) {
svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.TaskOrderField]{
@@ -129,16 +129,16 @@ func (r *mesureResolver) Tasks(ctx context.Context, obj *types.Mesure, first *in
cursor := types.NewCursor(first, after, last, before, pageOrderBy)
page, err := svc.Tasks.ListForMesureID(ctx, obj.ID, cursor)
page, err := svc.Tasks.ListForMeasureID(ctx, obj.ID, cursor)
if err != nil {
return nil, fmt.Errorf("cannot list mesure tasks: %w", err)
return nil, fmt.Errorf("cannot list measure tasks: %w", err)
}
return types.NewTaskConnection(page), nil
}
// Risks is the resolver for the risks field.
func (r *mesureResolver) Risks(ctx context.Context, obj *types.Mesure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.RiskOrderBy) (*types.RiskConnection, error) {
func (r *measureResolver) Risks(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.RiskOrderBy) (*types.RiskConnection, error) {
svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.RiskOrderField]{
@@ -154,16 +154,16 @@ func (r *mesureResolver) Risks(ctx context.Context, obj *types.Mesure, first *in
cursor := types.NewCursor(first, after, last, before, pageOrderBy)
page, err := svc.Risks.ListForMesureID(ctx, obj.ID, cursor)
page, err := svc.Risks.ListForMeasureID(ctx, obj.ID, cursor)
if err != nil {
return nil, fmt.Errorf("cannot list mesure risks: %w", err)
return nil, fmt.Errorf("cannot list measure risks: %w", err)
}
return types.NewRiskConnection(page), nil
}
// Controls is the resolver for the controls field.
func (r *mesureResolver) Controls(ctx context.Context, obj *types.Mesure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.ControlOrderBy) (*types.ControlConnection, error) {
func (r *measureResolver) Controls(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.ControlOrderBy) (*types.ControlConnection, error) {
svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.ControlOrderField]{
@@ -179,9 +179,9 @@ func (r *mesureResolver) Controls(ctx context.Context, obj *types.Mesure, first
cursor := types.NewCursor(first, after, last, before, pageOrderBy)
page, err := svc.Controls.ListForMesureID(ctx, obj.ID, cursor)
page, err := svc.Controls.ListForMeasureID(ctx, obj.ID, cursor)
if err != nil {
return nil, fmt.Errorf("cannot list mesure controls: %w", err)
return nil, fmt.Errorf("cannot list measure controls: %w", err)
}
return types.NewControlConnection(page), nil
@@ -530,30 +530,30 @@ func (r *mutationResolver) DeleteFramework(ctx context.Context, input types.Dele
}, nil
}
// // CreateMesure is the resolver for the createMesure field.
func (r *mutationResolver) CreateMesure(ctx context.Context, input types.CreateMesureInput) (*types.CreateMesurePayload, error) {
// // CreateMeasure is the resolver for the createMeasure field.
func (r *mutationResolver) CreateMeasure(ctx context.Context, input types.CreateMeasureInput) (*types.CreateMeasurePayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.OrganizationID.TenantID())
mesure, err := svc.Mesures.Create(ctx, probo.CreateMesureRequest{
measure, err := svc.Measures.Create(ctx, probo.CreateMeasureRequest{
OrganizationID: input.OrganizationID,
Name: input.Name,
Description: input.Description,
Category: input.Category,
})
if err != nil {
panic(fmt.Errorf("cannot create mesure: %w", err))
panic(fmt.Errorf("cannot create measure: %w", err))
}
return &types.CreateMesurePayload{
MesureEdge: types.NewMesureEdge(mesure, coredata.MesureOrderFieldCreatedAt),
return &types.CreateMeasurePayload{
MeasureEdge: types.NewMeasureEdge(measure, coredata.MeasureOrderFieldCreatedAt),
}, nil
}
// UpdateMesure is the resolver for the updateMesure field.
func (r *mutationResolver) UpdateMesure(ctx context.Context, input types.UpdateMesureInput) (*types.UpdateMesurePayload, error) {
// UpdateMeasure is the resolver for the updateMeasure field.
func (r *mutationResolver) UpdateMeasure(ctx context.Context, input types.UpdateMeasureInput) (*types.UpdateMeasurePayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.ID.TenantID())
mesure, err := svc.Mesures.Update(ctx, probo.UpdateMesureRequest{
measure, err := svc.Measures.Update(ctx, probo.UpdateMeasureRequest{
ID: input.ID,
Name: input.Name,
Description: input.Description,
@@ -561,62 +561,62 @@ func (r *mutationResolver) UpdateMesure(ctx context.Context, input types.UpdateM
State: input.State,
})
if err != nil {
panic(fmt.Errorf("cannot update mesure: %w", err))
panic(fmt.Errorf("cannot update measure: %w", err))
}
return &types.UpdateMesurePayload{
Mesure: types.NewMesure(mesure),
return &types.UpdateMeasurePayload{
Measure: types.NewMeasure(measure),
}, nil
}
// ImportMesure is the resolver for the importMesure field.
func (r *mutationResolver) ImportMesure(ctx context.Context, input types.ImportMesureInput) (*types.ImportMesurePayload, error) {
// ImportMeasure is the resolver for the importMeasure field.
func (r *mutationResolver) ImportMeasure(ctx context.Context, input types.ImportMeasureInput) (*types.ImportMeasurePayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.OrganizationID.TenantID())
var req probo.ImportMesureRequest
if err := json.NewDecoder(input.File.File).Decode(&req.Mesures); err != nil {
return nil, fmt.Errorf("cannot unmarshal mesure: %w", err)
var req probo.ImportMeasureRequest
if err := json.NewDecoder(input.File.File).Decode(&req.Measures); err != nil {
return nil, fmt.Errorf("cannot unmarshal measure: %w", err)
}
mesures, err := svc.Mesures.Import(ctx, input.OrganizationID, req)
measures, err := svc.Measures.Import(ctx, input.OrganizationID, req)
if err != nil {
return nil, fmt.Errorf("cannot import mesure: %w", err)
return nil, fmt.Errorf("cannot import measure: %w", err)
}
mesureEdges := make([]*types.MesureEdge, len(mesures.Data))
for i, mesure := range mesures.Data {
mesureEdges[i] = types.NewMesureEdge(mesure, coredata.MesureOrderFieldCreatedAt)
measureEdges := make([]*types.MeasureEdge, len(measures.Data))
for i, measure := range measures.Data {
measureEdges[i] = types.NewMeasureEdge(measure, coredata.MeasureOrderFieldCreatedAt)
}
return &types.ImportMesurePayload{
MesureEdges: mesureEdges,
return &types.ImportMeasurePayload{
MeasureEdges: measureEdges,
}, nil
}
// DeleteMesure is the resolver for the deleteMesure field.
func (r *mutationResolver) DeleteMesure(ctx context.Context, input types.DeleteMesureInput) (*types.DeleteMesurePayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MesureID.TenantID())
// DeleteMeasure is the resolver for the deleteMeasure field.
func (r *mutationResolver) DeleteMeasure(ctx context.Context, input types.DeleteMeasureInput) (*types.DeleteMeasurePayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MeasureID.TenantID())
err := svc.Mesures.Delete(ctx, input.MesureID)
err := svc.Measures.Delete(ctx, input.MeasureID)
if err != nil {
panic(fmt.Errorf("cannot delete mesure: %w", err))
panic(fmt.Errorf("cannot delete measure: %w", err))
}
return &types.DeleteMesurePayload{
DeletedMesureID: input.MesureID,
return &types.DeleteMeasurePayload{
DeletedMeasureID: input.MeasureID,
}, nil
}
// CreateControlMesureMapping is the resolver for the createControlMesureMapping field.
func (r *mutationResolver) CreateControlMesureMapping(ctx context.Context, input types.CreateControlMesureMappingInput) (*types.CreateControlMesureMappingPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MesureID.TenantID())
// CreateControlMeasureMapping is the resolver for the createControlMeasureMapping field.
func (r *mutationResolver) CreateControlMeasureMapping(ctx context.Context, input types.CreateControlMeasureMappingInput) (*types.CreateControlMeasureMappingPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MeasureID.TenantID())
err := svc.Controls.CreateMesureMapping(ctx, input.ControlID, input.MesureID)
err := svc.Controls.CreateMeasureMapping(ctx, input.ControlID, input.MeasureID)
if err != nil {
panic(fmt.Errorf("cannot create control mesure mapping: %w", err))
panic(fmt.Errorf("cannot create control measure mapping: %w", err))
}
return &types.CreateControlMesureMappingPayload{
return &types.CreateControlMeasureMappingPayload{
Success: true,
}, nil
}
@@ -635,16 +635,16 @@ func (r *mutationResolver) CreateControlPolicyMapping(ctx context.Context, input
}, nil
}
// DeleteControlMesureMapping is the resolver for the deleteControlMesureMapping field.
func (r *mutationResolver) DeleteControlMesureMapping(ctx context.Context, input types.DeleteControlMesureMappingInput) (*types.DeleteControlMesureMappingPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MesureID.TenantID())
// DeleteControlMeasureMapping is the resolver for the deleteControlMeasureMapping field.
func (r *mutationResolver) DeleteControlMeasureMapping(ctx context.Context, input types.DeleteControlMeasureMappingInput) (*types.DeleteControlMeasureMappingPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MeasureID.TenantID())
err := svc.Controls.DeleteMesureMapping(ctx, input.ControlID, input.MesureID)
err := svc.Controls.DeleteMeasureMapping(ctx, input.ControlID, input.MeasureID)
if err != nil {
panic(fmt.Errorf("cannot delete control mesure mapping: %w", err))
panic(fmt.Errorf("cannot delete control measure mapping: %w", err))
}
return &types.DeleteControlMesureMappingPayload{
return &types.DeleteControlMeasureMappingPayload{
Success: true,
}, nil
}
@@ -665,10 +665,10 @@ func (r *mutationResolver) DeleteControlPolicyMapping(ctx context.Context, input
// CreateTask is the resolver for the createTask field.
func (r *mutationResolver) CreateTask(ctx context.Context, input types.CreateTaskInput) (*types.CreateTaskPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.MesureID.TenantID())
svc := GetTenantService(ctx, r.proboSvc, input.MeasureID.TenantID())
task, err := svc.Tasks.Create(ctx, probo.CreateTaskRequest{
MesureID: input.MesureID,
MeasureID: input.MeasureID,
Name: input.Name,
Description: input.Description,
TimeEstimate: input.TimeEstimate,
@@ -816,30 +816,30 @@ func (r *mutationResolver) DeleteRisk(ctx context.Context, input types.DeleteRis
}, nil
}
// CreateRiskMesureMapping is the resolver for the createRiskMesureMapping field.
func (r *mutationResolver) CreateRiskMesureMapping(ctx context.Context, input types.CreateRiskMesureMappingInput) (*types.CreateRiskMesureMappingPayload, error) {
// CreateRiskMeasureMapping is the resolver for the createRiskMeasureMapping field.
func (r *mutationResolver) CreateRiskMeasureMapping(ctx context.Context, input types.CreateRiskMeasureMappingInput) (*types.CreateRiskMeasureMappingPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.RiskID.TenantID())
err := svc.Risks.CreateMesureMapping(ctx, input.RiskID, input.MesureID)
err := svc.Risks.CreateMeasureMapping(ctx, input.RiskID, input.MeasureID)
if err != nil {
panic(fmt.Errorf("cannot create risk mesure mapping: %w", err))
panic(fmt.Errorf("cannot create risk measure mapping: %w", err))
}
return &types.CreateRiskMesureMappingPayload{
return &types.CreateRiskMeasureMappingPayload{
Success: true,
}, nil
}
// DeleteRiskMesureMapping is the resolver for the deleteRiskMesureMapping field.
func (r *mutationResolver) DeleteRiskMesureMapping(ctx context.Context, input types.DeleteRiskMesureMappingInput) (*types.DeleteRiskMesureMappingPayload, error) {
// DeleteRiskMeasureMapping is the resolver for the deleteRiskMeasureMapping field.
func (r *mutationResolver) DeleteRiskMeasureMapping(ctx context.Context, input types.DeleteRiskMeasureMappingInput) (*types.DeleteRiskMeasureMappingPayload, error) {
svc := GetTenantService(ctx, r.proboSvc, input.RiskID.TenantID())
err := svc.Risks.DeleteMesureMapping(ctx, input.RiskID, input.MesureID)
err := svc.Risks.DeleteMeasureMapping(ctx, input.RiskID, input.MeasureID)
if err != nil {
panic(fmt.Errorf("cannot delete risk mesure mapping: %w", err))
panic(fmt.Errorf("cannot delete risk measure mapping: %w", err))
}
return &types.DeleteRiskMesureMappingPayload{
return &types.DeleteRiskMeasureMappingPayload{
Success: true,
}, nil
}
@@ -1327,16 +1327,16 @@ func (r *organizationResolver) Policies(ctx context.Context, obj *types.Organiza
return types.NewPolicyConnection(page), nil
}
// Mesures is the resolver for the mesures field.
func (r *organizationResolver) Mesures(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MesureOrderBy) (*types.MesureConnection, error) {
// Measures is the resolver for the measures field.
func (r *organizationResolver) Measures(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MeasureOrderBy) (*types.MeasureConnection, error) {
svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.MesureOrderField]{
Field: coredata.MesureOrderFieldCreatedAt,
pageOrderBy := page.OrderBy[coredata.MeasureOrderField]{
Field: coredata.MeasureOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
if orderBy != nil {
pageOrderBy = page.OrderBy[coredata.MesureOrderField]{
pageOrderBy = page.OrderBy[coredata.MeasureOrderField]{
Field: orderBy.Field,
Direction: orderBy.Direction,
}
@@ -1344,12 +1344,12 @@ func (r *organizationResolver) Mesures(ctx context.Context, obj *types.Organizat
cursor := types.NewCursor(first, after, last, before, pageOrderBy)
page, err := svc.Mesures.ListForOrganizationID(ctx, obj.ID, cursor)
page, err := svc.Measures.ListForOrganizationID(ctx, obj.ID, cursor)
if err != nil {
panic(fmt.Errorf("cannot list organization mesures: %w", err))
panic(fmt.Errorf("cannot list organization measures: %w", err))
}
return types.NewMesureConnection(page), nil
return types.NewMeasureConnection(page), nil
}
// Risks is the resolver for the risks field.
@@ -1592,13 +1592,13 @@ func (r *queryResolver) Node(ctx context.Context, id gid.GID) (types.Node, error
}
return types.NewFramework(framework), nil
case coredata.MesureEntityType:
mesure, err := svc.Mesures.Get(ctx, id)
case coredata.MeasureEntityType:
measure, err := svc.Measures.Get(ctx, id)
if err != nil {
panic(fmt.Errorf("cannot get mesure: %w", err))
panic(fmt.Errorf("cannot get measure: %w", err))
}
return types.NewMesure(mesure), nil
return types.NewMeasure(measure), nil
case coredata.TaskEntityType:
task, err := svc.Tasks.Get(ctx, id)
if err != nil {
@@ -1688,16 +1688,16 @@ func (r *riskResolver) Owner(ctx context.Context, obj *types.Risk) (*types.Peopl
return types.NewPeople(owner), nil
}
// Mesures is the resolver for the mesures field.
func (r *riskResolver) Mesures(ctx context.Context, obj *types.Risk, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MesureOrderBy) (*types.MesureConnection, error) {
// Measures is the resolver for the measures field.
func (r *riskResolver) Measures(ctx context.Context, obj *types.Risk, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MeasureOrderBy) (*types.MeasureConnection, error) {
svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.MesureOrderField]{
Field: coredata.MesureOrderFieldCreatedAt,
pageOrderBy := page.OrderBy[coredata.MeasureOrderField]{
Field: coredata.MeasureOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
if orderBy != nil {
pageOrderBy = page.OrderBy[coredata.MesureOrderField]{
pageOrderBy = page.OrderBy[coredata.MeasureOrderField]{
Field: orderBy.Field,
Direction: orderBy.Direction,
}
@@ -1705,12 +1705,12 @@ func (r *riskResolver) Mesures(ctx context.Context, obj *types.Risk, first *int,
cursor := types.NewCursor(first, after, last, before, pageOrderBy)
page, err := svc.Mesures.ListForRiskID(ctx, obj.ID, cursor)
page, err := svc.Measures.ListForRiskID(ctx, obj.ID, cursor)
if err != nil {
panic(fmt.Errorf("cannot list risk mesures: %w", err))
panic(fmt.Errorf("cannot list risk measures: %w", err))
}
return types.NewMesureConnection(page), nil
return types.NewMeasureConnection(page), nil
}
// Policies is the resolver for the policies field.
@@ -1999,8 +1999,8 @@ func (r *Resolver) Evidence() schema.EvidenceResolver { return &evidenceResolver
// Framework returns schema.FrameworkResolver implementation.
func (r *Resolver) Framework() schema.FrameworkResolver { return &frameworkResolver{r} }
// Mesure returns schema.MesureResolver implementation.
func (r *Resolver) Mesure() schema.MesureResolver { return &mesureResolver{r} }
// Measure returns schema.MeasureResolver implementation.
func (r *Resolver) Measure() schema.MeasureResolver { return &measureResolver{r} }
// Mutation returns schema.MutationResolver implementation.
func (r *Resolver) Mutation() schema.MutationResolver { return &mutationResolver{r} }
@@ -2050,7 +2050,7 @@ func (r *Resolver) Viewer() schema.ViewerResolver { return &viewerResolver{r} }
type controlResolver struct{ *Resolver }
type evidenceResolver struct{ *Resolver }
type frameworkResolver struct{ *Resolver }
type mesureResolver struct{ *Resolver }
type measureResolver struct{ *Resolver }
type mutationResolver struct{ *Resolver }
type organizationResolver struct{ *Resolver }
type policyResolver struct{ *Resolver }