self-order+notification #6

Merged
aefril merged 3 commits from self-order+notification into main 2026-05-13 07:27:06 +00:00
Showing only changes of commit 015292e830 - Show all commits

View File

@ -29,6 +29,13 @@ func NewAnalyticsRepositoryImpl(db *gorm.DB) *AnalyticsRepositoryImpl {
} }
} }
func (r *AnalyticsRepositoryImpl) resolveOutletID(query *gorm.DB, outletID *uuid.UUID, column string) *gorm.DB {
if outletID != nil {
return query.Where(column+" = ?", *outletID)
}
return query
}
func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error) { func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error) {
var results []*entities.PaymentMethodAnalytics var results []*entities.PaymentMethodAnalytics
@ -50,9 +57,7 @@ func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context,
Where("p.status = ?", entities.PaymentTransactionStatusCompleted). Where("p.status = ?", entities.PaymentTransactionStatusCompleted).
Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo) Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
if outletID != nil { query = r.resolveOutletID(query, outletID, "o.outlet_id")
query = query.Where("o.outlet_id = ?", *outletID)
}
err := query. err := query.
Group("pm.id, pm.name, pm.type"). Group("pm.id, pm.name, pm.type").
@ -180,9 +185,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
Where("oi.status != ?", entities.OrderItemStatusCancelled). Where("oi.status != ?", entities.OrderItemStatusCancelled).
Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo) Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
if outletID != nil { query = r.resolveOutletID(query, outletID, "o.outlet_id")
query = query.Where("o.outlet_id = ?", *outletID)
}
err := query. err := query.
Group("p.id, p.name, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit"). Group("p.id, p.name, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
@ -235,9 +238,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalyticsPerCategory(ctx context.Con
Where("oi.status != ?", entities.OrderItemStatusCancelled). Where("oi.status != ?", entities.OrderItemStatusCancelled).
Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo) Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
if outletID != nil { query = r.resolveOutletID(query, outletID, "o.outlet_id")
query = query.Where("o.outlet_id = ?", *outletID)
}
err := query. err := query.
Group("c.id, c.name"). Group("c.id, c.name").
@ -267,9 +268,7 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
Where("o.organization_id = ?", organizationID). Where("o.organization_id = ?", organizationID).
Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo) Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
if outletID != nil { query = r.resolveOutletID(query, outletID, "o.outlet_id")
query = query.Where("o.outlet_id = ?", *outletID)
}
err := query.Scan(&result).Error err := query.Scan(&result).Error
if err != nil { if err != nil {
@ -320,9 +319,7 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
Where("o.is_void = false AND o.is_refund = false"). Where("o.is_void = false AND o.is_refund = false").
Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo) Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
if outletID != nil { summaryQuery = r.resolveOutletID(summaryQuery, outletID, "o.outlet_id")
summaryQuery = summaryQuery.Where("o.outlet_id = ?", *outletID)
}
err := summaryQuery.Scan(&summary).Error err := summaryQuery.Scan(&summary).Error
if err != nil { if err != nil {
@ -374,9 +371,7 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
Group(timeFormat). Group(timeFormat).
Order(timeFormat) Order(timeFormat)
if outletID != nil { dataQuery = r.resolveOutletID(dataQuery, outletID, "o.outlet_id")
dataQuery = dataQuery.Where("o.outlet_id = ?", *outletID)
}
err = dataQuery.Scan(&data).Error err = dataQuery.Scan(&data).Error
if err != nil { if err != nil {
@ -419,9 +414,7 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
Order("p.name ASC"). Order("p.name ASC").
Limit(1000) Limit(1000)
if outletID != nil { productQuery = r.resolveOutletID(productQuery, outletID, "o.outlet_id")
productQuery = productQuery.Where("o.outlet_id = ?", *outletID)
}
err = productQuery.Scan(&productData).Error err = productQuery.Scan(&productData).Error
if err != nil { if err != nil {