Skip to content

fix: missing query params in openapi specs #423

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
fank merged 3 commits into from
May 3, 2026
+14 −15
Merged

fix: missing query params in openapi specs #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea28db7
fix: missing query params in openapi specs
smitt14ua May 2, 2026
4a3aa05
chore: replace query params by auto-generated via context
smitt14ua May 3, 2026
8b17ece
test: fix handler and intergation tests
smitt14ua May 3, 2026
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
10 changes: 5 additions & 5 deletions internal/server/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package server
import (
"bufio"
"bytes"
"errors"
"compress/gzip"
"encoding/json"
"errors"
"fmt"
"log/slog"
"io"
"io/fs"
"log/slog"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -59,8 +59,8 @@ type Handler struct {
repoAmmo *RepoAmmo
setting Setting
jwt *JWTManager
conversionTrigger ConversionTrigger // optional, nil if conversion disabled
staticFS fs.FS // optional, nil disables static file serving
conversionTrigger ConversionTrigger // optional, nil if conversion disabled
staticFS fs.FS // optional, nil disables static file serving
maptoolMgr *maptool.JobManager // optional, nil if maptool disabled
maptoolCfg *maptoolConfig // optional, nil if maptool disabled
openIDVerifier openIDVerifier
Expand Down Expand Up @@ -214,7 +214,7 @@ func (*Handler) cacheControl(duration time.Duration) func(http.Handler) http.Han
}
}

func (h *Handler) GetOperations(c ContextNoBody) ([]Operation, error) {
func (h *Handler) GetOperations(c fuego.Context[any, Filter]) ([]Operation, error) {
ctx := c.Context()
filter := Filter{
Name: c.QueryParam("name"),
Expand Down
15 changes: 7 additions & 8 deletions internal/server/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestGetOperations(t *testing.T) {
}

t.Run("get all operations", func(t *testing.T) {
mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
req := httptest.NewRequest(http.MethodGet, "/api/v1/operations", nil)
mockCtx.SetRequest(req)

Expand All @@ -94,7 +94,7 @@ func TestGetOperations(t *testing.T) {
})

t.Run("filter by name", func(t *testing.T) {
mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
mockCtx.SetQueryParam("name", "Alpha")

result, err := hdlr.GetOperations(mockCtx)
Expand All @@ -104,7 +104,7 @@ func TestGetOperations(t *testing.T) {
})

t.Run("filter by tag", func(t *testing.T) {
mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
mockCtx.SetQueryParam("tag", "tvt")

result, err := hdlr.GetOperations(mockCtx)
Expand All @@ -114,7 +114,7 @@ func TestGetOperations(t *testing.T) {
})

t.Run("filter by date range", func(t *testing.T) {
mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
mockCtx.SetQueryParam("newer", "2026-01-18")
mockCtx.SetQueryParam("older", "2026-01-25")

Expand Down Expand Up @@ -1500,7 +1500,7 @@ func TestGetOperations_Success(t *testing.T) {

hdlr := Handler{repoOperation: repo}

mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
mockCtx.SetQueryParam("name", "Alpha")
mockCtx.SetQueryParam("tag", "coop")

Expand Down Expand Up @@ -1528,7 +1528,7 @@ func TestGetOperations_WithFilters(t *testing.T) {

hdlr := Handler{repoOperation: repo}

mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
mockCtx.SetQueryParam("older", "2026-01-15")
mockCtx.SetQueryParam("newer", "2026-01-01")

Expand Down Expand Up @@ -1749,7 +1749,7 @@ func TestGetOperations_BindError(t *testing.T) {
// Test the Select error path using closed DB
repo.db.Close()

mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})
_, err = h.GetOperations(mockCtx)
assert.Error(t, err) // Should return the DB error
}
Expand Down Expand Up @@ -2365,4 +2365,3 @@ func TestStoreOperation_EmptyFile(t *testing.T) {
h.StoreOperation(rec, req)
assert.Equal(t, http.StatusInternalServerError, rec.Code)
}

4 changes: 2 additions & 2 deletions internal/server/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"strings"
"testing"

pbv1 "github.com/OCAP2/web/pkg/schemas/protobuf/v1"
"github.com/OCAP2/web/internal/storage"
pbv1 "github.com/OCAP2/web/pkg/schemas/protobuf/v1"
"github.com/go-fuego/fuego"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -338,7 +338,7 @@ func TestIntegration_UploadWithoutConversion(t *testing.T) {

// Step 2: Query operations API and verify the operation is completed
t.Run("QueryShowsCompleted", func(t *testing.T) {
mockCtx := fuego.NewMockContextNoBody()
mockCtx := fuego.NewMockContext[any](nil, Filter{})

ops, err := hdlr.GetOperations(mockCtx)
require.NoError(t, err)
Expand Down
Loading