ver 2

src/models/Budget.ts

@@ -1,20 +1,27 @@
 import {Transaction} from "@/models/Transaction";
-import {Category, CategorySetting} from "@/models/Category";
+import {Category} from "@/models/Category";
 
-export class BudgetInfo {
-    budget: Budget
+export class Budget {
+    id: number
+    name: string
+    dateFrom: Date
+    dateTo: Date
+    createdAt: Date
     plannedExpenses: [Transaction]
     plannedIncomes: [Transaction]
+    categories: [BudgetCategory]
     transactions: [Transaction]
-    transactionCategoriesSums: []
-    totalIncomes: number
-    totalExpenses: number
-    chartData: [[]]
-    unplannedCategories: [BudgetCategory]
+    warns: [Warn]
 }
 
 
-export class Budget {
+export class Warn {
+    id: string
+    severity: string
+    message: string
+}
+
+export class BudgetInfo {
     id: number
     name: string
     dateFrom: Date
@@ -23,6 +30,8 @@ export class Budget {
 }
 
 export class BudgetCategory {
-    category: Category;
-    categorySetting: CategorySetting
+    category: Category
+    currentSpent: BigDecimal // отображает сумму потраченных на данный момент средств по категории
+    currentLimit: BigDecimal // отображает текущий лимит по категории
+    currentPlanned: BigDecimal // отображает текущую сумму запланированных расходов по категории
 }

src/models/Transaction.ts

@@ -1,23 +1,24 @@
 import {Category} from "@/models/Category";
+import {User} from "@/models/User";
 
 export class Transaction {
-    id: number;
-    transactionType: TransactionType;
+    id: String;
+    type: TransactionType;
+    user: User
     category: Category;
     comment: string;
     date: Date;
     amount: number
+    parentId: String
     isDone: boolean;
 }
 
-export class TransactionCategoriesSum{
+export class TransactionCategoriesSum {
     category: Category;
     sum: number
 }
 
 
-
-
 export class TransactionType {
     code: string;
     name: string;