Update purchase analytics

internal/processor/analytics_processor.go

@@ -185,12 +185,16 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 	data := make([]models.PurchasingAnalyticsData, len(result.Data))
 	for i, item := range result.Data {
 		data[i] = models.PurchasingAnalyticsData{
-			Date:           item.Date,
-			Purchases:      item.Purchases,
-			PurchaseOrders: item.PurchaseOrders,
-			Quantity:       item.Quantity,
-			Ingredients:    item.Ingredients,
-			Vendors:        item.Vendors,
+			Date:                      item.Date,
+			Purchases:                 item.Purchases,
+			RawMaterialPurchases:      item.RawMaterialPurchases,
+			NonInventoryPurchases:     item.NonInventoryPurchases,
+			PurchaseOrders:            item.PurchaseOrders,
+			RawMaterialPurchaseOrders: item.RawMaterialPurchaseOrders,
+			NonInventoryExpenseCount:  item.NonInventoryExpenseCount,
+			Quantity:                  item.Quantity,
+			Ingredients:               item.Ingredients,
+			Vendors:                   item.Vendors,
 		}
 	}
 
@@ -227,7 +231,11 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 		GroupBy:        req.GroupBy,
 		Summary: models.PurchasingSummary{
 			TotalPurchases:            result.Summary.TotalPurchases,
+			RawMaterialPurchases:      result.Summary.RawMaterialPurchases,
+			NonInventoryPurchases:     result.Summary.NonInventoryPurchases,
 			TotalPurchaseOrders:       result.Summary.TotalPurchaseOrders,
+			RawMaterialPurchaseOrders: result.Summary.RawMaterialPurchaseOrders,
+			NonInventoryExpenseCount:  result.Summary.NonInventoryExpenseCount,
 			TotalQuantity:             result.Summary.TotalQuantity,
 			AveragePurchaseOrderValue: result.Summary.AveragePurchaseOrderValue,
 			TotalIngredients:          result.Summary.TotalIngredients,

internal/processor/analytics_processor_test.go

@@ -75,7 +75,23 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 		purchasingResult: &entities.PurchasingAnalytics{
 			OutletName: &outletName,
 			Summary: entities.PurchasingSummary{
-				TotalPurchases: 125,
+				TotalPurchases:            300,
+				RawMaterialPurchases:      125,
+				NonInventoryPurchases:     175,
+				TotalPurchaseOrders:       3,
+				RawMaterialPurchaseOrders: 1,
+				NonInventoryExpenseCount:  2,
+			},
+			Data: []entities.PurchasingAnalyticsData{
+				{
+					Date:                      now,
+					Purchases:                 300,
+					RawMaterialPurchases:      125,
+					NonInventoryPurchases:     175,
+					PurchaseOrders:            3,
+					RawMaterialPurchaseOrders: 1,
+					NonInventoryExpenseCount:  2,
+				},
 			},
 		},
 	}, expenseRepositoryStub{})
@@ -92,7 +108,16 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	require.Equal(t, &outletID, result.OutletID)
 	require.NotNil(t, result.OutletName)
 	require.Equal(t, outletName, *result.OutletName)
-	require.Equal(t, float64(125), result.Summary.TotalPurchases)
+	require.Equal(t, float64(300), result.Summary.TotalPurchases)
+	require.Equal(t, float64(125), result.Summary.RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Summary.NonInventoryPurchases)
+	require.Equal(t, int64(3), result.Summary.TotalPurchaseOrders)
+	require.Equal(t, int64(1), result.Summary.RawMaterialPurchaseOrders)
+	require.Equal(t, int64(2), result.Summary.NonInventoryExpenseCount)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(300), result.Data[0].Purchases)
+	require.Equal(t, float64(125), result.Data[0].RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Data[0].NonInventoryPurchases)
 }
 
 func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *testing.T) {