Evilfox/shop-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Add product features, Heleket crypto payments and order status icons.

Browse Source
This commit is contained in:
shop
2026-06-27 16:29:33 +03:00
parent 361d35e6b4
commit 98a0bb01e2
31 changed files with 1673 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/repository/order.go
+65 -21
View File
@@ -9,6 +9,13 @@ import (
"shop/internal/models"
)
const orderSelect = `
SELECT id, user_id, guest_name, guest_email, guest_phone, address, total, status,
COALESCE(payment_method, 'cod'), COALESCE(heleket_uuid, ''), COALESCE(heleket_order_id, ''),
COALESCE(heleket_payment_url, ''), COALESCE(heleket_payment_status, ''), created_at
FROM orders
`
type OrderRepository struct {
pool *pgxpool.Pool
}
@@ -17,6 +24,15 @@ func NewOrderRepository(pool *pgxpool.Pool) *OrderRepository {
return &OrderRepository{pool: pool}
}
func scanOrder(row pgx.Row) (models.Order, error) {
var o models.Order
err := row.Scan(
&o.ID, &o.UserID, &o.GuestName, &o.GuestEmail, &o.GuestPhone, &o.Address, &o.Total, &o.Status,
&o.PaymentMethod, &o.HeleketUUID, &o.HeleketOrderID, &o.HeleketPaymentURL, &o.HeleketPaymentStatus, &o.CreatedAt,
)
return o, err
}
func (r *OrderRepository) Create(ctx context.Context, order *models.Order, items []models.CartItem) error {
tx, err := r.pool.Begin(ctx)
if err != nil {
@@ -24,11 +40,20 @@ func (r *OrderRepository) Create(ctx context.Context, order *models.Order, items
}
defer tx.Rollback(ctx)
status := order.Status
if status == "" {
status = "pending"
}
paymentMethod := order.PaymentMethod
if paymentMethod == "" {
paymentMethod = "cod"
}
err = tx.QueryRow(ctx, `
INSERT INTO orders (user_id, guest_name, guest_email, guest_phone, address, total, status)
VALUES ($1, $2, $3, $4, $5, $6, 'pending')
INSERT INTO orders (user_id, guest_name, guest_email, guest_phone, address, total, status, payment_method)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
RETURNING id, created_at
`, order.UserID, order.GuestName, order.GuestEmail, order.GuestPhone, order.Address, order.Total,
`, order.UserID, order.GuestName, order.GuestEmail, order.GuestPhone, order.Address, order.Total, status, paymentMethod,
).Scan(&order.ID, &order.CreatedAt)
if err != nil {
return err
@@ -47,11 +72,37 @@ func (r *OrderRepository) Create(ctx context.Context, order *models.Order, items
return tx.Commit(ctx)
}
func (r *OrderRepository) UpdateHeleketPayment(ctx context.Context, orderID int, uuid, externalID, paymentURL, paymentStatus string) error {
_, err := r.pool.Exec(ctx, `
UPDATE orders SET
heleket_uuid = $1,
heleket_order_id = $2,
heleket_payment_url = $3,
heleket_payment_status = $4
WHERE id = $5
`, uuid, externalID, paymentURL, paymentStatus, orderID)
return err
}
func (r *OrderRepository) UpdateHeleketStatus(ctx context.Context, orderID int, paymentStatus, orderStatus string) error {
_, err := r.pool.Exec(ctx, `
UPDATE orders SET heleket_payment_status = $1, status = $2 WHERE id = $3
`, paymentStatus, orderStatus, orderID)
return err
}
func (r *OrderRepository) GetByHeleketOrderID(ctx context.Context, externalID string) (models.Order, error) {
row := r.pool.QueryRow(ctx, orderSelect+` WHERE heleket_order_id = $1`, externalID)
o, err := scanOrder(row)
if err != nil {
return models.Order{}, err
}
o.Items, err = r.items(ctx, o.ID)
return o, err
}
func (r *OrderRepository) ByUser(ctx context.Context, userID int) ([]models.Order, error) {
rows, err := r.pool.Query(ctx, `
SELECT id, user_id, guest_name, guest_email, guest_phone, address, total, status, created_at
FROM orders WHERE user_id = $1 ORDER BY created_at DESC
`, userID)
rows, err := r.pool.Query(ctx, orderSelect+` WHERE user_id = $1 ORDER BY created_at DESC`, userID)
if err != nil {
return nil, err
}
@@ -59,8 +110,8 @@ func (r *OrderRepository) ByUser(ctx context.Context, userID int) ([]models.Orde
var orders []models.Order
for rows.Next() {
var o models.Order
if err := rows.Scan(&o.ID, &o.UserID, &o.GuestName, &o.GuestEmail, &o.GuestPhone, &o.Address, &o.Total, &o.Status, &o.CreatedAt); err != nil {
o, err := scanOrder(rows)
if err != nil {
return nil, err
}
o.Items, err = r.items(ctx, o.ID)
@@ -94,10 +145,7 @@ func (r *OrderRepository) items(ctx context.Context, orderID int) ([]models.Orde
}
func (r *OrderRepository) All(ctx context.Context, limit int) ([]models.Order, error) {
rows, err := r.pool.Query(ctx, `
SELECT id, user_id, guest_name, guest_email, guest_phone, address, total, status, created_at
FROM orders ORDER BY created_at DESC LIMIT $1
`, limit)
rows, err := r.pool.Query(ctx, orderSelect+` ORDER BY created_at DESC LIMIT $1`, limit)
if err != nil {
return nil, err
}
@@ -106,11 +154,8 @@ func (r *OrderRepository) All(ctx context.Context, limit int) ([]models.Order, e
}
func (r *OrderRepository) GetByID(ctx context.Context, id int) (models.Order, error) {
var o models.Order
err := r.pool.QueryRow(ctx, `
SELECT id, user_id, guest_name, guest_email, guest_phone, address, total, status, created_at
FROM orders WHERE id = $1
`, id).Scan(&o.ID, &o.UserID, &o.GuestName, &o.GuestEmail, &o.GuestPhone, &o.Address, &o.Total, &o.Status, &o.CreatedAt)
row := r.pool.QueryRow(ctx, orderSelect+` WHERE id = $1`, id)
o, err := scanOrder(row)
if err != nil {
return models.Order{}, err
}
@@ -138,11 +183,10 @@ func (r *OrderRepository) Count(ctx context.Context) (int, error) {
func (r *OrderRepository) collectOrders(ctx context.Context, rows pgx.Rows) ([]models.Order, error) {
var orders []models.Order
for rows.Next() {
var o models.Order
if err := rows.Scan(&o.ID, &o.UserID, &o.GuestName, &o.GuestEmail, &o.GuestPhone, &o.Address, &o.Total, &o.Status, &o.CreatedAt); err != nil {
o, err := scanOrder(rows)
if err != nil {
return nil, err
}
var err error
o.Items, err = r.items(ctx, o.ID)
if err != nil {
return nil, err