From bce6f9d38a7fb7de3467f2dafa2e43caa4536d85 Mon Sep 17 00:00:00 2001
From: Martyn van Dijke <martijnvdijke600@gmail.com>
Date: Thu, 12 Sep 2024 16:30:57 +0200
Subject: [PATCH] fix: update storage

---
 backend/plugins/webhook/api/generic.go | 35 ++++++--------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/backend/plugins/webhook/api/generic.go b/backend/plugins/webhook/api/generic.go
index 6d1a67ae461..e81be7337b3 100644
--- a/backend/plugins/webhook/api/generic.go
+++ b/backend/plugins/webhook/api/generic.go
@@ -18,7 +18,6 @@ limitations under the License.
 package api
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"time"
@@ -36,17 +35,16 @@ import (
 type WebhookGenericReq struct {
 	Title       string                 `mapstructure:"title" validate:"required"`
 	Description string                 `mapstructure:"description"`
-	Json        map[string]interface{} `mapstructure:"json"`
+	Data        map[string]interface{} `mapstructure:"json"`
 
 	CreatedDate *time.Time `mapstructure:"createdDate"`
 }
 
 type Generic struct {
-	Id          int
 	Title       string
 	Description string
 	CreatedDate *time.Time
-	data        string
+	Data        string
 }
 
 func PostGeneric(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, errors.Error) {
@@ -74,7 +72,7 @@ func PostGeneric(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, err
 	txHelper := dbhelper.NewTxHelper(basicRes, &err)
 	defer txHelper.End()
 	tx := txHelper.Begin()
-	if err := Create(connection, request, tx, logger); err != nil {
+	if err := SaveGeneric(connection, request, tx, logger); err != nil {
 		logger.Error(err, "create generic")
 		return nil, err
 	}
@@ -82,12 +80,12 @@ func PostGeneric(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, err
 	return &plugin.ApiResourceOutput{Body: nil, Status: http.StatusOK}, nil
 }
 
-func Create(connection *models.WebhookConnection, request *WebhookGenericReq, db dal.Transaction, logger log.Logger) errors.Error {
+func SaveGeneric(connection *models.WebhookConnection, request *WebhookGenericReq, db dal.Transaction, logger log.Logger) errors.Error {
 	// validation
 	if request == nil {
 		return errors.BadInput.New("request body is nil")
 	}
-	if len(request.Json) == 0 {
+	if len(request.Data) == 0 {
 		return errors.BadInput.New("json payload is empty")
 	}
 	createdDate := time.Now()
@@ -98,34 +96,17 @@ func Create(connection *models.WebhookConnection, request *WebhookGenericReq, db
 		request.CreatedDate = &createdDate
 	}
 
-	fmt.Println(request.Json)
-
-	jsonString, err := json.Marshal(request.Json)
-	fmt.Println(jsonString)
-	if err != nil {
-		logger.Error(err, "Error marshaling JSON:")
-	}
-
 	generic := new(Generic)
 	generic.Title = request.Title
 	generic.Description = request.Description
 	generic.CreatedDate = request.CreatedDate
-	generic.data = string(jsonString)
+	generic.Data = fmt.Sprintf("%s", request.Data)
 
-	if !db.HasTable(generic) {
-		db.AutoMigrate(generic)
-	}
 	db.AutoMigrate(generic)
-	err = db.Create(generic)
+	err := db.CreateOrUpdate(generic)
 	if err != nil {
-		return nil
+		return err
 	}
-	db.All(generic)
-
-	// if err := tx.CreateOrUpdate(generic); err != nil {
-	// 	logger.Error(err, "failed to generic json data to disk")
-	// 	return err
-	// }
 
 	return nil
 }