From 938bff20e695600a0c7fc58595fb18206114686c Mon Sep 17 00:00:00 2001 From: ekzyis Date: Sun, 3 Dec 2023 07:22:13 +0100 Subject: [PATCH] Add pubkey column to market table --- db/init.sql | 1 + db/market.go | 6 +++--- db/types.go | 1 + server/router/handler/market.go | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/db/init.sql b/db/init.sql index 88798f4..5f57f35 100644 --- a/db/init.sql +++ b/db/init.sql @@ -31,6 +31,7 @@ CREATE TABLE markets( id SERIAL PRIMARY KEY, description TEXT NOT NULL, end_date TIMESTAMP WITH TIME ZONE NOT NULL, + pubkey TEXT NOT NULL REFERENCES users(pubkey), invoice_id UUID NOT NULL UNIQUE REFERENCES invoices(id) ); CREATE EXTENSION "uuid-ossp"; diff --git a/db/market.go b/db/market.go index 9c528bd..54a2a03 100644 --- a/db/market.go +++ b/db/market.go @@ -15,9 +15,9 @@ type FetchOrdersWhere struct { func (db *DB) CreateMarket(tx *sql.Tx, ctx context.Context, market *Market) error { if err := tx.QueryRowContext(ctx, ""+ - "INSERT INTO markets(description, end_date, invoice_id) "+ - "VALUES($1, $2, $3) "+ - "RETURNING id", market.Description, market.EndDate, market.InvoiceId).Scan(&market.Id); err != nil { + "INSERT INTO markets(description, end_date, pubkey, invoice_id) "+ + "VALUES($1, $2, $3, $4) "+ + "RETURNING id", market.Description, market.EndDate, market.Pubkey, market.InvoiceId).Scan(&market.Id); err != nil { return err } // For now, we only support binary markets. diff --git a/db/types.go b/db/types.go index 770e5cd..e319670 100644 --- a/db/types.go +++ b/db/types.go @@ -29,6 +29,7 @@ type ( Id Serial `json:"id"` Description string `json:"description"` EndDate time.Time `json:"endDate"` + Pubkey string InvoiceId UUID } Share struct { diff --git a/server/router/handler/market.go b/server/router/handler/market.go index 272fbd5..ab71af1 100644 --- a/server/router/handler/market.go +++ b/server/router/handler/market.go @@ -93,6 +93,7 @@ func HandleCreateMarket(sc context.ServerContext) echo.HandlerFunc { defer tx.Commit() u = c.Get("session").(db.User) + m.Pubkey = u.Pubkey msats = 1000 // TODO: add [market:] for redirect after payment invDescription = fmt.Sprintf("create market \"%s\"", m.Description)