ver 2

src/services/budgetsService.ts

@@ -4,25 +4,32 @@ import {format} from "date-fns";
 // Импортируете настроенный экземпляр axios
 
 export const getBudgetInfos = async () => {
+    try {
 
-    let response = await apiClient.get('/budgets/');
+
+    let response = await apiClient.get('/budgets');
     let budgetInfos = response.data;
     budgetInfos.forEach((budgetInfo: Budget) => {
         budgetInfo.dateFrom = new Date(budgetInfo.dateFrom);
         budgetInfo.dateTo = new Date(budgetInfo.dateTo);
-        // budgetInfo.plannedExpenses.forEach(e => {
-        //     e.date = new Date(e.date)
-        // })
-        //
-        // budgetInfo.plannedIncomes.forEach(e => {
-        //     e.date = new Date(e.date)
-        // })
-        //
-        // budgetInfo.transactions.forEach(e => {
-        //     e.date = new Date(e.date)
-        // })
+        budgetInfo.plannedExpenses?.forEach(e => {
+            e.date = new Date(e.date)
+        })
+
+        budgetInfo.plannedIncomes?.forEach(e => {
+            e.date = new Date(e.date)
+        })
+
+        budgetInfo.transactions?.forEach(e => {
+            e.date = new Date(e.date)
+        })
     })
     return budgetInfos
+    } catch (e) {
+        console.log(e)
+        throw e
+
+    }
 }
 
 export const getBudgetTransactions = async (budgetId, transactionType, categoryType) => {
@@ -66,18 +73,50 @@ export const getBudgetInfo = async (budget_id: number) => {
 
 };
 
+
+export const getWarns = async (budgetId: string, hidden: Boolean = null) => {
+    let url = `/budgets/${budgetId}/warns`
+    if (hidden) {
+        url += `?hidden=${hidden}`
+    }
+    let warns = await apiClient.get(url);
+    return warns.data
+}
+
+export const hideWarnRequest = async (budgetId: string, warnId: string) => {
+    await apiClient.post(`/budgets/${budgetId}/warns/${warnId}/hide`);
+}
+
 export const updateBudgetCategoryRequest = async (budget_id, category: BudgetCategory) => {
-    await apiClient.put('/budgets/' + budget_id + '/category', category);
+    return await apiClient.post('/budgets/' + budget_id + '/categories/' + category.category.id + "/limit", {"limit": category.currentLimit}).then(i => i.data);
 }
 
 export const createBudget = async (budget: Budget, createRecurrent: Boolean) => {
-    budget.dateFrom = format(budget.dateFrom, 'yyyy-MM-dd')
-    budget.dateTo = format(budget.dateTo, 'yyyy-MM-dd')
-    let data = {
-        budget: budget,
-        createRecurrent: createRecurrent
+
+   try {
+
+       let budgetToCreate = JSON.parse(JSON.stringify(budget));
+       budgetToCreate.dateFrom = format(budget.dateFrom, 'yyyy-MM-dd')
+       budgetToCreate.dateTo = format(budget.dateTo, 'yyyy-MM-dd')
+       let data = {
+           budget: budgetToCreate,
+           createRecurrent: createRecurrent
+       }
+       await apiClient.post('/budgets/', data);
+
+   } catch (e){
+       console.error(e)
+       throw e
+   }
+}
+
+
+export const deleteBudgetRequest = async (budgetId: string) => {
+    try {
+        // throw Error("test")
+        let response = await apiClient.delete(`/budgets/${budgetId}`);
+    } catch (error) {
+        console.log(error);
+        throw error;
     }
-    await apiClient.post('/budgets', data);
-    budget.dateFrom = format(budget.dateFrom, 'dd.mm.yy')
-    budget.dateTo = format(budget.dateTo, 'dd.mm.yy')
 }