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

Refactor model cursor to use orderBy

Browse Source 
Signed-off-by: gearnode <bryan@frimin.fr>
This commit is contained in:
gearnode
2025-03-18 18:16:14 +01:00
parent 709b3363c5
commit c73e417e5c
24 changed files with 300 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/coredata/control.go
View File

@@ -55,7 +55,7 @@ type (
}
)
func (c Control) CursorKey() page.CursorKey {
func (c Control) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(c.ID, c.CreatedAt)
}

2
pkg/coredata/evidence.go
View File

@@ -42,7 +42,7 @@ type (
Evidences []*Evidence
)
func (e Evidence) CursorKey() page.CursorKey {
func (e Evidence) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(e.ID, e.CreatedAt)
}

4
pkg/coredata/framework.go
View File

@@ -47,7 +47,7 @@ type (
}
)
func (f Framework) CursorKey() page.CursorKey {
func (f Framework) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(f.ID, f.CreatedAt)
}
@@ -78,7 +78,7 @@ WHERE
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.StrictNamedArgs{"organization_id": organizationID}
args := pgx.NamedArgs{"organization_id": organizationID}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, cursor.SQLArguments())

5
pkg/coredata/organization.go
View File

@@ -21,6 +21,7 @@ import (
"time"
"github.com/getprobo/probo/pkg/gid"
"github.com/getprobo/probo/pkg/page"
"github.com/jackc/pgx/v5"
"go.gearno.de/kit/pg"
)
@@ -38,6 +39,10 @@ type (
Organizations []*Organization
)
func (o Organization) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(o.ID, o.CreatedAt)
}
func (o *Organization) LoadByID(
ctx context.Context,
conn pg.Conn,

2
pkg/coredata/people.go
View File

@@ -50,7 +50,7 @@ type (
}
)
func (p People) CursorKey() page.CursorKey {
func (p People) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(p.ID, p.CreatedAt)
}

2
pkg/coredata/policy.go
View File

@@ -38,7 +38,7 @@ type (
}
)
func (p Policy) CursorKey() page.CursorKey {
func (p Policy) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(p.ID, p.CreatedAt)
}

2
pkg/coredata/session.go
View File

@@ -38,7 +38,7 @@ type (
SessionData struct{}
)
func (s Session) CursorKey() page.CursorKey {
func (s Session) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(s.ID, s.CreatedAt)
}

2
pkg/coredata/task.go
View File

@@ -53,7 +53,7 @@ type (
}
)
func (t Task) CursorKey() page.CursorKey {
func (t Task) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(t.ID, t.CreatedAt)
}

2
pkg/coredata/user.go
View File

@@ -59,7 +59,7 @@ func (e ErrUserAlreadyExists) Error() string {
return e.message
}
func (u User) CursorKey() page.CursorKey {
func (u User) CursorKey(orderBy page.OrderField) page.CursorKey {
return page.NewCursorKey(u.ID, u.CreatedAt)
}

14
pkg/coredata/vendor.go
View File

@@ -63,8 +63,17 @@ type (
}
)
func (v Vendor) CursorKey() page.CursorKey {
return page.NewCursorKey(v.ID, v.CreatedAt)
func (v Vendor) CursorKey(orderBy page.OrderField) page.CursorKey {
switch orderBy {
case page.OrderFieldCreatedAt:
return page.NewCursorKey(v.ID, v.CreatedAt)
case page.OrderFieldUpdatedAt:
return page.NewCursorKey(v.ID, v.UpdatedAt)
case page.OrderFieldName:
return page.NewCursorKey(v.ID, v.Name)
}
panic(fmt.Sprintf("unknown order by: %s", orderBy))
}
func (v *Vendor) LoadByID(
@@ -229,7 +238,6 @@ WHERE
AND organization_id = @organization_id
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.StrictNamedArgs{"organization_id": organizationID}