Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
*.log
*.out
*.http
.DS_Store
.DS_Store
treehole_next
21 changes: 18 additions & 3 deletions apis/floor/apis.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ func ListFloorsInAHole(c *fiber.Ctx) error {
return err
}

// Check raw query parameters before validation applies defaults
rawSize := c.Query("size")
rawOffset := c.Query("offset")

var query ListModel
err = common.ValidateQuery(c, &query)
if err != nil {
Expand All @@ -43,9 +47,20 @@ func ListFloorsInAHole(c *fiber.Ctx) error {
// get floors
var floors Floors
// use ranking field to locate faster
querySet, err := floors.MakeQuerySet(&holeID, &query.Offset, &query.Size, c)
if err != nil {
return err
var querySet *gorm.DB
// Special case: if both size and offset are explicitly set to 0, return all floors
// This matches the behavior of ListFloorsOld for backward compatibility
// When validation applies defaults, size=0 becomes size=30, so we check raw query params
if rawSize == "0" && rawOffset == "0" {
querySet, err = floors.MakeQuerySet(&holeID, nil, nil, c)
if err != nil {
return err
}
} else {
querySet, err = floors.MakeQuerySet(&holeID, &query.Offset, &query.Size, c)
if err != nil {
return err
}
}
result := querySet.Order(query.OrderBy + " " + query.Sort).
Find(&floors)
Expand Down
9 changes: 9 additions & 0 deletions tests/floor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ func TestListFloorsInAHole(t *testing.T) {
if len(floors) != 0 {
assert.EqualValues(t, strings.Repeat("1", offset+1), floors[0].Content)
}

// size=0 and offset=0 should return all floors
// The first test hole has 50 floors (see initTestFloors in tests/init.go)
data = Map{"size": 0, "offset": 0}
testAPIModelWithQuery(t, "get", "/api/holes/"+strconv.Itoa(hole.ID)+"/floors", 200, &floors, data)
assert.EqualValues(t, 50, len(floors))
if len(floors) != 0 {
assert.EqualValues(t, "1", floors[0].Content)
}
}

func TestListFloorsOld(t *testing.T) {
Expand Down
Loading