Skip to content

Save branch setting when new environment added #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Save branch setting when new environment added #492

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4160f1
save branch setting when new environment added
davechan813 Jul 16, 2019
9729530
dont set to master by default, set to branch it was before
davechan813 Jul 16, 2019
e36bd52
use gorm.IsRecordNotFoundError to catch abnormal error
davechan813 Jul 18, 2019
37de264
Merge branch 'master' into dave/save-branch-when-provisioning-new-env…
davechan813 Jul 18, 2019
01d7754
Merge branch 'master' into dave/save-branch-when-provisioning-new-env…
amoskyler Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions plugins/codeamp/graphql/project_mutation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,43 @@ func (r *ProjectResolverMutation) UpdateProjectEnvironments(ctx context.Context,
EnvironmentID: environment.Model.ID,
ProjectID: project.Model.ID,
}

// Save branch if this is a new environment
if r.DB.Where("environment_id = ? and project_id = ?", environment.Model.ID, project.Model.ID).Find(&projectEnvironment).RecordNotFound() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please use gorm.IsRecordNotFoundError (i think that's the right function)
to determine if it is a RecordNotFound error or not? If it's not a simple record not found, like there being a DB constraint or some sort of other error, we should log it.

You would do if err := r.DB.Where(query).Find(&model).Error; err != nil and then if gorm.IsRecordNotFoundError(err)

// default project
projectID := project.ID.String()
gitBranch := "master"
bookmarked := false
continuousDeploy := false
environmentID := environment.Model.ID.String()

var projectSettings model.ProjectSettings
if err := r.DB.Where("environment_id = ? and project_id = ?", environment.Model.ID, project.Model.ID).Find(&projectSettings).Error; err != nil {
// if not a simple record not found, log the error
if !gorm.IsRecordNotFoundError(err) {
log.Error(err.Error())
return nil, err
}
} else {
gitBranch = projectSettings.GitBranch
continuousDeploy = projectSettings.ContinuousDeploy
}

r.UpdateProject(ctx, &struct {
Project *model.ProjectInput
}{
&model.ProjectInput{
ID: &projectID,
GitProtocol: project.GitProtocol,
GitUrl: project.GitUrl,
GitBranch: &gitBranch,
Bookmarked: &bookmarked,
ContinuousDeploy: &continuousDeploy,
EnvironmentID: &environmentID,
},
})
}

r.DB.Where("environment_id = ? and project_id = ?", environment.Model.ID, project.Model.ID).FirstOrCreate(&projectEnvironment)
results = append(results, &EnvironmentResolver{DBEnvironmentResolver: &db_resolver.EnvironmentResolver{DB: r.DB, Environment: environment}})
} else {
Expand Down