sirtimbly/bewcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor data handlers + misc fixes

Browse Source 
This refactors the data handlers into a more standard/understood model-like architecture, to prepare for a new, more robust config system.

It also fixes a problem with creating new Notes and uploading new Photos via the web interface (related to #58).

Finally, it speeds up docker builds by sending in less files, which aren't necessary or will be built anyway.

This is all in preparation to allow building #13 more robustly.
This commit is contained in:
Bruno Bernardino
2025-05-24 08:24:10 +01:00
parent e1193a2770
commit 6cfb62d1a2
61 changed files with 1822 additions and 1774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
routes/expenses.tsx
View File

@@ -2,7 +2,7 @@ import { Handlers, PageProps } from 'fresh/server.ts';
import { Budget, Expense, FreshContextState, SupportedCurrencySymbol } from '/lib/types.ts';
import { isAppEnabled } from '/lib/config.ts';
import { generateMonthlyBudgetsAndExpenses, getBudgets, getExpenses } from '/lib/data/expenses.ts';
import { BudgetModel, ExpenseModel, generateMonthlyBudgetsAndExpenses } from '/lib/models/expenses.ts';
import ExpensesWrapper from '/islands/expenses/ExpensesWrapper.tsx';
interface Data {
@@ -41,16 +41,16 @@ export const handler: Handlers<Data, FreshContextState> = {
initialMonth = nextMonth;
}
let userBudgets = await getBudgets(context.state.user.id, initialMonth);
let userBudgets = await BudgetModel.list(context.state.user.id, initialMonth);
let userExpenses = await getExpenses(context.state.user.id, initialMonth);
let userExpenses = await ExpenseModel.list(context.state.user.id, initialMonth);
// If there are no budgets or expenses, and the selected month is in the future, generate the month's budgets and expenses
if (userBudgets.length === 0 && userExpenses.length === 0 && initialMonth >= currentMonth) {
await generateMonthlyBudgetsAndExpenses(context.state.user.id, initialMonth);
userBudgets = await getBudgets(context.state.user.id, initialMonth);
userExpenses = await getExpenses(context.state.user.id, initialMonth);
userBudgets = await BudgetModel.list(context.state.user.id, initialMonth);
userExpenses = await ExpenseModel.list(context.state.user.id, initialMonth);
}
const currency = context.state.user.extra.expenses_currency || '$';