ekzyis/delphi.market
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add order status column

Browse Source
This commit is contained in:
ekzyis 2023-11-27 17:45:07 +01:00
parent 89a861e4f1
commit f91080da27
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/init.sql
View File

@ -47,7 +47,8 @@ CREATE TABLE orders(
side ORDER_SIDE NOT NULL, side ORDER_SIDE NOT NULL,
quantity BIGINT NOT NULL, quantity BIGINT NOT NULL,
price BIGINT NOT NULL, price BIGINT NOT NULL,
invoice_id UUID NOT NULL REFERENCES invoices(id) invoice_id UUID NOT NULL REFERENCES invoices(id),
order_id UUID REFERENCES orders(id)
); );
ALTER TABLE orders ADD CONSTRAINT order_price CHECK(price > 0 AND price < 100); ALTER TABLE orders ADD CONSTRAINT order_price CHECK(price > 0 AND price < 100);
ALTER TABLE orders ADD CONSTRAINT order_quantity CHECK(quantity > 0); ALTER TABLE orders ADD CONSTRAINT order_quantity CHECK(quantity > 0);

10
db/market.go
View File

@ -114,7 +114,8 @@ func (db *DB) CreateOrder(tx *sql.Tx, ctx context.Context, order *Order) error {
func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error { func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
query := "" + query := "" +
"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, i.confirmed_at " + "SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, i.confirmed_at, " +
"CASE WHEN o.order_id IS NOT NULL THEN 'EXECUTED' ELSE 'WAITING' END AS status " +
"FROM orders o " + "FROM orders o " +
"JOIN invoices i ON o.invoice_id = i.id " + "JOIN invoices i ON o.invoice_id = i.id " +
"JOIN shares s ON o.share_id = s.id " + "JOIN shares s ON o.share_id = s.id " +
@ -127,7 +128,7 @@ func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
defer rows.Close() defer rows.Close()
for rows.Next() { for rows.Next() {
var order Order var order Order
rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Invoice.ConfirmedAt) rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Invoice.ConfirmedAt, &order.Status)
*orders = append(*orders, order) *orders = append(*orders, order)
} }
return nil return nil
@ -135,7 +136,8 @@ func (db *DB) FetchUserOrders(pubkey string, orders *[]Order) error {
func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error { func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error {
query := "" + query := "" +
"SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id " + "SELECT o.id, share_id, o.pubkey, o.side, o.quantity, o.price, o.invoice_id, o.created_at, s.description, s.market_id, " +
"CASE WHEN o.order_id IS NOT NULL THEN 'EXECUTED' ELSE 'WAITING' END AS status " +
"FROM orders o " + "FROM orders o " +
"JOIN shares s ON o.share_id = s.id " + "JOIN shares s ON o.share_id = s.id " +
"JOIN invoices i ON i.id = o.invoice_id " + "JOIN invoices i ON i.id = o.invoice_id " +
@ -148,7 +150,7 @@ func (db *DB) FetchMarketOrders(marketId int64, orders *[]Order) error {
defer rows.Close() defer rows.Close()
for rows.Next() { for rows.Next() {
var order Order var order Order
rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId) rows.Scan(&order.Id, &order.ShareId, &order.Pubkey, &order.Side, &order.Quantity, &order.Price, &order.InvoiceId, &order.CreatedAt, &order.ShareDescription, &order.Share.MarketId, &order.Status)
*orders = append(*orders, order) *orders = append(*orders, order)
} }
return nil return nil

2
vue/src/components/OrderRow.vue
View File

@ -3,7 +3,7 @@
<td v-if="order.MarketId"><router-link :to="/market/ + order.MarketId">{{ order.MarketId }}</router-link></td> <td v-if="order.MarketId"><router-link :to="/market/ + order.MarketId">{{ order.MarketId }}</router-link></td>
<td>{{ order.side }} {{ order.quantity }} {{ order.ShareDescription }} @ {{ order.price }} sats</td> <td>{{ order.side }} {{ order.quantity }} {{ order.ShareDescription }} @ {{ order.price }} sats</td>
<td :title="order.CreatedAt" class="hidden-sm">{{ ago(new Date(order.CreatedAt)) }}</td> <td :title="order.CreatedAt" class="hidden-sm">{{ ago(new Date(order.CreatedAt)) }}</td>
<td></td> <td class="font-mono">{{ order.Status }}</td>
</tr> </tr>
</template> </template>