jnfrati 4 лет назад
Родитель
Сommit
122c685ef7

+ 1 - 3
api/server/handlers/project/create_tag.go

@@ -1,7 +1,6 @@
 package project
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/porter-dev/porter/api/server/authz"
@@ -35,11 +34,10 @@ func (c *CreateTagHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	newTag := &types.CreateTagRequest{}
 
 	if ok := c.DecodeAndValidate(w, r, newTag); !ok {
-		fmt.Println("HERE")
 		return
 	}
 
-	tag, err := c.Config().Repo.Tag().CreateTag(&models.Tag{
+	tag, err := c.Repo().Tag().CreateTag(&models.Tag{
 		Name:      newTag.Name,
 		Color:     newTag.Color,
 		ProjectID: project.ID,

+ 1 - 1
api/server/handlers/release/create.go

@@ -118,7 +118,7 @@ func (c *CreateReleaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	}
 
 	if request.Tags != nil {
-		tags, err := c.Config().Repo.Tag().LinkTagsToRelease(request.Tags, release)
+		tags, err := c.Repo().Tag().LinkTagsToRelease(request.Tags, release)
 
 		if err == nil {
 			release.Tags = append(release.Tags, tags...)

+ 8 - 4
api/server/handlers/release/update_tags.go

@@ -40,7 +40,7 @@ func (c *UpdateReleaseTagsHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	release, err := c.Config().Repo.Release().ReadRelease(cluster.ID, name, namespace)
+	release, err := c.Repo().Release().ReadRelease(cluster.ID, name, namespace)
 
 	if err != nil {
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
@@ -49,21 +49,25 @@ func (c *UpdateReleaseTagsHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 
 	tagsToDelete := difference(release.ToReleaseType().Tags, request.Tags)
 
-	err = c.Config().Repo.Tag().UnlinkTagsFromRelease(tagsToDelete, release)
+	err = c.Repo().Tag().UnlinkTagsFromRelease(tagsToDelete, release)
 
 	if err != nil {
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
 		return
 	}
 
-	_, err = c.Config().Repo.Tag().LinkTagsToRelease(request.Tags, release)
+	_, err = c.Repo().Tag().LinkTagsToRelease(request.Tags, release)
 
 	if err != nil {
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
 		return
 	}
 
-	release, _ = c.Config().Repo.Release().ReadRelease(cluster.ID, name, namespace)
+	release, err = c.Repo().Release().ReadRelease(cluster.ID, name, namespace)
+
+	if err != nil {
+		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
+	}
 
 	w.WriteHeader(http.StatusCreated)
 	c.WriteResult(w, r, release)

+ 3 - 3
internal/repository/gorm/tag.go

@@ -34,7 +34,7 @@ func (repo *TagRepository) CreateTag(tag *models.Tag) (*models.Tag, error) {
 
 func (repo *TagRepository) LinkTagsToRelease(tags []string, release *models.Release) ([]*models.Tag, error) {
 	populatedTags := make([]*models.Tag, 0)
-	err := repo.db.Model(&models.Tag{}).Where("name IN ?", tags).Where("project_id = ?", release.ProjectID).Find(&populatedTags).Error
+	err := repo.db.Where("name IN ?", tags).Where("project_id = ?", release.ProjectID).Find(&populatedTags).Error
 
 	if err != nil {
 		return nil, err
@@ -53,7 +53,7 @@ func (repo *TagRepository) LinkTagsToRelease(tags []string, release *models.Rele
 
 func (repo *TagRepository) UnlinkTagsFromRelease(tags []string, release *models.Release) error {
 	populatedTags := make([]*models.Tag, 0)
-	err := repo.db.Model(&models.Tag{}).Where("name IN ?", tags).Where("project_id = ?", release.ProjectID).Find(&populatedTags).Error
+	err := repo.db.Where("name IN ?", tags).Where("project_id = ?", release.ProjectID).Find(&populatedTags).Error
 
 	if err != nil {
 		return err
@@ -83,7 +83,7 @@ func (repo *TagRepository) ReadTagByNameAndProjectId(tagName string, projectId u
 func (repo *TagRepository) ListTagsByProjectId(projectId uint) ([]*models.Tag, error) {
 	tags := make([]*models.Tag, 0)
 
-	err := repo.db.Model(&models.Tag{}).Where("project_id = ?", projectId).Preload("Releases").Find(&tags).Error
+	err := repo.db.Preload("Releases").Where("project_id = ?", projectId).Find(&tags).Error
 
 	if err != nil {
 		return nil, err