From 81314f1aeb9a2b4ba3c17af22a6d2997db8d0d6c Mon Sep 17 00:00:00 2001 From: nilo Date: Sun, 2 Feb 2025 09:34:06 -0300 Subject: [PATCH] preparing v2 --- controllers/webhookController.go | 89 +++++++++++++++----------------- go.mod | 1 - go.sum | 9 +++- main.go | 7 ++- routes/routes.go | 2 +- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/controllers/webhookController.go b/controllers/webhookController.go index e01f004..f48e1b5 100644 --- a/controllers/webhookController.go +++ b/controllers/webhookController.go @@ -1,15 +1,12 @@ package controllers import ( - "api/database" "api/models" "api/utils" "bytes" "encoding/json" - "fmt" "log" "net/http" - "strconv" "github.com/gofiber/fiber/v2" ) @@ -68,7 +65,7 @@ func OnUpdate(c *fiber.Ctx) error { return err } - log.Printf("Update") + log.Printf("======================== Update") utils.PrettyPrintJson(p) if len(p.Groups) > 0 { @@ -129,56 +126,56 @@ func OnPubStop(c *fiber.Ctx) error { return c.SendString("On_Pub_Stop: " + string(c.Body())) } -func WixIntegration(c *fiber.Ctx) error { - var data models.Purchase +// func WixIntegration(c *fiber.Ctx) error { +// var data models.Purchase - if err := c.BodyParser(&data); err != nil { - return fiber.ErrBadRequest - } +// if err := c.BodyParser(&data); err != nil { +// return fiber.ErrBadRequest +// } - fmt.Println(data.Data.Contact.Email) - fmt.Println(data.Data.Contact.Name.First + " " + data.Data.Contact.Name.Last) - fmt.Printf(data.Data.PlanOrderID) - fmt.Println(data.Data.PlanPrice.Value) - fmt.Println(data.Data.PlanStartDate) - fmt.Println(data.Data.PlanValidUntil) - fmt.Println(data.Data.PlanTitle) +// fmt.Println(data.Data.Contact.Email) +// fmt.Println(data.Data.Contact.Name.First + " " + data.Data.Contact.Name.Last) +// fmt.Printf("%s", data.Data.PlanOrderID) +// fmt.Println(data.Data.PlanPrice.Value) +// fmt.Println(data.Data.PlanStartDate) +// fmt.Println(data.Data.PlanValidUntil) +// fmt.Println(data.Data.PlanTitle) - var user models.User +// var user models.User - result := database.DB.Debug().Where("email = ?", data.Data.Contact.Email).First(&user) +// result := database.DB.Debug().Where("email = ?", data.Data.Contact.Email).First(&user) - if result.RowsAffected == 0 { - // User does not exist. Inserts it. - user := models.User{ - Email: data.Data.Contact.Email, - Name: data.Data.Contact.Name.First + " " + data.Data.Contact.Name.Last, - Blocked: "N", - Cancelled: "N", - } +// if result.RowsAffected == 0 { +// // User does not exist. Inserts it. +// user := models.User{ +// Email: data.Data.Contact.Email, +// Name: data.Data.Contact.Name.First + " " + data.Data.Contact.Name.Last, +// Blocked: "N", +// Cancelled: "N", +// } - database.DB.Debug().Create(&user) - } +// database.DB.Debug().Create(&user) +// } - value, err := strconv.ParseFloat(data.Data.PlanPrice.Value, 32) +// value, err := strconv.ParseFloat(data.Data.PlanPrice.Value, 32) - if err != nil { - log.Printf("Error converting plan price: %s\n", err) - return fiber.ErrBadRequest - } +// if err != nil { +// log.Printf("Error converting plan price: %s\n", err) +// return fiber.ErrBadRequest +// } - transaction := models.Transaction{ - Email: data.Data.Contact.Email, - PlanOrderID: data.Data.PlanOrderID, - Value: value, - PlanStartDate: data.Data.PlanStartDate, - PlanValidUntil: data.Data.PlanValidUntil, - PlanTitle: data.Data.PlanTitle, - Operation: "Compra", - Obs: "", - } +// transaction := models.Transaction{ +// Email: data.Data.Contact.Email, +// PlanOrderID: data.Data.PlanOrderID, +// Value: value, +// PlanStartDate: data.Data.PlanStartDate, +// PlanValidUntil: data.Data.PlanValidUntil, +// PlanTitle: data.Data.PlanTitle, +// Operation: "Compra", +// Obs: "", +// } - database.DB.Debug().Create(&transaction) +// database.DB.Debug().Create(&transaction) - return c.JSON(transaction) -} +// return c.JSON(transaction) +// } diff --git a/go.mod b/go.mod index fa2aaa2..787b95d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.22 require ( github.com/gofiber/fiber/v2 v2.50.0 github.com/golang-jwt/jwt/v5 v5.1.0 - github.com/joho/godotenv v1.5.1 github.com/shirou/gopsutil/v3 v3.23.10 github.com/spf13/viper v1.17.0 golang.org/x/crypto v0.15.0 diff --git a/go.sum b/go.sum index ba0977d..cb58951 100644 --- a/go.sum +++ b/go.sum @@ -51,6 +51,7 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -58,6 +59,7 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -148,8 +150,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -158,9 +158,11 @@ github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed h1:036IscGBfJsFIgJQzlui7nK1Ncm0tp2ktmPj8xO4N/0= github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= @@ -181,6 +183,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b h1:0LFwY6Q3gMACTjAbMZBjXAqTOzOwFaj2Ld6cjeQ7Rig= github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= @@ -190,6 +193,7 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= @@ -545,6 +549,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/main.go b/main.go index 159f3ab..04f9e01 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "api/config" - "api/database" "api/globals" "api/routes" "io" @@ -76,9 +75,9 @@ func main() { })) // Connects to database - if err := database.ConnectDB(); err != nil { - panic("Could not connect to database") - } + // if err := database.ConnectDB(); err != nil { + // panic("Could not connect to database") + // } // Setup routes routes.Setup(app) diff --git a/routes/routes.go b/routes/routes.go index 03fe821..0eb807d 100644 --- a/routes/routes.go +++ b/routes/routes.go @@ -10,7 +10,7 @@ import ( // Setup sets up the routes func Setup(app *fiber.App) { - app.Post("/integration", controllers.WixIntegration) + // app.Post("/integration", controllers.WixIntegration) app.Get("/version", controllers.Version)