naudachu
/
ticket-pimp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename vars: 

- ShortName -> Key
- Cloud -> Folder
This commit is contained in:
naudachu 2023-11-24 14:57:31 +05:00
parent ee856cb8b0
commit cd3f414ee0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/controller/control_folder.go
View File

@ -35,13 +35,13 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
if project != nil { if project != nil {
switch { switch {
case project.Cloud != "": case project.Folder != "":
return &ProjectResponse{ return &ProjectResponse{
Project: project, Project: project,
Message: nil, Message: nil,
} }
case project.ShortName != "": case project.Key != "":
name = project.ShortName name = project.Key
case req.InsertedName != "": case req.InsertedName != "":
name = req.InsertedName name = req.InsertedName
} }
@ -65,11 +65,11 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
result = ProjectResponse{ result = ProjectResponse{
Project: &domain.Project{ Project: &domain.Project{
ID: string(dbticket.ID), ID: string(dbticket.ID),
ShortName: dbticket.Key.String, Key: dbticket.Key.String,
ChannelID: dbticket.Channelid.String, ChannelID: dbticket.Channelid.String,
ProjectGit: dbticket.ProjectGit.String, ProjectGit: dbticket.ProjectGit.String,
BuildGit: dbticket.BuildGit.String, BuildGit: dbticket.BuildGit.String,
Cloud: dbticket.Folder.String, Folder: dbticket.Folder.String,
}, },
Message: response.ErrMessage, Message: response.ErrMessage,
} }
@ -78,7 +78,7 @@ func (wc *WorkflowController) CreateFolder(ctx context.Context, req FolderReques
response := wc.ICloud.CreateFolder(req.InsertedName) response := wc.ICloud.CreateFolder(req.InsertedName)
result = ProjectResponse{ result = ProjectResponse{
Project: &domain.Project{ Project: &domain.Project{
Cloud: response.Folder.PrivateURL, Folder: response.Folder.PrivateURL,
}, },
Message: response.ErrMessage, Message: response.ErrMessage,
} }

8
internal/controller/control_git.go
View File

@ -24,8 +24,8 @@ func (wc *WorkflowController) createGitForExistingProject(ctx context.Context, r
dbticket db.Ticket dbticket db.Ticket
) )
switch { switch {
case p.ShortName != "": case p.Key != "":
name = p.ShortName name = p.Key
if req.IsBuildGit { if req.IsBuildGit {
name += "-build" name += "-build"
} }
@ -81,11 +81,11 @@ func (wc *WorkflowController) createGitForExistingProject(ctx context.Context, r
return &ProjectResponse{ return &ProjectResponse{
Project: &domain.Project{ Project: &domain.Project{
ID: string(dbticket.ID), ID: string(dbticket.ID),
ShortName: dbticket.Key.String, Key: dbticket.Key.String,
ChannelID: dbticket.Channelid.String, ChannelID: dbticket.Channelid.String,
ProjectGit: dbticket.ProjectGit.String, ProjectGit: dbticket.ProjectGit.String,
BuildGit: dbticket.BuildGit.String, BuildGit: dbticket.BuildGit.String,
Cloud: dbticket.Folder.String, Folder: dbticket.Folder.String,
}, },
Message: err, Message: err,
} }