Skip to content

Commit e34cbc4

Browse files
committed
fix userid parameter
Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>
1 parent bbdb3ca commit e34cbc4

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

re/postgres/repository.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,11 @@ func (repo *PostgresRepository) ListUserRules(ctx context.Context, userID string
453453
orderClause = fmt.Sprintf("ORDER BY COALESCE(updated_at, created_at) %s, id %s", dir, dir)
454454
}
455455

456-
userJoin := fmt.Sprintf(`
456+
pm.UserID = userID
457+
userJoin := `
457458
INNER JOIN rules_roles rr ON rr.entity_id = r.id
458-
INNER JOIN rules_role_members rrm ON rrm.role_id = rr.id AND rrm.member_id = '%s'
459-
`, userID)
459+
INNER JOIN rules_role_members rrm ON rrm.role_id = rr.id AND rrm.member_id = :user_id
460+
`
460461

461462
whereClause := pq
462463

re/rule.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ type PageMeta struct {
172172
ScheduledBefore *time.Time `json:"scheduled_before,omitempty" db:"scheduled_before"` // Filter rules scheduled before this time
173173
ScheduledAfter *time.Time `json:"scheduled_after,omitempty" db:"scheduled_after"` // Filter rules scheduled after this time
174174
Recurring *schedule.Recurring `json:"recurring,omitempty" db:"recurring"` // Filter by recurring type
175+
UserID string `json:"user_id,omitempty" db:"user_id"`
175176
}
176177

177178
// EventEncode converts a PageMeta struct to map[string]any.

reports/postgres/repository.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,11 @@ func (repo *PostgresRepository) ListUserReportsConfig(ctx context.Context, userI
502502
orderClause = fmt.Sprintf("ORDER BY COALESCE(updated_at, created_at) %s, id %s", dir, dir)
503503
}
504504

505-
userJoin := fmt.Sprintf(`
505+
pm.UserID = userID
506+
userJoin := `
506507
INNER JOIN reports_roles rr ON rr.entity_id = rc.id
507-
INNER JOIN reports_role_members rrm ON rrm.role_id = rr.id AND rrm.member_id = '%s'
508-
`, userID)
508+
INNER JOIN reports_role_members rrm ON rrm.role_id = rr.id AND rrm.member_id = :user_id
509+
`
509510

510511
whereClause := pq
511512

reports/reports.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ type PageMeta struct {
395395
Domain string `json:"domain_id,omitempty" db:"domain_id"`
396396
ScheduledBefore *time.Time `json:"scheduled_before,omitempty" db:"scheduled_before"` // Filter rules scheduled before this time
397397
ScheduledAfter *time.Time `json:"scheduled_after,omitempty" db:"scheduled_after"` // Filter rules scheduled after this time
398+
UserID string `json:"user_id,omitempty" db:"user_id"`
398399
}
399400

400401
type Repository interface {

0 commit comments

Comments
 (0)