Skip to content

[raft/scd] Extract get and query constraint #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mickmis merged 1 commit into from
Aug 31, 2026
Merged

[raft/scd] Extract get and query constraint #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions pkg/scd/actions/constraint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,87 @@ func init() {
Decode: dssstore.DecodeJSON[*restapi.DeleteConstraintReferenceRequest],
Execute: ExecuteDeleteConstraint,
}
Registry[restapi.GetConstraintReferenceOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.GetConstraintReferenceRequest],
Execute: ExecuteGetConstraint,
IsReadOnly: true,
}
Registry[restapi.QueryConstraintReferencesOperationID] = dssstore.OperationHandler[repos.Repository]{
Encode: dssstore.EncodeJSON,
Decode: dssstore.DecodeJSON[*restapi.QueryConstraintReferencesRequest],
Execute: ExecuteQueryConstraintReferences,
IsReadOnly: true,
}
}

func ExecuteGetConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.GetConstraintReferenceRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.GetConstraintReferenceOperationID)
}

id, err := dssmodels.IDFromString(string(req.Entityid))
if err != nil {
return nil, stacktrace.NewErrorWithCode(dsserr.BadRequest, "Invalid ID format: `%s`", req.Entityid)
}

constraint, err := repo.GetConstraint(ctx, id)
switch {
case err == pgx.ErrNoRows:
return nil, stacktrace.NewErrorWithCode(dsserr.NotFound, "Constraint %s not found", id.String())
case err != nil:
return nil, stacktrace.Propagate(err, "Unable to get Constraint from repo")
}

if constraint.Manager != dssmodels.Manager(*req.Auth.ClientID) {
constraint.OVN = scdmodels.NoOvnPhrase
}

// Return response to client
return &restapi.GetConstraintReferenceResponse{
ConstraintReference: *constraint.ToRest(),
}, nil
}

func ExecuteQueryConstraintReferences(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
req, ok := request.(*restapi.QueryConstraintReferencesRequest)
if !ok {
return nil, stacktrace.NewError("unexpected request type %T for operation %q", request, restapi.QueryConstraintReferencesOperationID)
}

// Retrieve the area of interest parameter
aoi := req.Body.AreaOfInterest
if aoi == nil {
return nil, stacktrace.NewErrorWithCode(dsserr.BadRequest, "Missing area_of_interest")
}

// Parse area of interest to common Volume4D
vol4, err := scdmodels.Volume4DFromSCDRest(aoi)
if err != nil {
return nil, stacktrace.PropagateWithCode(err, dsserr.BadRequest, "Failed to convert to internal geometry model")
}

// Perform search query on Store
constraints, err := repo.SearchConstraints(ctx, vol4)
if err != nil {
return nil, err
}

// Create response for client
response := &restapi.QueryConstraintReferencesResponse{
ConstraintReferences: make([]restapi.ConstraintReference, 0, len(constraints)),
}
for _, constraint := range constraints {
p := constraint.ToRest()
if constraint.Manager != dssmodels.Manager(*req.Auth.ClientID) {
noOvnPhrase := restapi.EntityOVN(scdmodels.NoOvnPhrase)
p.Ovn = &noOvnPhrase
}
response.ConstraintReferences = append(response.ConstraintReferences, *p)
}

return response, nil
}

func ExecuteDeleteConstraint(ctx context.Context, repo repos.Repository, request dssstore.OperationRequest) (any, error) {
Expand Down
54 changes: 4 additions & 50 deletions pkg/scd/constraints_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (a *Server) DeleteConstraintReference(ctx context.Context, req *restapi.Del
func (a *Server) GetConstraintReference(ctx context.Context, req *restapi.GetConstraintReferenceRequest,
) restapi.GetConstraintReferenceResponseSet {

id, err := dssmodels.IDFromString(string(req.Entityid))
_, err := dssmodels.IDFromString(string(req.Entityid))
if err != nil {
return restapi.GetConstraintReferenceResponseSet{Response400: &restapi.ErrorResponse{
Message: dsserr.Handle(ctx, stacktrace.NewErrorWithCode(dsserr.BadRequest, "Invalid ID format: `%s`", req.Entityid))}}
Expand All @@ -77,29 +77,7 @@ func (a *Server) GetConstraintReference(ctx context.Context, req *restapi.GetCon
Message: dsserr.Handle(ctx, stacktrace.NewErrorWithCode(dsserr.PermissionDenied, "Missing manager"))}}
}

var response *restapi.GetConstraintReferenceResponse
action := func(ctx context.Context, r repos.Repository) (err error) {
constraint, err := r.GetConstraint(ctx, id)
switch {
case err == pgx.ErrNoRows:
return stacktrace.NewErrorWithCode(dsserr.NotFound, "Constraint %s not found", id.String())
case err != nil:
return stacktrace.Propagate(err, "Unable to get Constraint from repo")
}

if constraint.Manager != dssmodels.Manager(*req.Auth.ClientID) {
constraint.OVN = scdmodels.NoOvnPhrase
}

// Return response to client
response = &restapi.GetConstraintReferenceResponse{
ConstraintReference: *constraint.ToRest(),
}

return nil
}

_, err = a.Store.Transact(ctx, dssstore.NewFuncOperation(action))
response, err := dssstore.TransactWithResult[repos.Repository, *restapi.GetConstraintReferenceResponse](ctx, a.Store, req)
if err != nil {
err = stacktrace.Propagate(err, "Could not get constraint")
if stacktrace.GetCode(err) == dsserr.NotFound {
Expand Down Expand Up @@ -355,37 +333,13 @@ func (a *Server) QueryConstraintReferences(ctx context.Context, req *restapi.Que
}

// Parse area of interest to common Volume4D
vol4, err := scdmodels.Volume4DFromSCDRest(aoi)
_, err := scdmodels.Volume4DFromSCDRest(aoi)
if err != nil {
return restapi.QueryConstraintReferencesResponseSet{Response400: &restapi.ErrorResponse{
Message: dsserr.Handle(ctx, stacktrace.PropagateWithCode(err, dsserr.BadRequest, "Failed to convert to internal geometry model"))}}
}

var response *restapi.QueryConstraintReferencesResponse
action := func(ctx context.Context, r repos.Repository) (err error) {
// Perform search query on Store
constraints, err := r.SearchConstraints(ctx, vol4)
if err != nil {
return err
}

// Create response for client
response = &restapi.QueryConstraintReferencesResponse{
ConstraintReferences: make([]restapi.ConstraintReference, 0, len(constraints)),
}
for _, constraint := range constraints {
p := constraint.ToRest()
if constraint.Manager != dssmodels.Manager(*req.Auth.ClientID) {
noOvnPhrase := restapi.EntityOVN(scdmodels.NoOvnPhrase)
p.Ovn = &noOvnPhrase
}
response.ConstraintReferences = append(response.ConstraintReferences, *p)
}

return nil
}

_, err = a.Store.Transact(ctx, dssstore.NewFuncOperation(action))
response, err := dssstore.TransactWithResult[repos.Repository, *restapi.QueryConstraintReferencesResponse](ctx, a.Store, req)
if err != nil {
return restapi.QueryConstraintReferencesResponseSet{Response500: &api.InternalServerErrorBody{
ErrorMessage: *dsserr.Handle(ctx, stacktrace.Propagate(err, "Got an unexpected error"))}}
Expand Down
Loading