From bcb8e7e3ceeaf15a59963dc864c8c76004a63da3 Mon Sep 17 00:00:00 2001
From: Atefeh Mohseni Ejiyeh <atefeh.mohseni-ejiyeh@harness.io>
Date: Wed, 12 Jun 2024 23:43:14 +0000
Subject: [PATCH] fix import space API output repo type (#2099)

---
 .../controller/space/import_repositories.go   | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/api/controller/space/import_repositories.go b/app/api/controller/space/import_repositories.go
index ba9c0e606..7791547c7 100644
--- a/app/api/controller/space/import_repositories.go
+++ b/app/api/controller/space/import_repositories.go
@@ -21,6 +21,7 @@ import (
 
 	apiauth "github.com/harness/gitness/app/api/auth"
 	"github.com/harness/gitness/app/api/controller/limiter"
+	repoCtrl "github.com/harness/gitness/app/api/controller/repo"
 	"github.com/harness/gitness/app/api/usererror"
 	"github.com/harness/gitness/app/auth"
 	"github.com/harness/gitness/app/paths"
@@ -38,8 +39,8 @@ type ImportRepositoriesInput struct {
 }
 
 type ImportRepositoriesOutput struct {
-	ImportingRepos []*types.Repository `json:"importing_repos"`
-	DuplicateRepos []*types.Repository `json:"duplicate_repos"` // repos which already exist in the space.
+	ImportingRepos []*repoCtrl.RepositoryOutput `json:"importing_repos"`
+	DuplicateRepos []*repoCtrl.RepositoryOutput `json:"duplicate_repos"` // repos which already exist in the space.
 }
 
 // getSpaceCheckAuthRepoCreation checks whether the user has permissions to create repos
@@ -164,7 +165,13 @@ func (c *Controller) ImportRepositories(
 		return ImportRepositoriesOutput{}, err
 	}
 
-	for _, repo := range repos {
+	reposOut := make([]*repoCtrl.RepositoryOutput, len(repos))
+	for i, repo := range repos {
+		reposOut[i] = &repoCtrl.RepositoryOutput{
+			Repository: *repo,
+			IsPublic:   false,
+		}
+
 		err = c.auditService.Log(ctx,
 			session.Principal,
 			audit.NewResource(audit.ResourceTypeRepository, repo.Identifier),
@@ -180,5 +187,13 @@ func (c *Controller) ImportRepositories(
 		}
 	}
 
-	return ImportRepositoriesOutput{ImportingRepos: repos, DuplicateRepos: duplicateRepos}, nil
+	duplicateReposOut := make([]*repoCtrl.RepositoryOutput, len(duplicateRepos))
+	for i, dupRepo := range duplicateRepos {
+		duplicateReposOut[i] = &repoCtrl.RepositoryOutput{
+			Repository: *dupRepo,
+			IsPublic:   false,
+		}
+	}
+
+	return ImportRepositoriesOutput{ImportingRepos: reposOut, DuplicateRepos: duplicateReposOut}, nil
 }