fix(api): fill favorite project attribute (#6873)

Signed-off-by: Thomas Bétrancourt <[email protected]>
ovh · Feb 28, 2024 · 3abc838 · 3abc838
1 parent 5454603
commit 3abc838
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/cli/cdsctl/admin_metadata.go b/cli/cdsctl/admin_metadata.go
@@ -137,7 +137,7 @@ func adminMetadataProjectExportRun(c cli.Values) error {
 	currentDisplay.Printf("Gettings projects list...")
 	currentDisplay.Do(context.Background())
 
-	projects, err := client.ProjectList(false, false)
+	projects, err := client.ProjectList(false, false, false)
 	if err != nil {
 		return err
 	}
@@ -182,7 +182,7 @@ func adminMetadataApplicationExportRun(c cli.Values) error {
 	currentDisplay.Printf("Gettings projects list...")
 	currentDisplay.Do(context.Background())
 
-	projects, err := client.ProjectList(false, false)
+	projects, err := client.ProjectList(false, false, false)
 	if err != nil {
 		return err
 	}
@@ -260,7 +260,7 @@ func adminMetadataApplicationImportRun(c cli.Values) error {
 }
 
 func adminMetadataWorkflowExportRun(c cli.Values) error {
-	projects, err := client.ProjectList(false, false)
+	projects, err := client.ProjectList(false, false, false)
 	if err != nil {
 		return err
 	}

diff --git a/cli/cdsctl/config.go b/cli/cdsctl/config.go
@@ -290,7 +290,7 @@ func discoverConf(ctxArg []cli.Arg) ([]string, error) {
 			if err != nil {
 				return nil, errors.Wrap(err, "cannot get name from current repository")
 			}
-			ps, err := client.ProjectList(true, true, cdsclient.Filter{Name: "repo", Value: name})
+			ps, err := client.ProjectList(true, true, false, cdsclient.Filter{Name: "repo", Value: name})
 			if err != nil {
 				return nil, err
 			}
@@ -303,7 +303,7 @@ func discoverConf(ctxArg []cli.Arg) ([]string, error) {
 		}
 
 		if projects == nil {
-			ps, err := client.ProjectList(false, false)
+			ps, err := client.ProjectList(false, false, false)
 			if err != nil {
 				return nil, err
 			}
@@ -337,7 +337,7 @@ func discoverConf(ctxArg []cli.Arg) ([]string, error) {
 			if project == nil {
 				// if the project found for current repo was not selected load all projects list
 				if repoExists && len(projects) == 1 {
-					ps, err := client.ProjectList(false, false)
+					ps, err := client.ProjectList(false, false, false)
 					if err != nil {
 						return nil, err
 					}

diff --git a/cli/cdsctl/project.go b/cli/cdsctl/project.go
@@ -49,7 +49,7 @@ var projectListCmd = cli.Command{
 }
 
 func projectListRun(v cli.Values) (cli.ListResult, error) {
-	projs, err := client.ProjectList(false, false)
+	projs, err := client.ProjectList(false, false, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cli/cdsctl/workflow_init.go b/cli/cdsctl/workflow_init.go
@@ -77,7 +77,7 @@ func interactiveChooseProject(gitRepo repo.Repo, defaultValue string) (string, e
 		return defaultValue, nil
 	}
 
-	projs, err := client.ProjectList(false, false)
+	projs, err := client.ProjectList(false, false, false)
 	if err != nil {
 		return "", err
 	}

diff --git a/engine/api/project_test.go b/engine/api/project_test.go
@@ -487,7 +487,7 @@ func Test_getProjectsHandler_FilterByRepo(t *testing.T) {
 		BuiltinConsumerAuthenticationToken: jws,
 	})
 
-	projs, err := sdkclientAdmin.ProjectList(true, true, cdsclient.Filter{Name: "repo", Value: "ovh/" + repofullName})
+	projs, err := sdkclientAdmin.ProjectList(true, true, false, cdsclient.Filter{Name: "repo", Value: "ovh/" + repofullName})
 	require.NoError(t, err)
 	require.True(t, len(projs) == 1)
 	require.True(t, len(projs[0].Workflows) == 1)

diff --git a/sdk/cdsclient/client_project.go b/sdk/cdsclient/client_project.go
@@ -48,9 +48,9 @@ func (c *client) ProjectUpdate(key string, project *sdk.Project) error {
 	return nil
 }
 
-func (c *client) ProjectList(withApplications, withWorkflows bool, filters ...Filter) ([]sdk.Project, error) {
+func (c *client) ProjectList(withApplications, withWorkflows, withFavorites bool, filters ...Filter) ([]sdk.Project, error) {
 	p := []sdk.Project{}
-	path := fmt.Sprintf("/project?application=%v&workflow=%v", withApplications, withWorkflows)
+	path := fmt.Sprintf("/project?application=%v&workflow=%v&withFavorites=%v", withApplications, withWorkflows, withFavorites)
 
 	for _, f := range filters {
 		path += fmt.Sprintf("&%s=%s", url.QueryEscape(f.Name), url.QueryEscape(f.Value))

diff --git a/sdk/cdsclient/interface.go b/sdk/cdsclient/interface.go
@@ -262,7 +262,7 @@ type ProjectClient interface {
 	ProjectGroupDelete(projectKey, groupName string) error
 	ProjectGet(projectKey string, opts ...RequestModifier) (*sdk.Project, error)
 	ProjectUpdate(key string, project *sdk.Project) error
-	ProjectList(withApplications, withWorkflow bool, filters ...Filter) ([]sdk.Project, error)
+	ProjectList(withApplications, withWorkflow, withFavorites bool, filters ...Filter) ([]sdk.Project, error)
 	ProjectKeysClient
 	ProjectVariablesClient
 	ProjectIntegrationImport(projectKey string, content io.Reader, mods ...RequestModifier) (sdk.ProjectIntegration, error)

diff --git a/sdk/cdsclient/mock_cdsclient/interface_mock.go b/sdk/cdsclient/mock_cdsclient/interface_mock.go