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

Add rank to reference

Browse Source 
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
Sacha Al Himdani
2025-10-28 16:38:12 +01:00
parent ca008721ba
commit 75f3f92f04
17 changed files with 497 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/coredata/migrations/20251028T152339Z.sql Normal file
View File

@@ -0,0 +1,19 @@
ALTER TABLE trust_center_references ADD COLUMN rank INTEGER;
WITH ranked_references AS (
SELECT
id,
ROW_NUMBER() OVER (PARTITION BY trust_center_id ORDER BY created_at DESC, id DESC) AS rn
FROM trust_center_references
)
UPDATE trust_center_references tcr
SET rank = rr.rn
FROM ranked_references rr
WHERE tcr.id = rr.id;
ALTER TABLE trust_center_references ALTER COLUMN rank SET NOT NULL;
ALTER TABLE trust_center_references
ADD CONSTRAINT trust_center_references_trust_center_id_rank_key
UNIQUE (trust_center_id, rank)
DEFERRABLE INITIALLY DEFERRED;

90
pkg/coredata/trust_center_reference.go
View File

@@ -34,15 +34,26 @@ type (
Description string `db:"description"`
WebsiteURL string `db:"website_url"`
LogoFileID gid.GID `db:"logo_file_id"`
Rank int `db:"rank"`
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
}
TrustCenterReferences []*TrustCenterReference
ErrTrustCenterReferenceNotFound struct {
ID string
}
)
func (e ErrTrustCenterReferenceNotFound) Error() string {
return fmt.Sprintf("trust center reference not found: %s", e.ID)
}
func (t TrustCenterReference) CursorKey(orderBy TrustCenterReferenceOrderField) page.CursorKey {
switch orderBy {
case TrustCenterReferenceOrderFieldRank:
return page.NewCursorKey(t.ID, t.Rank)
case TrustCenterReferenceOrderFieldName:
return page.NewCursorKey(t.ID, t.Name)
case TrustCenterReferenceOrderFieldCreatedAt:
@@ -67,6 +78,7 @@ SELECT
description,
website_url,
logo_file_id,
rank,
created_at,
updated_at
FROM
@@ -96,7 +108,7 @@ LIMIT 1;
return nil
}
func (t TrustCenterReference) Insert(
func (t *TrustCenterReference) Insert(
ctx context.Context,
conn pg.Conn,
scope Scoper,
@@ -111,6 +123,7 @@ INSERT INTO
description,
website_url,
logo_file_id,
rank,
created_at,
updated_at
)
@@ -122,9 +135,11 @@ VALUES (
@description,
@website_url,
@logo_file_id,
(SELECT COALESCE(MAX(rank), 0) + 1 FROM trust_center_references WHERE trust_center_id = @trust_center_id),
@created_at,
@updated_at
);
)
RETURNING rank;
`
args := pgx.StrictNamedArgs{
@@ -139,7 +154,7 @@ VALUES (
"updated_at": t.UpdatedAt,
}
_, err := conn.Exec(ctx, q, args)
err := conn.QueryRow(ctx, q, args).Scan(&t.Rank)
if err != nil {
return fmt.Errorf("cannot insert trust center reference: %w", err)
}
@@ -162,16 +177,7 @@ SET
updated_at = @updated_at
WHERE
%s
AND id = @id
RETURNING
id,
trust_center_id,
name,
description,
website_url,
logo_file_id,
created_at,
updated_at
AND id = @id;
`
q = fmt.Sprintf(q, scope.SQLFragment())
@@ -186,17 +192,64 @@ RETURNING
}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)
result, err := conn.Exec(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot update trust center reference: %w", err)
}
reference, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[TrustCenterReference])
if err != nil {
return fmt.Errorf("cannot collect updated trust center reference: %w", err)
if result.RowsAffected() == 0 {
return ErrTrustCenterReferenceNotFound{ID: t.ID.String()}
}
*t = reference
return nil
}
func (t *TrustCenterReference) UpdateRank(
ctx context.Context,
conn pg.Conn,
scope Scoper,
) error {
q := `
WITH old AS (
SELECT
rank AS old_rank
FROM trust_center_references
WHERE %s AND id = @id AND trust_center_id = @trust_center_id
)
UPDATE trust_center_references
SET
rank = CASE
WHEN id = @id THEN @new_rank
ELSE rank + CASE
WHEN @new_rank < old.old_rank THEN 1
WHEN @new_rank > old.old_rank THEN -1
END
END,
updated_at = @updated_at
FROM old
WHERE %s
AND (
id = @id
OR (rank BETWEEN LEAST(old.old_rank, @new_rank) AND GREATEST(old.old_rank, @new_rank))
);
`
scopeFragment := scope.SQLFragment()
q = fmt.Sprintf(q, scopeFragment, scopeFragment)
args := pgx.StrictNamedArgs{
"id": t.ID,
"new_rank": t.Rank,
"trust_center_id": t.TrustCenterID,
"updated_at": t.UpdatedAt,
}
maps.Copy(args, scope.SQLArguments())
_, err := conn.Exec(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot update trust center reference rank: %w", err)
}
return nil
}
@@ -242,6 +295,7 @@ SELECT
description,
website_url,
logo_file_id,
rank,
created_at,
updated_at
FROM

3
pkg/coredata/trust_center_reference_order_field.go
View File

@@ -19,6 +19,7 @@ type (
)
const (
TrustCenterReferenceOrderFieldRank TrustCenterReferenceOrderField = "RANK"
TrustCenterReferenceOrderFieldName TrustCenterReferenceOrderField = "NAME"
TrustCenterReferenceOrderFieldCreatedAt TrustCenterReferenceOrderField = "CREATED_AT"
TrustCenterReferenceOrderFieldUpdatedAt TrustCenterReferenceOrderField = "UPDATED_AT"
@@ -26,6 +27,8 @@ const (
func (p TrustCenterReferenceOrderField) Column() string {
switch p {
case TrustCenterReferenceOrderFieldRank:
return "rank"
case TrustCenterReferenceOrderFieldName:
return "name"
case TrustCenterReferenceOrderFieldCreatedAt:

8
pkg/probo/trust_center_reference_service.go
View File

@@ -52,6 +52,7 @@ type (
Description *string
WebsiteURL *string
LogoFile *File
Rank *int
}
DeleteTrustCenterReferenceRequest struct {
@@ -229,6 +230,13 @@ func (s TrustCenterReferenceService) Update(
}
reference.UpdatedAt = now
if req.Rank != nil {
reference.Rank = *req.Rank
if err := reference.UpdateRank(ctx, tx, s.svc.scope); err != nil {
return fmt.Errorf("cannot update rank: %w", err)
}
}
if err := reference.Update(ctx, tx, s.svc.scope); err != nil {
return fmt.Errorf("cannot update trust center reference: %w", err)
}

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

@@ -1173,6 +1173,10 @@ enum TrustCenterReferenceOrderField
@goModel(
model: "github.com/getprobo/probo/pkg/coredata.TrustCenterReferenceOrderField"
) {
RANK
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.TrustCenterReferenceOrderFieldRank"
)
NAME
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.TrustCenterReferenceOrderFieldName"
@@ -2461,6 +2465,7 @@ type TrustCenterReference implements Node {
description: String!
websiteUrl: String!
logoUrl: String! @goField(forceResolver: true)
rank: Int!
createdAt: Datetime!
updatedAt: Datetime!
}
@@ -3252,6 +3257,7 @@ input UpdateTrustCenterReferenceInput {
description: String
websiteUrl: String
logoFile: Upload
rank: Int
}
input DeleteTrustCenterReferenceInput {

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

@@ -1366,6 +1366,7 @@ type ComplexityRoot struct {
ID func(childComplexity int) int
LogoURL func(childComplexity int) int
Name func(childComplexity int) int
Rank func(childComplexity int) int
UpdatedAt func(childComplexity int) int
WebsiteURL func(childComplexity int) int
}
@@ -7937,6 +7938,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin
return e.complexity.TrustCenterReference.Name(childComplexity), true
case "TrustCenterReference.rank":
if e.complexity.TrustCenterReference.Rank == nil {
break
}
return e.complexity.TrustCenterReference.Rank(childComplexity), true
case "TrustCenterReference.updatedAt":
if e.complexity.TrustCenterReference.UpdatedAt == nil {
break
@@ -10491,6 +10499,10 @@ enum TrustCenterReferenceOrderField
@goModel(
model: "github.com/getprobo/probo/pkg/coredata.TrustCenterReferenceOrderField"
) {
RANK
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.TrustCenterReferenceOrderFieldRank"
)
NAME
@goEnum(
value: "github.com/getprobo/probo/pkg/coredata.TrustCenterReferenceOrderFieldName"
@@ -11779,6 +11791,7 @@ type TrustCenterReference implements Node {
description: String!
websiteUrl: String!
logoUrl: String! @goField(forceResolver: true)
rank: Int!
createdAt: Datetime!
updatedAt: Datetime!
}
@@ -12570,6 +12583,7 @@ input UpdateTrustCenterReferenceInput {
description: String
websiteUrl: String
logoFile: Upload
rank: Int
}
input DeleteTrustCenterReferenceInput {
@@ -59663,6 +59677,50 @@ func (ec *executionContext) fieldContext_TrustCenterReference_logoUrl(_ context.
return fc, nil
}
func (ec *executionContext) _TrustCenterReference_rank(ctx context.Context, field graphql.CollectedField, obj *types.TrustCenterReference) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_TrustCenterReference_rank(ctx, field)
if err != nil {
return graphql.Null
}
ctx = graphql.WithFieldContext(ctx, fc)
defer func() {
if r := recover(); r != nil {
ec.Error(ctx, ec.Recover(ctx, r))
ret = graphql.Null
}
}()
resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
ctx = rctx // use context from middleware stack in children
return obj.Rank, nil
})
if err != nil {
ec.Error(ctx, err)
return graphql.Null
}
if resTmp == nil {
if !graphql.HasFieldError(ctx, fc) {
ec.Errorf(ctx, "must not be null")
}
return graphql.Null
}
res := resTmp.(int)
fc.Result = res
return ec.marshalNInt2int(ctx, field.Selections, res)
}
func (ec *executionContext) fieldContext_TrustCenterReference_rank(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
fc = &graphql.FieldContext{
Object: "TrustCenterReference",
Field: field,
IsMethod: false,
IsResolver: false,
Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
return nil, errors.New("field of type Int does not have child fields")
},
}
return fc, nil
}
func (ec *executionContext) _TrustCenterReference_createdAt(ctx context.Context, field graphql.CollectedField, obj *types.TrustCenterReference) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_TrustCenterReference_createdAt(ctx, field)
if err != nil {
@@ -59992,6 +60050,8 @@ func (ec *executionContext) fieldContext_TrustCenterReferenceEdge_node(_ context
return ec.fieldContext_TrustCenterReference_websiteUrl(ctx, field)
case "logoUrl":
return ec.fieldContext_TrustCenterReference_logoUrl(ctx, field)
case "rank":
return ec.fieldContext_TrustCenterReference_rank(ctx, field)
case "createdAt":
return ec.fieldContext_TrustCenterReference_createdAt(ctx, field)
case "updatedAt":
@@ -61510,6 +61570,8 @@ func (ec *executionContext) fieldContext_UpdateTrustCenterReferencePayload_trust
return ec.fieldContext_TrustCenterReference_websiteUrl(ctx, field)
case "logoUrl":
return ec.fieldContext_TrustCenterReference_logoUrl(ctx, field)
case "rank":
return ec.fieldContext_TrustCenterReference_rank(ctx, field)
case "createdAt":
return ec.fieldContext_TrustCenterReference_createdAt(ctx, field)
case "updatedAt":
@@ -76457,7 +76519,7 @@ func (ec *executionContext) unmarshalInputUpdateTrustCenterReferenceInput(ctx co
asMap[k] = v
}
fieldsInOrder := [...]string{"id", "name", "description", "websiteUrl", "logoFile"}
fieldsInOrder := [...]string{"id", "name", "description", "websiteUrl", "logoFile", "rank"}
for _, k := range fieldsInOrder {
v, ok := asMap[k]
if !ok {
@@ -76499,6 +76561,13 @@ func (ec *executionContext) unmarshalInputUpdateTrustCenterReferenceInput(ctx co
return it, err
}
it.LogoFile = data
case "rank":
ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("rank"))
data, err := ec.unmarshalOInt2ᚖint(ctx, v)
if err != nil {
return it, err
}
it.Rank = data
}
}
@@ -91027,6 +91096,11 @@ func (ec *executionContext) _TrustCenterReference(ctx context.Context, sel ast.S
}
out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) })
case "rank":
out.Values[i] = ec._TrustCenterReference_rank(ctx, field, obj)
if out.Values[i] == graphql.Null {
atomic.AddUint32(&out.Invalids, 1)
}
case "createdAt":
out.Values[i] = ec._TrustCenterReference_createdAt(ctx, field, obj)
if out.Values[i] == graphql.Null {
@@ -101438,11 +101512,13 @@ func (ec *executionContext) marshalNTrustCenterReferenceOrderField2githubᚗcom
var (
unmarshalNTrustCenterReferenceOrderField2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐTrustCenterReferenceOrderField = map[string]coredata.TrustCenterReferenceOrderField{
"RANK": coredata.TrustCenterReferenceOrderFieldRank,
"NAME": coredata.TrustCenterReferenceOrderFieldName,
"CREATED_AT": coredata.TrustCenterReferenceOrderFieldCreatedAt,
"UPDATED_AT": coredata.TrustCenterReferenceOrderFieldUpdatedAt,
}
marshalNTrustCenterReferenceOrderField2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐTrustCenterReferenceOrderField = map[coredata.TrustCenterReferenceOrderField]string{
coredata.TrustCenterReferenceOrderFieldRank: "RANK",
coredata.TrustCenterReferenceOrderFieldName: "NAME",
coredata.TrustCenterReferenceOrderFieldCreatedAt: "CREATED_AT",
coredata.TrustCenterReferenceOrderFieldUpdatedAt: "UPDATED_AT",

1
pkg/server/api/console/v1/types/trust_center_reference.go
View File

@@ -35,6 +35,7 @@ func NewTrustCenterReference(tcc *coredata.TrustCenterReference) *TrustCenterRef
Name: tcc.Name,
Description: tcc.Description,
WebsiteURL: tcc.WebsiteURL,
Rank: tcc.Rank,
CreatedAt: tcc.CreatedAt,
UpdatedAt: tcc.UpdatedAt,
}

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

@@ -1734,6 +1734,7 @@ type TrustCenterReference struct {
Description string `json:"description"`
WebsiteURL string `json:"websiteUrl"`
LogoURL string `json:"logoUrl"`
Rank int `json:"rank"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
}
@@ -2024,6 +2025,7 @@ type UpdateTrustCenterReferenceInput struct {
Description *string `json:"description,omitempty"`
WebsiteURL *string `json:"websiteUrl,omitempty"`
LogoFile *graphql.Upload `json:"logoFile,omitempty"`
Rank *int `json:"rank,omitempty"`
}
type UpdateTrustCenterReferencePayload struct {

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

@@ -1341,7 +1341,7 @@ func (r *mutationResolver) CreateTrustCenterReference(ctx context.Context, input
}
return &types.CreateTrustCenterReferencePayload{
TrustCenterReferenceEdge: types.NewTrustCenterReferenceEdge(reference, coredata.TrustCenterReferenceOrderFieldCreatedAt),
TrustCenterReferenceEdge: types.NewTrustCenterReferenceEdge(reference, coredata.TrustCenterReferenceOrderFieldRank),
}, nil
}
@@ -1354,6 +1354,7 @@ func (r *mutationResolver) UpdateTrustCenterReference(ctx context.Context, input
Name: input.Name,
Description: input.Description,
WebsiteURL: input.WebsiteURL,
Rank: input.Rank,
}
if input.LogoFile != nil {
@@ -4944,7 +4945,7 @@ func (r *trustCenterResolver) References(ctx context.Context, obj *types.TrustCe
prb := r.ProboService(ctx, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.TrustCenterReferenceOrderField]{
Field: coredata.TrustCenterReferenceOrderFieldName,
Field: coredata.TrustCenterReferenceOrderFieldRank,
Direction: page.OrderDirectionAsc,
}
if orderBy != nil {

4
pkg/server/api/trust/v1/v1_resolver.go
View File

@@ -891,8 +891,8 @@ func (r *trustCenterResolver) References(ctx context.Context, obj *types.TrustCe
publicTrustService := r.PublicTrustService(ctx, obj.ID.TenantID())
pageOrderBy := page.OrderBy[coredata.TrustCenterReferenceOrderField]{
Field: coredata.TrustCenterReferenceOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
Field: coredata.TrustCenterReferenceOrderFieldRank,
Direction: page.OrderDirectionAsc,
}
cursor := types.NewCursor(first, after, last, before, pageOrderBy)