Parcourir la source

both read release queries should preload git actions config

Alexander Belanger il y a 5 ans
Parent
commit
9f74766716

+ 0 - 2
internal/models/gitrepo.go

@@ -67,8 +67,6 @@ type GitActionConfig struct {
 
 // GitActionConfigExternal is an external GitActionConfig to be shared over REST
 type GitActionConfigExternal struct {
-	gorm.Model
-
 	// The git repo in ${owner}/${repo} form
 	GitRepo string `json:"git_repo"`
 

+ 1 - 1
internal/repository/gorm/git_action_config_test.go

@@ -54,7 +54,7 @@ func TestCreateGitActionConfig(t *testing.T) {
 	}
 
 	// read the release and make sure GitActionConfig is expected
-	release, err := tester.repo.Release.ReadReleaseByWebhookToken("abcdefgh")
+	release, err := tester.repo.Release.ReadRelease(1, "denver-meister-dakota", "default")
 
 	if err != nil {
 		t.Fatalf("%v\n", err)

+ 1 - 1
internal/repository/gorm/release.go

@@ -28,7 +28,7 @@ func (repo *ReleaseRepository) CreateRelease(release *models.Release) (*models.R
 // ReadRelease finds a single release based on their unique name and namespace pair.
 func (repo *ReleaseRepository) ReadRelease(clusterID uint, name, namespace string) (*models.Release, error) {
 	release := &models.Release{}
-	if err := repo.db.Where("cluster_id = ?", clusterID).Where("name = ?", name).Where("namespace = ?", namespace).First(&release).Error; err != nil {
+	if err := repo.db.Preload("GitActionConfig").Where("cluster_id = ?", clusterID).Where("name = ?", name).Where("namespace = ?", namespace).First(&release).Error; err != nil {
 		return nil, err
 	}
 	return release, nil