Update History

internal/repository/orders/order.go

@@ -93,15 +93,40 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or
 		Select("orders.id as id, users.name as employee, sites.name as site, orders.created_at as timestamp, orders.created_at as booking_time, STRING_AGG(ticket_summary.name || ' x' || ticket_summary.total_qty, ', ') AS tickets, orders.payment_type as payment_type, orders.status as status, orders.amount as amount").
 		Joins("left join (SELECT items.order_id, products.name, SUM(items.qty) AS total_qty FROM order_items items LEFT JOIN products ON items.item_id = products.id GROUP BY items.order_id, products.name) AS ticket_summary ON orders.id = ticket_summary.order_id").
 		Joins("left join users on orders.created_by = users.id").
-		Joins("left join partners on orders.partner_id = partners.id").
-		Joins("left join sites on partners.id = sites.partner_id")
+		Joins("left join sites on orders.site_id = sites.id")
+
+	if req.PaymentType != "" {
+		query = query.Where("orders.payment_type = ?", req.PaymentType)
+	}
+
+	if req.Status != "" {
+		query = query.Where("orders.status = ?", req.Status)
+	}
 
 	if !req.IsAdmin {
 		query = query.Where("orders.partner_id = ?", req.PartnerID)
 	}
 
+	if req.StartDate != "" && req.EndDate != "" {
+		// Assuming req.Date and req.EndDate are in string format "YYYY-MM-DD"
+		startDate := req.StartDate
+		endDate := req.EndDate
+
+		if endDate == "" {
+			endDate = time.Now().Format("2006-01-02")
+		}
+
+		query = query.Where("orders.created_at BETWEEN ? AND ?", startDate, endDate)
+	}
+
+	if req.SiteID != nil {
+		query = query.Where("orders.site_id = ?", req.SiteID)
+	}
+
 	query = query.Group("orders.id, users.name, sites.name, orders.created_at, orders.payment_type, orders.status")
 
+	query = query.Order("orders.created_at DESC")
+
 	if err := query.Count(&total).Error; err != nil {
 		logger.ContextLogger(ctx).Error("error when count history orders", zap.Error(err))
 		return nil, 0, err