feat: added support for limits and offsets (#20)

* feat: added support for limits and offsets * Commit from GitHub Actions (CI) --------- Co-authored-by: brittonhayes <[email protected]>
brittonhayes · Jul 31, 2023 · 80c2944 · 80c2944
1 parent 725fae9
commit 80c2944
Show file tree

Hide file tree

Showing 7 changed files with 210 additions and 33 deletions.
diff --git a/api/api.gen.go b/api/api.gen.go
diff --git a/api/openapi.yaml b/api/openapi.yaml
@@ -37,6 +37,18 @@ paths:
       description: Get all allegiances
       operationId: getAllegiances
       parameters:
+      - name: limit
+        in: query
+        description: number of allegiances to return
+        required: false
+        schema:
+          type: integer
+      - name: offset 
+        in: query
+        description: number of allegiances to skip
+        required: false
+        schema:
+          type: integer
       - name: name
         in: query
         description: name of allegiance to filter by
@@ -140,6 +152,18 @@ paths:
       description: Get all cities
       operationId: getCities
       parameters:
+      - name: limit
+        in: query
+        description: number of cities to return
+        required: false
+        schema:
+          type: integer
+      - name: offset 
+        in: query
+        description: number of cities to skip
+        required: false
+        schema:
+          type: integer
       - name: name
         in: query
         description: name of city to filter by
@@ -301,6 +325,18 @@ paths:
       description: Get all units
       operationId: getUnits
       parameters:
+      - name: limit
+        in: query
+        description: number of units to return
+        required: false
+        schema:
+          type: integer
+      - name: offset 
+        in: query
+        description: number of units to skip
+        required: false
+        schema:
+          type: integer
       - name: name
         in: query
         description: name of unit to filter by
@@ -424,6 +460,18 @@ paths:
       description: Get all warscrolls
       operationId: getWarscrolls
       parameters:
+      - name: limit
+        in: query
+        description: number of warscrolls to return
+        required: false
+        schema:
+          type: integer
+      - name: offset
+        in: query
+        description: number of warscrolls to skip
+        required: false
+        schema:
+          type: integer
       - name: name
         in: query
         description: name of warscroll to filter by

diff --git a/sqlite/allegiance.go b/sqlite/allegiance.go
@@ -22,6 +22,14 @@ func (r *repository) allegiancesFilterQuery(query *bun.SelectQuery, params *api.
 		return query, nil
 	}
 
+	if params.Limit != nil {
+		query = query.Limit(*params.Limit)
+	}
+
+	if params.Offset != nil {
+		query = query.Offset(*params.Offset)
+	}
+
 	if params.GrandAlliance != nil {
 		query = query.Where("grand_alliance = ?", params.GrandAlliance)
 	}

diff --git a/sqlite/city.go b/sqlite/city.go
@@ -12,6 +12,14 @@ func (r *repository) citiesFilterQuery(query *bun.SelectQuery, params *api.GetCi
 		return query, nil
 	}
 
+	if params.Limit != nil {
+		query = query.Limit(*params.Limit)
+	}
+
+	if params.Offset != nil {
+		query = query.Offset(*params.Offset)
+	}
+
 	if params.Name != nil {
 		query = query.Where("? LIKE ?", bun.Ident("name"), *params.Name+"%")
 	}

diff --git a/sqlite/unit.go b/sqlite/unit.go
@@ -22,6 +22,14 @@ func (r *repository) unitsFilterQuery(query *bun.SelectQuery, params *api.GetUni
 		return query, nil
 	}
 
+	if params.Limit != nil {
+		query = query.Limit(*params.Limit)
+	}
+
+	if params.Offset != nil {
+		query = query.Offset(*params.Offset)
+	}
+
 	if params.Name != nil {
 		query = query.Where("? LIKE ?", bun.Ident("name"), *params.Name+"%")
 	}

diff --git a/sqlite/warscroll.go b/sqlite/warscroll.go
@@ -12,6 +12,14 @@ func (r *repository) warscrollFilterQuery(query *bun.SelectQuery, params *api.Ge
 		return query, nil
 	}
 
+	if params.Limit != nil {
+		query = query.Limit(*params.Limit)
+	}
+
+	if params.Offset != nil {
+		query = query.Offset(*params.Offset)
+	}
+
 	if params.Name != nil {
 		query = query.Where("? LIKE ?", bun.Ident("name"), *params.Name+"%")
 	}