feat: Add repository name filter to repository listing endpoints (#11)

.gitignore

@@ -10,6 +10,7 @@
 /bin
 /dist
 # .vscode
+cmd/gitfusion-api/*_debug_*
 
 # Test binary, built with `go test -c`
 *.test

go.mod

@@ -8,7 +8,9 @@ require (
 	github.com/go-chi/chi/v5 v5.2.1
 	github.com/go-chi/httplog/v2 v2.1.1
 	github.com/google/go-github/v72 v72.0.0
+	github.com/ktrysmt/go-bitbucket v0.9.85
 	github.com/oapi-codegen/runtime v1.1.1
+	github.com/stretchr/testify v1.10.0
 	gitlab.com/gitlab-org/api/client-go v0.128.0
 	k8s.io/api v0.32.1
 	k8s.io/apimachinery v0.32.1
@@ -42,13 +44,13 @@ require (
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/ktrysmt/go-bitbucket v0.9.85 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect

internal/api/bitbucket_respositories_handler.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 
 	gferrors "github.com/KubeRocketCI/gitfusion/internal/errors"
-	"github.com/KubeRocketCI/gitfusion/internal/models"
 	"github.com/KubeRocketCI/gitfusion/internal/services"
 )
 
@@ -38,11 +37,11 @@ func (r *BitbucketRepositoryHandler) ListBitbucketRepositories(
 	ctx context.Context,
 	request ListBitbucketRepositoriesRequestObject,
 ) (ListBitbucketRepositoriesResponseObject, error) {
-	repositories, err := r.repositoriesService.ListOrganizationsRepositories(
+	repositories, err := r.repositoriesService.ListRepositories(
 		ctx,
 		request.GitServer,
-		request.Org,
-		getListOptions(request.Params.Page, request.Params.PerPage),
+		request.Owner,
+		r.getListOptions(request),
 	)
 	if err != nil {
 		return ListBitbucketRepositories400JSONResponse{
@@ -52,11 +51,18 @@ func (r *BitbucketRepositoryHandler) ListBitbucketRepositories(
 	}
 
 	return ListBitbucketRepositories200JSONResponse{
-		Repositories: repositories,
-		Pagination:   models.Pagination{}, // TODO: implement pagination after all rit providers are implemented
+		Data: repositories,
 	}, nil
 }
 
+func (r *BitbucketRepositoryHandler) getListOptions(
+	request ListBitbucketRepositoriesRequestObject,
+) services.ListOptions {
+	return services.ListOptions{
+		Name: request.Params.RepoName,
+	}
+}
+
 func (r *BitbucketRepositoryHandler) errResponse(err error) GetBitbucketRepositoryResponseObject {
 	if err == nil {
 		return GetBitbucketRepository200JSONResponse{}

internal/api/github_repositories_handler.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 
 	gferrors "github.com/KubeRocketCI/gitfusion/internal/errors"
-	"github.com/KubeRocketCI/gitfusion/internal/models"
 	"github.com/KubeRocketCI/gitfusion/internal/services"
 )
 
@@ -39,11 +38,11 @@ func (r *GitHubRepositoryHandler) ListGitHubRepositories(
 	ctx context.Context,
 	request ListGitHubRepositoriesRequestObject,
 ) (ListGitHubRepositoriesResponseObject, error) {
-	repositories, err := r.repositoriesService.ListOrganizationsRepositories(
+	repositories, err := r.repositoriesService.ListRepositories(
 		ctx,
 		request.GitServer,
-		request.Org,
-		getListOptions(request.Params.Page, request.Params.PerPage),
+		request.Owner,
+		r.getListOptions(request),
 	)
 	if err != nil {
 		return ListGitHubRepositories400JSONResponse{
@@ -53,8 +52,7 @@ func (r *GitHubRepositoryHandler) ListGitHubRepositories(
 	}
 
 	return ListGitHubRepositories200JSONResponse{
-		Repositories: repositories,
-		Pagination:   models.Pagination{}, // TODO: implement pagination after all rit providers are implemented
+		Data: repositories,
 	}, nil
 }
 
@@ -76,16 +74,10 @@ func (r *GitHubRepositoryHandler) errResponse(err error) GetGitHubRepositoryResp
 	}
 }
 
-func getListOptions(page, perPage *int) services.ListOptions {
-	listOptions := services.ListOptions{}
-
-	if page != nil {
-		listOptions.Page = page
-	}
-
-	if perPage != nil {
-		listOptions.PerPage = perPage
+func (r *GitHubRepositoryHandler) getListOptions(
+	request ListGitHubRepositoriesRequestObject,
+) services.ListOptions {
+	return services.ListOptions{
+		Name: request.Params.RepoName,
 	}
-
-	return listOptions
 }

internal/api/gitlab_repositories_handler.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 
 	gferrors "github.com/KubeRocketCI/gitfusion/internal/errors"
-	"github.com/KubeRocketCI/gitfusion/internal/models"
 	"github.com/KubeRocketCI/gitfusion/internal/services"
 )
 
@@ -39,11 +38,11 @@ func (r *GitlabRepositoryHandler) ListGitlabRepositories(
 	ctx context.Context,
 	request ListGitlabRepositoriesRequestObject,
 ) (ListGitlabRepositoriesResponseObject, error) {
-	repositories, err := r.repositoriesService.ListOrganizationsRepositories(
+	repositories, err := r.repositoriesService.ListRepositories(
 		ctx,
 		request.GitServer,
-		request.Org,
-		getListOptions(request.Params.Page, request.Params.PerPage),
+		request.Owner,
+		r.getListOptions(request),
 	)
 	if err != nil {
 		return ListGitlabRepositories400JSONResponse{
@@ -53,11 +52,16 @@ func (r *GitlabRepositoryHandler) ListGitlabRepositories(
 	}
 
 	return ListGitlabRepositories200JSONResponse{
-		Repositories: repositories,
-		Pagination:   models.Pagination{}, // TODO: implement pagination after all rit providers are implemented
+		Data: repositories,
 	}, nil
 }
 
+func (r *GitlabRepositoryHandler) getListOptions(request ListGitlabRepositoriesRequestObject) services.ListOptions {
+	return services.ListOptions{
+		Name: request.Params.RepoName,
+	}
+}
+
 func (r *GitlabRepositoryHandler) gitlabErrResponse(err error) GetGitlabRepositoryResponseObject {
 	if err == nil {
 		return GetGitlabRepository200JSONResponse{}

internal/api/oapi.yaml

@@ -3,17 +3,16 @@ info:
   version: 1.0.0
   title: GitFusion API server
 paths:
-  /api/v1/providers/github/{git-server}/{org}/repositories:
+  /api/v1/providers/github/{gitServer}/{owner}/repositories:
     get:
       summary: List organization repositories
       operationId: listGitHubRepositories
       tags:
         - Repositories
       parameters:
         - $ref: '#/components/parameters/gitServerParam'
-        - $ref: '#/components/parameters/orgParam'
-        - $ref: '#/components/parameters/pageParam'
-        - $ref: '#/components/parameters/perPageParam'
+        - $ref: '#/components/parameters/repoOwnerParam'
+        - $ref: '#/components/parameters/repoNameQueryParam'
       responses:
         '200':
           description: A list of repositories
@@ -40,16 +39,16 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /api/v1/providers/github/{git-server}/repositories/{owner}/{repo}:
+  /api/v1/providers/github/{gitServer}/repositories/{owner}/{repo}:
     get:
       summary: Get detailed information for a specific GitHub repository
       operationId: getGitHubRepository
       tags:
         - Repositories
       parameters:
         - $ref: '#/components/parameters/gitServerParam'
-        - $ref: '#/components/parameters/ownerParam'
-        - $ref: '#/components/parameters/repoParam'
+        - $ref: '#/components/parameters/repoOwnerParam'
+        - $ref: '#/components/parameters/repoNameParam'
       responses:
         '200':
           description: Detailed information about a repository
@@ -69,17 +68,16 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /api/v1/providers/gitlab/{git-server}/{org}/repositories:
+  /api/v1/providers/gitlab/{gitServer}/{owner}/repositories:
     get:
       summary: List repositories
       operationId: listGitlabRepositories
       tags:
         - Repositories
       parameters:
         - $ref: '#/components/parameters/gitServerParam'
-        - $ref: '#/components/parameters/orgParam'
-        - $ref: '#/components/parameters/pageParam'
-        - $ref: '#/components/parameters/perPageParam'
+        - $ref: '#/components/parameters/repoOwnerParam'
+        - $ref: '#/components/parameters/repoNameQueryParam'
       responses:
         '200':
           description: A list of repositories
@@ -94,16 +92,16 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /api/v1/providers/gitlab/{git-server}/repositories/{owner}/{repo}:
+  /api/v1/providers/gitlab/{gitServer}/repositories/{owner}/{repo}:
     get:
       summary: Get detailed information for a specific Gitlab repository
       operationId: getGitlabRepository
       tags:
         - Repositories
       parameters:
         - $ref: '#/components/parameters/gitServerParam'
-        - $ref: '#/components/parameters/ownerParam'
-        - $ref: '#/components/parameters/repoParam'
+        - $ref: '#/components/parameters/repoOwnerParam'
+        - $ref: '#/components/parameters/repoNameParam'
       responses:
         '200':
           description: Detailed information about a repository
@@ -123,17 +121,16 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-  /api/v1/providers/bitbucket/{git-server}/{org}/repositories:
+  /api/v1/providers/bitbucket/{gitServer}/{owner}/repositories:
     get:
       summary: List repositories
       operationId: listBitbucketRepositories
       tags:
         - Repositories
       parameters:
         - $ref: '#/components/parameters/gitServerParam'
-        - $ref: '#/components/parameters/orgParam'
-        - $ref: '#/components/parameters/pageParam'
-        - $ref: '#/components/parameters/perPageParam'
+        - $ref: '#/components/parameters/repoOwnerParam'
+        - $ref: '#/components/parameters/repoNameQueryParam'
       responses:
         '200':
           description: A list of repositories
@@ -160,16 +157,16 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /api/v1/providers/bitbucket/{git-server}/repositories/{owner}/{repo}:
+  /api/v1/providers/bitbucket/{gitServer}/repositories/{owner}/{repo}:
     get:
       summary: Get detailed information for a specific Bitbucket repository
       operationId: getBitbucketRepository
       tags:
         - Repositories
       parameters:
         - $ref: '#/components/parameters/gitServerParam'
-        - $ref: '#/components/parameters/ownerParam'
-        - $ref: '#/components/parameters/repoParam'
+        - $ref: '#/components/parameters/repoOwnerParam'
+        - $ref: '#/components/parameters/repoNameParam'
       responses:
         '200':
           description: Detailed information about a repository
@@ -192,42 +189,28 @@ paths:
 
 components:
   parameters:
-    pageParam:
-      name: page
+    repoNameQueryParam:
+      name: repoName
       in: query
       required: false
-      description: The page number for pagination.
+      description: The name of the repository to search for.
       schema:
-        type: integer
-    perPageParam:
-      name: per_page
-      in: query
-      required: false
-      description: The number of items per page for pagination.
-      schema:
-        type: integer
+        type: string
     gitServerParam:
-      name: git-server
+      name: gitServer
       in: path
       required: true
       description: The Git server name.
       schema:
         type: string
-    orgParam:
-      name: org
-      in: path
-      required: true
-      description: The organization name in the Git server.
-      schema:
-        type: string
-    ownerParam:
+    repoOwnerParam:
       name: owner
       in: path
       required: true
       description: The owner of the repository.
       schema:
         type: string
-    repoParam:
+    repoNameParam:
       name: repo
       in: path
       required: true
@@ -319,15 +302,12 @@ components:
     RepositoriesResponse:
       type: object
       properties:
-        repositories:
+        data:
           type: array
           items:
             $ref: '#/components/schemas/Repository'
-        pagination:
-          $ref: '#/components/schemas/Pagination'
       required:
-        - repositories
-        - pagination
+        - data
     Error:
       type: object
       properties: