Alexander Belanger 4 лет назад
Родитель
Сommit
ff04014735
3 измененных файлов с 6 добавлено и 9 удалено
  1. 2 2
      internal/forms/events.go
  2. 4 4
      internal/models/events.go
  3. 0 3
      internal/repository/gorm/event.go

+ 2 - 2
internal/forms/events.go

@@ -11,8 +11,8 @@ import (
 type CreateEventForm struct {
 	ResourceType string    `json:"resource_type"`
 	Name         string    `json:"name"`
-	OwnerType    string    `json:"owner_name"`
-	OwnerName    string    `json:"owner_type"`
+	OwnerType    string    `json:"owner_type"`
+	OwnerName    string    `json:"owner_name"`
 	EventType    string    `json:"event_type"`
 	Namespace    string    `json:"namespace"`
 	Message      string    `json:"message"`

+ 4 - 4
internal/models/events.go

@@ -35,8 +35,8 @@ type EventExternal struct {
 	ProjectID uint `json:"project_id"`
 	ClusterID uint `json:"cluster_id"`
 
-	OwnerType string `json:"owner_name"`
-	OwnerName string `json:"owner_type"`
+	OwnerType string `json:"owner_type"`
+	OwnerName string `json:"owner_name"`
 
 	EventType    string    `json:"event_type"`
 	RefType      string    `json:"resource_type"`
@@ -54,8 +54,8 @@ type EventExternalSimple struct {
 	ProjectID uint `json:"project_id"`
 	ClusterID uint `json:"cluster_id"`
 
-	OwnerType string `json:"owner_name"`
-	OwnerName string `json:"owner_type"`
+	OwnerType string `json:"owner_type"`
+	OwnerName string `json:"owner_name"`
 
 	EventType    string    `json:"event_type"`
 	RefType      string    `json:"resource_type"`

+ 0 - 3
internal/repository/gorm/event.go

@@ -1,7 +1,6 @@
 package gorm
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/porter-dev/porter/internal/models"
@@ -78,8 +77,6 @@ func (repo *EventRepository) ListEventsByProjectID(
 
 	events := []*models.Event{}
 
-	fmt.Println("OPTS ARE", listOpts, listOpts.OwnerName, listOpts.OwnerType)
-
 	query := repo.db.Where("project_id = ? AND cluster_id = ?", projectID, opts.ClusterID)
 
 	if listOpts.Type != "" {