feat: updat analytic profit loss add purchasing
This commit is contained in:
@@ -747,17 +747,38 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
|
||||
}
|
||||
opsItems = mergeOperationalExpenseItems(opsItems, poOpsItems)
|
||||
|
||||
todayPurchasing, err := r.getPurchaseOrderTotals(ctx, organizationID, todayStart, todayEnd)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mtdPurchasing, err := r.getPurchaseOrderTotals(ctx, organizationID, mtdStart, todayEnd)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
purchasingItems, err := r.getPurchasingItemDetails(ctx, organizationID, dateFrom, dateTo)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &entities.ProfitLossAnalytics{
|
||||
Summary: summary,
|
||||
Data: data,
|
||||
ProductData: productData,
|
||||
TodayRevenue: todayRC.Revenue,
|
||||
TodayCost: todayRC.Cost,
|
||||
MtdRevenue: mtdRC.Revenue,
|
||||
MtdCost: mtdRC.Cost,
|
||||
TodayExpenseByCategory: todayExpenseByCategory,
|
||||
MtdExpenseByCategory: mtdExpenseByCategory,
|
||||
OperationalExpenseItems: opsItems,
|
||||
Summary: summary,
|
||||
Data: data,
|
||||
ProductData: productData,
|
||||
TodayRevenue: todayRC.Revenue,
|
||||
TodayCost: todayRC.Cost,
|
||||
MtdRevenue: mtdRC.Revenue,
|
||||
MtdCost: mtdRC.Cost,
|
||||
TodayPurchasing: todayPurchasing.Total,
|
||||
MtdPurchasing: mtdPurchasing.Total,
|
||||
TodayPurchasingRawMaterial: todayPurchasing.RawMaterial,
|
||||
MtdPurchasingRawMaterial: mtdPurchasing.RawMaterial,
|
||||
TodayPurchasingExpense: todayPurchasing.Expense,
|
||||
MtdPurchasingExpense: mtdPurchasing.Expense,
|
||||
PurchasingItems: purchasingItems,
|
||||
TodayExpenseByCategory: todayExpenseByCategory,
|
||||
MtdExpenseByCategory: mtdExpenseByCategory,
|
||||
OperationalExpenseItems: opsItems,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -784,6 +805,68 @@ func (r *AnalyticsRepositoryImpl) getPurchaseOrderRawMaterialTotal(ctx context.C
|
||||
return result.Total, nil
|
||||
}
|
||||
|
||||
type purchasingTotals struct {
|
||||
Total float64
|
||||
RawMaterial float64
|
||||
Expense float64
|
||||
}
|
||||
|
||||
func (r *AnalyticsRepositoryImpl) getPurchaseOrderTotals(ctx context.Context, organizationID uuid.UUID, dateFrom, dateTo time.Time) (purchasingTotals, error) {
|
||||
type result struct {
|
||||
Total float64
|
||||
RawMaterial float64
|
||||
Expense float64
|
||||
}
|
||||
var res result
|
||||
|
||||
query := r.db.WithContext(ctx).
|
||||
Table("purchase_order_items poi").
|
||||
Select(`
|
||||
COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as total,
|
||||
COALESCE(SUM(`+purchaseOrderRawMaterialAmountSQL()+`), 0) as raw_material,
|
||||
COALESCE(SUM(`+purchaseOrderExpenseAmountSQL()+`), 0) as expense
|
||||
`).
|
||||
Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
|
||||
Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
|
||||
Where("po.organization_id = ?", organizationID).
|
||||
Where("po.status = ?", "received").
|
||||
Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo)
|
||||
|
||||
if err := query.Scan(&res).Error; err != nil {
|
||||
return purchasingTotals{}, err
|
||||
}
|
||||
return purchasingTotals{
|
||||
Total: res.Total,
|
||||
RawMaterial: res.RawMaterial,
|
||||
Expense: res.Expense,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (r *AnalyticsRepositoryImpl) getPurchasingItemDetails(ctx context.Context, organizationID uuid.UUID, dateFrom, dateTo time.Time) ([]entities.PurchasingItemDetail, error) {
|
||||
var results []entities.PurchasingItemDetail
|
||||
|
||||
query := r.db.WithContext(ctx).
|
||||
Table("purchase_order_items poi").
|
||||
Select(`
|
||||
po.transaction_date as date,
|
||||
COALESCE(NULLIF(poi.description, ''), i.name, pc.name) as item,
|
||||
COALESCE(poi.quantity, 0) as quantity,
|
||||
CASE WHEN pc.type = '`+string(entities.PurchaseCategoryTypeRawMaterial)+`' THEN COALESCE(poi.quantity, 0) * poi.amount ELSE poi.amount END as amount
|
||||
`).
|
||||
Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
|
||||
Joins("LEFT JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
|
||||
Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
|
||||
Where("po.organization_id = ?", organizationID).
|
||||
Where("po.status = ?", "received").
|
||||
Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
|
||||
Order("po.transaction_date DESC, poi.created_at DESC")
|
||||
|
||||
if err := query.Scan(&results).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
func (r *AnalyticsRepositoryImpl) getPurchaseOrderRawMaterialCostByPeriod(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) ([]entities.ProfitLossData, error) {
|
||||
var dateFormat string
|
||||
switch groupBy {
|
||||
|
||||
Reference in New Issue
Block a user