feature. apply filter to list api.

api/swagger/docs.go

@@ -7469,6 +7469,9 @@ const docTemplate = `{
         "domain.GetProjectMembersResponse": {
             "type": "object",
             "properties": {
+                "pagination": {
+                    "$ref": "#/definitions/domain.PaginationResponse"
+                },
                 "projectMembers": {
                     "type": "array",
                     "items": {
@@ -7534,6 +7537,9 @@ const docTemplate = `{
         "domain.GetProjectsResponse": {
             "type": "object",
             "properties": {
+                "pagination": {
+                    "$ref": "#/definitions/domain.PaginationResponse"
+                },
                 "projects": {
                     "type": "array",
                     "items": {

api/swagger/swagger.json

@@ -7463,6 +7463,9 @@
         "domain.GetProjectMembersResponse": {
             "type": "object",
             "properties": {
+                "pagination": {
+                    "$ref": "#/definitions/domain.PaginationResponse"
+                },
                 "projectMembers": {
                     "type": "array",
                     "items": {
@@ -7528,6 +7531,9 @@
         "domain.GetProjectsResponse": {
             "type": "object",
             "properties": {
+                "pagination": {
+                    "$ref": "#/definitions/domain.PaginationResponse"
+                },
                 "projects": {
                     "type": "array",
                     "items": {

api/swagger/swagger.yaml

@@ -1380,6 +1380,8 @@ definitions:
     type: object
   domain.GetProjectMembersResponse:
     properties:
+      pagination:
+        $ref: '#/definitions/domain.PaginationResponse'
       projectMembers:
         items:
           $ref: '#/definitions/domain.ProjectMemberResponse'
@@ -1421,6 +1423,8 @@ definitions:
     type: object
   domain.GetProjectsResponse:
     properties:
+      pagination:
+        $ref: '#/definitions/domain.PaginationResponse'
       projects:
         items:
           $ref: '#/definitions/domain.ProjectResponse'

internal/delivery/http/alert.go

@@ -95,11 +95,7 @@ func (h *AlertHandler) GetAlerts(w http.ResponseWriter, r *http.Request) {
 	}
 
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 	// convert status
 	for i, filter := range pg.GetFilters() {
 		if filter.Column == "status" {
@@ -143,18 +139,9 @@ func (h *AlertHandler) GetAlerts(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
-	/*
-		outFilters := make([]domain.FilterResponse, len(pg.Filters))
-		for j, filter := range pg.Filters {
-			if err := serializer.Map(filter, &outFilters[j]); err != nil {
-				log.InfoWithContext(r.Context(), err)
-			}
-		}
-		out.Pagination.Filters = outFilters
-	*/
 
 	ResponseJSON(w, r, http.StatusOK, out)
 }

internal/delivery/http/app-group.go

@@ -82,11 +82,7 @@ func (h *AppGroupHandler) GetAppGroups(w http.ResponseWriter, r *http.Request) {
 		ErrorJSON(w, r, httpErrors.NewBadRequestError(fmt.Errorf("Invalid clusterId"), "C_INVALID_CLUSTER_ID", ""))
 		return
 	}
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 
 	appGroups, err := h.usecase.Fetch(r.Context(), domain.ClusterId(clusterId), pg)
 	if err != nil {
@@ -103,7 +99,7 @@ func (h *AppGroupHandler) GetAppGroups(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
 

internal/delivery/http/app-serve-app.go

@@ -253,12 +253,7 @@ func (h *AppServeAppHandler) GetAppServeApps(w http.ResponseWriter, r *http.Requ
 		ErrorJSON(w, r, err)
 		return
 	}
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
-
+	pg := pagination.NewPagination(&urlParams)
 	apps, err := h.usecase.GetAppServeApps(organizationId, showAll, pg)
 	if err != nil {
 		log.ErrorWithContext(r.Context(), "Failed to get Failed to get app-serve-apps ", err)
@@ -269,7 +264,7 @@ func (h *AppServeAppHandler) GetAppServeApps(w http.ResponseWriter, r *http.Requ
 	var out domain.GetAppServeAppsResponse
 	out.AppServeApps = apps
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
 
@@ -452,11 +447,7 @@ func (h *AppServeAppHandler) GetAppServeAppTasksByAppId(w http.ResponseWriter, r
 	}
 
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 
 	tasks, err := h.usecase.GetAppServeAppTasks(appId, pg)
 	if err != nil {
@@ -468,7 +459,7 @@ func (h *AppServeAppHandler) GetAppServeAppTasksByAppId(w http.ResponseWriter, r
 	var out domain.GetAppServeAppTasksResponse
 	out.AppServeAppTasks = tasks
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
 

internal/delivery/http/audit.go

@@ -63,12 +63,7 @@ func (h *AuditHandler) GetAudits(w http.ResponseWriter, r *http.Request) {
 	}
 
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
-
+	pg := pagination.NewPagination(&urlParams)
 	audits, err := h.usecase.Fetch(r.Context(), organizationId, pg)
 	if err != nil {
 		ErrorJSON(w, r, err)

internal/delivery/http/cloud-account.go

@@ -94,11 +94,7 @@ func (h *CloudAccountHandler) GetCloudAccounts(w http.ResponseWriter, r *http.Re
 	}
 
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 	cloudAccounts, err := h.usecase.Fetch(r.Context(), organizationId, pg)
 	if err != nil {
 		ErrorJSON(w, r, err)
@@ -114,7 +110,7 @@ func (h *CloudAccountHandler) GetCloudAccounts(w http.ResponseWriter, r *http.Re
 		}
 	}
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
 

internal/delivery/http/cluster.go

@@ -43,11 +43,7 @@ func (h *ClusterHandler) GetClusters(w http.ResponseWriter, r *http.Request) {
 	urlParams := r.URL.Query()
 
 	organizationId := urlParams.Get("organizationId")
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 	clusters, err := h.usecase.Fetch(r.Context(), organizationId, pg)
 	if err != nil {
 		ErrorJSON(w, r, err)
@@ -63,7 +59,7 @@ func (h *ClusterHandler) GetClusters(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
 

internal/delivery/http/organization.go

@@ -91,12 +91,7 @@ func (h *OrganizationHandler) CreateOrganization(w http.ResponseWriter, r *http.
 // @Security    JWT
 func (h *OrganizationHandler) GetOrganizations(w http.ResponseWriter, r *http.Request) {
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
-
+	pg := pagination.NewPagination(&urlParams)
 	organizations, err := h.usecase.Fetch(pg)
 	if err != nil {
 		log.ErrorfWithContext(r.Context(), "error is :%s(%T)", err.Error(), err)
@@ -116,7 +111,7 @@ func (h *OrganizationHandler) GetOrganizations(w http.ResponseWriter, r *http.Re
 		log.InfoWithContext(r.Context(), organization)
 	}
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}
 

internal/delivery/http/project.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/openinfradev/tks-api/internal/middleware/auth/request"
+	"github.com/openinfradev/tks-api/internal/pagination"
 	"github.com/openinfradev/tks-api/internal/serializer"
 
 	"github.com/gorilla/mux"
@@ -168,20 +169,28 @@ func (p ProjectHandler) GetProjects(w http.ResponseWriter, r *http.Request) {
 		onlyMyProject = true
 	}
 
+	pg := pagination.NewPagination(&urlParams)
+
 	// get myUserId from login component
 	requestUserInfo, ok := request.UserFrom(r.Context())
 	myUserId := requestUserInfo.GetUserId().String()
-	pr, err := p.usecase.GetProjects(organizationId, myUserId, onlyMyProject)
+	pr, err := p.usecase.GetProjects(organizationId, myUserId, onlyMyProject, pg)
 	if err != nil {
 		log.ErrorWithContext(r.Context(), "Failed to retrieve projects ", err)
 		ErrorJSON(w, r, err)
 		return
 	}
 
+	var out domain.GetProjectsResponse
+	out.Projects = pr
+	if out.Pagination, err = pg.Response(); err != nil {
+		log.InfoWithContext(r.Context(), err)
+	}
+
 	if pr == nil {
 		ResponseJSON(w, r, http.StatusNotFound, domain.GetProjectsResponse{})
 	} else {
-		ResponseJSON(w, r, http.StatusOK, pr)
+		ResponseJSON(w, r, http.StatusOK, out)
 	}
 }
 
@@ -483,7 +492,9 @@ func (p ProjectHandler) AddProjectMember(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId)
+	urlParams := r.URL.Query()
+	pg := pagination.NewPagination(&urlParams)
+	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId, pg)
 	if err != nil {
 		log.Error(err)
 		ErrorJSON(w, r, httpErrors.NewInternalServerError(err, "", ""))
@@ -660,7 +671,8 @@ func (p ProjectHandler) GetProjectMembers(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	pms, err := p.usecase.GetProjectMembers(projectId, query)
+	pg := pagination.NewPagination(&urlParams)
+	pms, err := p.usecase.GetProjectMembers(projectId, query, pg)
 	if err != nil {
 		log.ErrorWithContext(r.Context(), "Failed to get project members ", err)
 		ErrorJSON(w, r, err)
@@ -692,6 +704,10 @@ func (p ProjectHandler) GetProjectMembers(w http.ResponseWriter, r *http.Request
 	}
 
 	out = domain.GetProjectMembersResponse{ProjectMembers: pmrs}
+	if out.Pagination, err = pg.Response(); err != nil {
+		log.InfoWithContext(r.Context(), err)
+	}
+
 	ResponseJSON(w, r, http.StatusOK, out)
 }
 
@@ -776,7 +792,7 @@ func (p ProjectHandler) RemoveProjectMember(w http.ResponseWriter, r *http.Reque
 	}
 
 	// tasks for keycloak & k8s
-	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId)
+	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId, nil)
 	if err != nil {
 		log.Error(err)
 		ErrorJSON(w, r, httpErrors.NewInternalServerError(err, "", ""))
@@ -839,7 +855,7 @@ func (p ProjectHandler) RemoveProjectMembers(w http.ResponseWriter, r *http.Requ
 	}
 
 	// tasks for keycloak & k8s
-	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId)
+	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId, nil)
 	if err != nil {
 		log.Error(err)
 		ErrorJSON(w, r, httpErrors.NewInternalServerError(err, "", ""))
@@ -926,7 +942,7 @@ func (p ProjectHandler) UpdateProjectMemberRole(w http.ResponseWriter, r *http.R
 		return
 	}
 
-	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId)
+	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId, nil)
 	if err != nil {
 		log.Error(err)
 		ErrorJSON(w, r, httpErrors.NewInternalServerError(err, "", ""))
@@ -1003,7 +1019,7 @@ func (p ProjectHandler) UpdateProjectMembersRole(w http.ResponseWriter, r *http.
 		return
 	}
 
-	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId)
+	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId, nil)
 	if err != nil {
 		log.Error(err)
 		ErrorJSON(w, r, httpErrors.NewInternalServerError(err, "", ""))
@@ -1197,7 +1213,9 @@ func (p ProjectHandler) GetProjectNamespaces(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId)
+	urlParams := r.URL.Query()
+	pg := pagination.NewPagination(&urlParams)
+	pns, err := p.usecase.GetProjectNamespaces(organizationId, projectId, pg)
 	if err != nil {
 		log.ErrorWithContext(r.Context(), "Failed to get project namespaces.", err)
 		ErrorJSON(w, r, err)

internal/delivery/http/stack-template.go

@@ -56,12 +56,7 @@ func (h *StackTemplateHandler) CreateStackTemplate(w http.ResponseWriter, r *htt
 // @Security    JWT
 func (h *StackTemplateHandler) GetStackTemplates(w http.ResponseWriter, r *http.Request) {
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
-
+	pg := pagination.NewPagination(&urlParams)
 	stackTemplates, err := h.usecase.Fetch(r.Context(), pg)
 	if err != nil {
 		ErrorJSON(w, r, err)

internal/delivery/http/stack.go

@@ -112,11 +112,7 @@ func (h *StackHandler) GetStacks(w http.ResponseWriter, r *http.Request) {
 	}
 
 	urlParams := r.URL.Query()
-	pg, err := pagination.NewPagination(&urlParams)
-	if err != nil {
-		ErrorJSON(w, r, httpErrors.NewBadRequestError(err, "", ""))
-		return
-	}
+	pg := pagination.NewPagination(&urlParams)
 	stacks, err := h.usecase.Fetch(r.Context(), organizationId, pg)
 	if err != nil {
 		ErrorJSON(w, r, err)
@@ -137,7 +133,7 @@ func (h *StackHandler) GetStacks(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	if err := serializer.Map(*pg, &out.Pagination); err != nil {
+	if out.Pagination, err = pg.Response(); err != nil {
 		log.InfoWithContext(r.Context(), err)
 	}