feat: refactor order listing functionality

- Add filtering by `RestaurantID` and `UserID` in order listing - Remove `Status` field from the `ListCondition` struct Signed-off-by: Sean Zheng <[email protected]>
blackhorseya · Aug 31, 2024 · 859e9b6 · 859e9b6
1 parent 907a0ba
commit 859e9b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/domain/order/order_grpc_server.go b/app/domain/order/order_grpc_server.go
@@ -173,7 +173,6 @@ func (i *orderService) ListOrders(req *biz.ListOrdersRequest, stream biz.OrderSe
 	items, total, err := i.orders.List(ctx, repo.ListCondition{
 		UserID:       "",
 		RestaurantID: "",
-		Status:       "",
 		Limit:        int(req.PageSize),
 		Offset:       int((req.Page - 1) * req.PageSize),
 	})

diff --git a/app/infra/storage/postgresqlx/order_repo.go b/app/infra/storage/postgresqlx/order_repo.go
@@ -69,6 +69,15 @@ func (i *gormOrderRepo) List(c context.Context, cond repo.ListCondition) (items
 
 	query := i.rw.WithContext(timeout).Model(&model.Order{})
 
+	// with filter
+	if cond.RestaurantID != "" {
+		query = query.Where("restaurant_id = ?", cond.RestaurantID)
+	}
+
+	if cond.UserID != "" {
+		query = query.Where("user_id = ?", cond.UserID)
+	}
+
 	// limit and offset
 	limit, offset := defaultLimit, 0
 	if 0 < cond.Limit && cond.Limit <= defaultMaxLimit {

diff --git a/entity/domain/order/repo/order.go b/entity/domain/order/repo/order.go
@@ -12,7 +12,6 @@ import (
 type ListCondition struct {
 	UserID       string
 	RestaurantID string
-	Status       string
 
 	Limit  int
 	Offset int