Fix expense to be nullable without raw material.

2026-06-10 14:25:23 +07:00
parent d0c090a657
commit 1718c5adab
24 changed files with 342 additions and 233 deletions
@@ -61,20 +61,20 @@ func TestPurchasingAnalyticsModelToContractCopiesOutletName(t *testing.T) {
 		Summary: models.PurchasingSummary{
 			TotalPurchases:            300,
 			RawMaterialPurchases:      125,
-			NonInventoryPurchases:     175,
+			ExpensePurchases:          175,
 			TotalPurchaseOrders:       3,
 			RawMaterialPurchaseOrders: 1,
-			NonInventoryExpenseCount:  2,
+			ExpenseCount:              2,
 		},
 		Data: []models.PurchasingAnalyticsData{
 			{
 				Date:                      now,
 				Purchases:                 300,
 				RawMaterialPurchases:      125,
-				NonInventoryPurchases:     175,
+				ExpensePurchases:          175,
 				PurchaseOrders:            3,
 				RawMaterialPurchaseOrders: 1,
-				NonInventoryExpenseCount:  2,
+				ExpenseCount:              2,
 			},
 		},
 	})
@@ -85,14 +85,14 @@ func TestPurchasingAnalyticsModelToContractCopiesOutletName(t *testing.T) {
 	require.Equal(t, outletName, *result.OutletName)
 	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, float64(175), result.Summary.ExpensePurchases)
 	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.Equal(t, int64(2), result.Summary.ExpenseCount)
 	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)
+	require.Equal(t, float64(175), result.Data[0].ExpensePurchases)
 }

 func TestPurchasingAnalyticsModelToContractOmitsNilOutletName(t *testing.T) {