From cd3f414ee0e64277501b9b67df53420adebda62d Mon Sep 17 00:00:00 2001
From: naudachu <volkomurov.d@gmail.com>
Date: Fri, 24 Nov 2023 14:57:31 +0500
Subject: [PATCH] rename vars: - ShortName -> Key - Cloud -> Folder

---
 internal/controller/control_folder.go | 12 ++++++------
 internal/controller/control_git.go    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/internal/controller/control_folder.go b/internal/controller/control_folder.go
index 7a8f61b..e138c0c 100644
--- a/internal/controller/control_folder.go
+++ b/internal/controller/control_folder.go
@@ -35,13 +35,13 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
 
 	if project != nil {
 		switch {
-		case project.Cloud != "":
+		case project.Folder != "":
 			return &ProjectResponse{
 				Project: project,
 				Message: nil,
 			}
-		case project.ShortName != "":
-			name = project.ShortName
+		case project.Key != "":
+			name = project.Key
 		case req.InsertedName != "":
 			name = req.InsertedName
 		}
@@ -65,11 +65,11 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
 		result = ProjectResponse{
 			Project: &domain.Project{
 				ID:         string(dbticket.ID),
-				ShortName:  dbticket.Key.String,
+				Key:        dbticket.Key.String,
 				ChannelID:  dbticket.Channelid.String,
 				ProjectGit: dbticket.ProjectGit.String,
 				BuildGit:   dbticket.BuildGit.String,
-				Cloud:      dbticket.Folder.String,
+				Folder:     dbticket.Folder.String,
 			},
 			Message: response.ErrMessage,
 		}
@@ -78,7 +78,7 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
 			response := wc.ICloud.CreateFolder(req.InsertedName)
 			result = ProjectResponse{
 				Project: &domain.Project{
-					Cloud: response.Folder.PrivateURL,
+					Folder: response.Folder.PrivateURL,
 				},
 				Message: response.ErrMessage,
 			}
diff --git a/internal/controller/control_git.go b/internal/controller/control_git.go
index 44a38d9..928006e 100644
--- a/internal/controller/control_git.go
+++ b/internal/controller/control_git.go
@@ -24,8 +24,8 @@ func (wc *WorkflowController) createGitForExistingProject(ctx context.Context, r
 		dbticket db.Ticket
 	)
 	switch {
-	case p.ShortName != "":
-		name = p.ShortName
+	case p.Key != "":
+		name = p.Key
 		if req.IsBuildGit {
 			name += "-build"
 		}
@@ -81,11 +81,11 @@ func (wc *WorkflowController) createGitForExistingProject(ctx context.Context, r
 	return &ProjectResponse{
 		Project: &domain.Project{
 			ID:         string(dbticket.ID),
-			ShortName:  dbticket.Key.String,
+			Key:        dbticket.Key.String,
 			ChannelID:  dbticket.Channelid.String,
 			ProjectGit: dbticket.ProjectGit.String,
 			BuildGit:   dbticket.BuildGit.String,
-			Cloud:      dbticket.Folder.String,
+			Folder:     dbticket.Folder.String,
 		},
 		Message: err,
 	}