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,