fix: remove duplicate filterQuery parameter and regenerate OpenAPI files

Signed-off-by: Sidney Glinton <[email protected]>

Author: syntaxsdev

catalog/internal/server/openapi/api.go

@@ -33,7 +33,7 @@ type ModelCatalogServiceAPIRouter interface {
 // while the service implementation can be ignored with the .openapi-generator-ignore file
 // and updated with the logic required for the API.
 type ModelCatalogServiceAPIServicer interface {
-	FindModels(context.Context, []string, string, string, string, model.OrderByField, model.SortOrder, string, string) (ImplResponse, error)
+	FindModels(context.Context, []string, string, string, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
 	FindModelsFilterOptions(context.Context) (ImplResponse, error)
 	FindSources(context.Context, string, string, model.OrderByField, model.SortOrder, string) (ImplResponse, error)
 	GetAllModelArtifacts(context.Context, string, string, string, model.OrderByField, model.SortOrder, string, string) (ImplResponse, error)

catalog/internal/server/openapi/api_model_catalog_service.go

@@ -86,12 +86,12 @@ func (c *ModelCatalogServiceAPIController) FindModels(w http.ResponseWriter, r *
 	sourceParam := strings.Split(query.Get("source"), ",")
 	sourceLabelParam := query.Get("sourceLabel")
 	qParam := query.Get("q")
+	filterQueryParam := query.Get("filterQuery")
 	pageSizeParam := query.Get("pageSize")
 	orderByParam := query.Get("orderBy")
 	sortOrderParam := query.Get("sortOrder")
 	nextPageTokenParam := query.Get("nextPageToken")
-	filterQueryParam := query.Get("filterQuery")
-	result, err := c.service.FindModels(r.Context(), sourceParam, sourceLabelParam, qParam, pageSizeParam, model.OrderByField(orderByParam), model.SortOrder(sortOrderParam), nextPageTokenParam, filterQueryParam)
+	result, err := c.service.FindModels(r.Context(), sourceParam, sourceLabelParam, qParam, filterQueryParam, pageSizeParam, model.OrderByField(orderByParam), model.SortOrder(sortOrderParam), nextPageTokenParam)
 	// If an error occurred, encode the error with the status code
 	if err != nil {
 		c.errorHandler(w, r, err, &result)

catalog/internal/server/openapi/api_model_catalog_service_service.go

@@ -64,7 +64,7 @@ func (m *ModelCatalogServiceAPIService) GetAllModelArtifacts(ctx context.Context
 	return Response(http.StatusOK, artifacts), nil
 }
 
-func (m *ModelCatalogServiceAPIService) FindModels(ctx context.Context, sourceIDs []string, sourceLabel string, q string, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string, filterQuery string) (ImplResponse, error) {
+func (m *ModelCatalogServiceAPIService) FindModels(ctx context.Context, sourceIDs []string, sourceLabel string, q string, filterQuery string, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string) (ImplResponse, error) {
 	var err error
 	pageSizeInt := int32(10)
 

catalog/internal/server/openapi/api_model_catalog_service_service_test.go

@@ -307,11 +307,11 @@ func TestFindModels(t *testing.T) {
 				[]string{tc.sourceID},
 				"", // sourceLabel
 				tc.q,
+				tc.filterQuery,
 				tc.pageSize,
 				tc.orderBy,
 				tc.sortOrder,
 				tc.nextPageToken,
-				tc.filterQuery,
 			)
 
 			assert.Equal(t, tc.expectedStatus, resp.Code)

catalog/internal/server/openapi/type_asserts.go

@@ -283,10 +283,8 @@ func AssertFilterOptionRequired(obj model.FilterOption) error {
 		}
 	}
 
-	if obj.Range != nil {
-		if err := AssertFilterOptionRangeRequired(*obj.Range); err != nil {
-			return err
-		}
+	if err := AssertFilterOptionRangeRequired(obj.Range); err != nil {
+		return err
 	}
 	return nil
 }