tavo/conex-builder
1
0
Fork 0
mirror of https://github.com/tavo-wasd-gh/conex-builder.git synced 2025-06-07 12:13:30 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib cleanup

Browse source
This commit is contained in:
tavo-wasd 2024-09-02 00:27:05 -06:00
parent 8d615ae418
commit 6dea68ba49
5 changed files with 61 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.org
View file

@ -37,19 +37,13 @@ CREATE TABLE sites (
); );
#+END_SRC #+END_SRC
#+BEGIN_SRC sql :results silent
INSERT INTO sites (folder, status, due, name, sur, email, phone, code)
VALUES ('athos', 'up', '2025-08-31T20:26:58Z', 'John', 'Doe', 'john@doe', '8888-8888', 'CR');
#+END_SRC
#+BEGIN_SRC sql #+BEGIN_SRC sql
SELECT * FROM sites; SELECT * FROM sites;
#+END_SRC #+END_SRC
#+RESULTS: #+RESULTS:
| id | folder | status | due | name | sur | email | phone | code | raw | | id | folder | status | due | name | sur | email | phone | code | raw |
|----+-----------+--------+------------------------+------+-----+---------------------------------------+------------+------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |----+--------+--------+-----+------+-----+-------+-------+------+-----|
| 1 | gofitness | down | 2025-09-01 01:18:08-06 | John | Doe | sb-8kx8c32267916@personal.example.com | 5068031951 | CR | {"time": 1725175087581, "blocks": [{"id": "dGd_EGtUWN", "data": {"text": "asdfasdfasdfasdf", "level": 2}, "type": "header"}, {"id": "z9UoyyRH_4", "data": {"text": "asdfasdfasdfasdfa Hi<br>"}, "type": "paragraph"}], "version": "2.30.5"} |
** Payments table ** Payments table
@ -68,11 +62,6 @@ CREATE TABLE payments (
); );
#+END_SRC #+END_SRC
#+BEGIN_SRC sql :results silent
INSERT INTO payments (capture, site, amount, currency, date, status)
VALUES ('5PS47268T4115691X', 1, 20.00, 'USD', '2024-08-30', 'COMPLETED');
#+END_SRC
#+BEGIN_SRC sql #+BEGIN_SRC sql
SELECT * FROM payments; SELECT * FROM payments;
#+END_SRC #+END_SRC
@ -103,8 +92,7 @@ SELECT * FROM changes;
#+END_SRC #+END_SRC
#+RESULTS: #+RESULTS:
| id | by | site | payment | col | prev | next | date | |---|
|----+----+------+---------+-----+------+------+------|
** Types of changes ** Types of changes

60
server/db.go
View file

@ -38,11 +38,13 @@ func RegisterSitePayment(capture Capture, directory string, editorData json.RawM
country string country string
) )
id = capture.PurchaseUnits[0].Payments.Captures[0].ID captureData := capture.PurchaseUnits[0].Payments.Captures[0]
amount = capture.PurchaseUnits[0].Payments.Captures[0].Amount.Value
currency = capture.PurchaseUnits[0].Payments.Captures[0].Amount.CurrencyCode id = captureData.ID
pstatus = capture.PurchaseUnits[0].Payments.Captures[0].Status amount = captureData.Amount.Value
date = capture.PurchaseUnits[0].Payments.Captures[0].CreateTime currency = captureData.Amount.CurrencyCode
pstatus = captureData.Status
date = captureData.CreateTime
wstatus = "down" wstatus = "down"
due = date.AddDate(1, 0, 0) due = date.AddDate(1, 0, 0)
name = capture.Payer.Name.GivenName name = capture.Payer.Name.GivenName
@ -52,32 +54,34 @@ func RegisterSitePayment(capture Capture, directory string, editorData json.RawM
country = capture.Payer.Address.CountryCode country = capture.Payer.Address.CountryCode
var pkey int var pkey int
newSite := db.QueryRow(`SELECT id FROM sites WHERE folder = $1`, directory).Scan(&pkey) newSite := db.QueryRow(`
SELECT id FROM sites WHERE folder = $1
`, directory).Scan(&pkey)
if newSite == sql.ErrNoRows { if newSite == sql.ErrNoRows {
if err := db.QueryRow( if err := db.QueryRow(`
`INSERT INTO sites (folder, status, due, name, sur, email, phone, code, raw) INSERT INTO sites (folder, status, due, name, sur, email, phone, code, raw)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
RETURNING id`, RETURNING id
directory, wstatus, due, `, directory, wstatus, due,
name, surname, email, phone, country, name, surname, email, phone, country,
editorData).Scan(&pkey); err != nil { editorData).Scan(&pkey); err != nil {
return fmt.Errorf("%s: %v", errDBRegisterSite, err) return fmt.Errorf("%s: %v", errDBRegisterSite, err)
} }
} else { } else {
if err := db.QueryRow( if err := db.QueryRow(`
`UPDATE sites SET due = due + INTERVAL '1 year' UPDATE sites SET due = due + INTERVAL '1 year'
WHERE id = $1 WHERE id = $1
RETURNING id`, RETURNING id
pkey).Scan(&pkey); err != nil { `, pkey).Scan(&pkey); err != nil {
return fmt.Errorf("%s: %v", errDBUpdateDue, err) return fmt.Errorf("%s: %v", errDBUpdateDue, err)
} }
} }
if _, err := db.Exec( if _, err := db.Exec(`
`INSERT INTO payments (capture, site, amount, currency, date, status) INSERT INTO payments (capture, site, amount, currency, date, status)
VALUES ($1, $2, $3, $4, $5, $6)`, VALUES ($1, $2, $3, $4, $5, $6)
id, pkey, amount, currency, date, pstatus); err != nil { `, id, pkey, amount, currency, date, pstatus); err != nil {
return fmt.Errorf("%s: %v", errDBRegisterPayment, err) return fmt.Errorf("%s: %v", errDBRegisterPayment, err)
} }
@ -97,22 +101,22 @@ func UpdateSite(by string, pkey int, editorData json.RawMessage) error {
}() }()
var prev json.RawMessage var prev json.RawMessage
if err := tx.QueryRow( if err := tx.QueryRow(`
`SELECT raw FROM sites WHERE id = $1`, SELECT raw FROM sites WHERE id = $1
pkey).Scan(&prev); err != nil { `, pkey).Scan(&prev); err != nil {
return fmt.Errorf("%s: %v", errDBGetPrevRaw, err) return fmt.Errorf("%s: %v", errDBGetPrevRaw, err)
} }
if _, err = tx.Exec( if _, err = tx.Exec(`
`UPDATE sites SET raw = $1 WHERE id = $2`, UPDATE sites SET raw = $1 WHERE id = $2
editorData, pkey); err != nil { `, editorData, pkey); err != nil {
return fmt.Errorf("%s: %v", errDBUpdateRaw, err) return fmt.Errorf("%s: %v", errDBUpdateRaw, err)
} }
if _, err = tx.Exec( if _, err = tx.Exec(`
`INSERT INTO changes (by, site, payment, col, prev, next, date) INSERT INTO changes (by, site, payment, col, prev, next, date)
VALUES ($1, $2, NULL, 'raw', $3, $4, CURRENT_DATE);`, VALUES ($1, $2, NULL, 'raw', $3, $4, CURRENT_DATE);
by, pkey, prev, editorData); err != nil { `, by, pkey, prev, editorData); err != nil {
return fmt.Errorf("%s: %v", errDBChangesRaw, err) return fmt.Errorf("%s: %v", errDBChangesRaw, err)
} }

15
server/init.go
View file

@ -2,7 +2,6 @@ package main
import ( import (
"database/sql" "database/sql"
"log"
"os" "os"
"github.com/joho/godotenv" "github.com/joho/godotenv"
@ -15,20 +14,20 @@ const (
errDBConn = "Fatal: init.go: Connect to database" errDBConn = "Fatal: init.go: Connect to database"
errDBPing = "Fatal: init.go: Ping database" errDBPing = "Fatal: init.go: Ping database"
errClosingDBConn = "Fatal: init.go: Closing database connection" errClosingDBConn = "Fatal: init.go: Closing database connection"
errMissingCredentials = "Fatal: init.go: Credentials"
) )
var db *sql.DB var db *sql.DB
func initialize() { func initialize() {
godotenv.Load() godotenv.Load()
if os.Getenv("BASE_URL") == "" || if os.Getenv("BASE_URL") == "" ||
os.Getenv("CLIENT_ID") == "" || os.Getenv("CLIENT_ID") == "" ||
os.Getenv("CLIENT_SECRET") == "" || os.Getenv("CLIENT_SECRET") == "" ||
os.Getenv("RETURN_URL") == "" || os.Getenv("RETURN_URL") == "" ||
os.Getenv("CANCEL_URL") == "" || os.Getenv("CANCEL_URL") == "" ||
os.Getenv("PORT") == "" { os.Getenv("PORT") == "" {
log.Fatalf("Error 000: Missing credentials") fatal(nil, errMissingCredentials)
} }
var err error var err error
@ -38,21 +37,21 @@ func initialize() {
" password="+os.Getenv("DB_PASS")+ " password="+os.Getenv("DB_PASS")+
" dbname="+os.Getenv("DB_NAME")) " dbname="+os.Getenv("DB_NAME"))
if err != nil { if err != nil {
log.Fatalf("%s: %v", errDBConn, err) fatal(err, errDBConn)
} }
if err := db.Ping(); err != nil { if err := db.Ping(); err != nil {
log.Fatalf("%s: %v", errDBPing, err) fatal(err, errDBPing)
} }
log.Println(msgDBConn) msg(msgDBConn)
} }
func shutdown() { func shutdown() {
if db != nil { if db != nil {
log.Println(msgClosingDBConn) msg(msgClosingDBConn)
if err := db.Close(); err != nil { if err := db.Close(); err != nil {
log.Fatalf("%s: %v", errClosingDBConn, err) fatal(err, errClosingDBConn)
} }
} }
} }

27
server/main.go
View file

@ -2,7 +2,6 @@ package main
import ( import (
"encoding/json" "encoding/json"
"io"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -36,7 +35,7 @@ func main() {
port := os.Getenv("PORT") port := os.Getenv("PORT")
go func() { go func() {
log.Println(msgServerStart + ": " + port + "...") msg(msgServerStart + ": " + port + "...")
if err := http.ListenAndServe(":"+port, nil); err != nil { if err := http.ListenAndServe(":"+port, nil); err != nil {
fatal(err, errServerStart) fatal(err, errServerStart)
} }
@ -45,7 +44,11 @@ func main() {
<-stop <-stop
shutdown() shutdown()
log.Println(msgServerShutdown) msg(msgServerShutdown)
}
func msg(notice string) {
log.Println(notice)
} }
func fail(w http.ResponseWriter, err error, notice string) { func fail(w http.ResponseWriter, err error, notice string) {
@ -76,28 +79,20 @@ func CreateOrderHandler(w http.ResponseWriter, r *http.Request) {
} }
func CaptureOrderHandler(w http.ResponseWriter, r *http.Request) { func CaptureOrderHandler(w http.ResponseWriter, r *http.Request) {
info, err := io.ReadAll(r.Body)
if err != nil {
fail(w, err, errReadBody)
return
}
var cart struct { var cart struct {
Directory string `json:"directory"` Directory string `json:"directory"`
EditorData json.RawMessage `json:"editor_data"` EditorData json.RawMessage `json:"editor_data"`
} }
err = json.Unmarshal(info, &cart) if err := json.NewDecoder(r.Body).Decode(&cart); err != nil {
if err != nil { fail(w, err, errReadBody)
fail(w, err, errParseBody)
return return
} }
directory := cart.Directory
editorData := cart.EditorData
path := strings.TrimPrefix(r.URL.Path, "/api/orders/") path := strings.TrimPrefix(r.URL.Path, "/api/orders/")
parts := strings.Split(path, "/") parts := strings.Split(path, "/")
orderID := parts[0] orderID := parts[0]
if orderID == "" { if orderID == "" {
fail(w, err, errGetOrderID) fail(w, nil, errGetOrderID)
return return
} }
@ -107,8 +102,8 @@ func CaptureOrderHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
if err := RegisterSitePayment(capture, directory, editorData); err != nil { if err := RegisterSitePayment(capture, cart.Directory, cart.EditorData); err != nil {
fail(w, err, errRegisterSite+": "+directory) fail(w, err, errRegisterSite+": "+cart.Directory)
return return
} }

8
server/paypal.go
View file

@ -7,7 +7,6 @@ import (
"io" "io"
"net/http" "net/http"
"os" "os"
"strings"
"time" "time"
) )
@ -72,7 +71,7 @@ type Receipt struct {
func Token() (string, error) { func Token() (string, error) {
req, err := http.NewRequest("POST", req, err := http.NewRequest("POST",
os.Getenv("BASE_URL")+"/v1/oauth2/token", os.Getenv("BASE_URL")+"/v1/oauth2/token",
strings.NewReader(`grant_type=client_credentials`)) bytes.NewBufferString(`grant_type=client_credentials`))
req.Header.Set("Content-Type", "application/x-www-form-urlencoded") req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
req.SetBasicAuth(os.Getenv("CLIENT_ID"), os.Getenv("CLIENT_SECRET")) req.SetBasicAuth(os.Getenv("CLIENT_ID"), os.Getenv("CLIENT_SECRET"))
@ -85,7 +84,6 @@ func Token() (string, error) {
var response struct { var response struct {
AccessToken string `json:"access_token"` AccessToken string `json:"access_token"`
} }
if err := json.NewDecoder(raw.Body).Decode(&response); err != nil { if err := json.NewDecoder(raw.Body).Decode(&response); err != nil {
return "", fmt.Errorf("%s: %v", errTokenResp, err) return "", fmt.Errorf("%s: %v", errTokenResp, err)
} }
@ -191,11 +189,11 @@ func CaptureOrder(orderID string) (Capture, Receipt, error) {
return Capture{}, Receipt{}, fmt.Errorf("%s: %v", errCaptureOrderResp, err) return Capture{}, Receipt{}, fmt.Errorf("%s: %v", errCaptureOrderResp, err)
} }
if err := json.NewDecoder(bytes.NewReader(body)).Decode(&capture); err != nil { if err := json.Unmarshal(body, &capture); err != nil {
return Capture{}, Receipt{}, fmt.Errorf("%s: %v", errCaptureOrderDecodeCapture, err) return Capture{}, Receipt{}, fmt.Errorf("%s: %v", errCaptureOrderDecodeCapture, err)
} }
if err := json.NewDecoder(bytes.NewReader(body)).Decode(&receipt); err != nil { if err := json.Unmarshal(body, &receipt); err != nil {
return Capture{}, Receipt{}, fmt.Errorf("%s: %v", errCaptureOrderDecodeReceipt, err) return Capture{}, Receipt{}, fmt.Errorf("%s: %v", errCaptureOrderDecodeReceipt, err)
} }