Customer Order

internal/repository/orders/order.go

@@ -48,9 +48,13 @@ func (r *OrderRepository) UpdateStatus(ctx context.Context, orderID int64, statu
 func (r *OrderRepository) FindByID(ctx context.Context, id int64) (*entity.Order, error) {
 	var order entity.Order
 
-	err := r.db.WithContext(ctx).Preload("OrderItems", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("Product")
-	}).First(&order, id).Error
+	err := r.db.WithContext(ctx).
+		Preload("OrderItems", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("Product")
+		}).
+		Preload("User").
+		Preload("Payment").
+		First(&order, id).Error
 
 	if err != nil {
 		logger.ContextLogger(ctx).Error("error when finding order by ID", zap.Error(err))
@@ -99,11 +103,15 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or
 		query = query.Where("orders.payment_type = ?", req.PaymentType)
 	}
 
+	if req.CreatedBy != 0 {
+		query = query.Where("orders.created_by = ?", req.CreatedBy)
+	}
+
 	if req.Status != "" {
 		query = query.Where("orders.status = ?", req.Status)
 	}
 
-	if !req.IsAdmin {
+	if !req.IsAdmin && !req.IsCustomer {
 		query = query.Where("orders.partner_id = ?", req.PartnerID)
 	}
 
@@ -142,7 +150,7 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or
 		query = query.Limit(req.Limit)
 	}
 
-	if err := query.Scan(&orders).Error; err != nil {
+	if err := query.Debug().Scan(&orders).Error; err != nil {
 		logger.ContextLogger(ctx).Error("error when get all history orders", zap.Error(err))
 		return nil, 0, err
 	}