Refactor data handlers + misc fixes

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.

routes/api/expenses/add-budget.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, FreshContextState } from '/lib/types.ts';
-import { createBudget, getBudgets } from '/lib/data/expenses.ts';
+import { BudgetModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -33,7 +33,7 @@ export const handler: Handlers<Data, FreshContextState> = {
     }
 
     try {
-      const newBudget = await createBudget(
+      const newBudget = await BudgetModel.create(
         context.state.user.id,
         requestBody.name,
         requestBody.month,
@@ -48,7 +48,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.currentMonth);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.currentMonth);
 
     const responseBody: ResponseBody = { success: true, newBudgets };
 

routes/api/expenses/add-expense.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, Expense, FreshContextState } from '/lib/types.ts';
-import { createExpense, getBudgets, getExpenses } from '/lib/data/expenses.ts';
+import { BudgetModel, ExpenseModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -52,7 +52,7 @@ export const handler: Handlers<Data, FreshContextState> = {
     }
 
     try {
-      const newExpense = await createExpense(
+      const newExpense = await ExpenseModel.create(
         context.state.user.id,
         requestBody.cost,
         requestBody.description,
@@ -69,9 +69,9 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newExpenses = await getExpenses(context.state.user.id, requestBody.month);
+    const newExpenses = await ExpenseModel.list(context.state.user.id, requestBody.month);
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.month);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.month);
 
     const responseBody: ResponseBody = { success: true, newExpenses, newBudgets };
 

routes/api/expenses/auto-complete.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState } from '/lib/types.ts';
-import { getExpenseSuggestions } from '/lib/data/expenses.ts';
+import { ExpenseModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -26,7 +26,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Bad request', { status: 400 });
     }
 
-    const suggestions = await getExpenseSuggestions(
+    const suggestions = await ExpenseModel.listSuggestions(
       context.state.user.id,
       requestBody.name,
     );

routes/api/expenses/delete-budget.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, FreshContextState } from '/lib/types.ts';
-import { deleteBudget, getBudgetById, getBudgets } from '/lib/data/expenses.ts';
+import { BudgetModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -29,20 +29,20 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Bad request', { status: 400 });
     }
 
-    const budget = await getBudgetById(context.state.user.id, requestBody.id);
+    const budget = await BudgetModel.getById(context.state.user.id, requestBody.id);
 
     if (!budget) {
       return new Response('Not found', { status: 404 });
     }
 
     try {
-      await deleteBudget(context.state.user.id, requestBody.id);
+      await BudgetModel.delete(context.state.user.id, requestBody.id);
     } catch (error) {
       console.error(error);
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.currentMonth);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.currentMonth);
 
     const responseBody: ResponseBody = { success: true, newBudgets };
 

routes/api/expenses/delete-expense.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, Expense, FreshContextState } from '/lib/types.ts';
-import { deleteExpense, getBudgets, getExpenseById, getExpenses } from '/lib/data/expenses.ts';
+import { BudgetModel, ExpenseModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -30,22 +30,22 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Bad request', { status: 400 });
     }
 
-    const expense = await getExpenseById(context.state.user.id, requestBody.id);
+    const expense = await ExpenseModel.getById(context.state.user.id, requestBody.id);
 
     if (!expense) {
       return new Response('Not found', { status: 404 });
     }
 
     try {
-      await deleteExpense(context.state.user.id, requestBody.id);
+      await ExpenseModel.delete(context.state.user.id, requestBody.id);
     } catch (error) {
       console.error(error);
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newExpenses = await getExpenses(context.state.user.id, requestBody.month);
+    const newExpenses = await ExpenseModel.list(context.state.user.id, requestBody.month);
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.month);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.month);
 
     const responseBody: ResponseBody = { success: true, newExpenses, newBudgets };
 

routes/api/expenses/export-expenses.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, Expense, FreshContextState } from '/lib/types.ts';
-import { getAllBudgetsForExport, getAllExpensesForExport } from '/lib/data/expenses.ts';
+import { BudgetModel, ExpenseModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -21,9 +21,9 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Unauthorized', { status: 401 });
     }
 
-    const newExpenses = await getAllExpensesForExport(context.state.user.id);
+    const newExpenses = await ExpenseModel.getAllForExport(context.state.user.id);
 
-    const newBudgets = await getAllBudgetsForExport(context.state.user.id);
+    const newBudgets = await BudgetModel.getAllForExport(context.state.user.id);
 
     const responseBody: ResponseBody = { success: true, jsonContents: { expenses: newExpenses, budgets: newBudgets } };
 

routes/api/expenses/import-expenses.tsx

@@ -2,13 +2,7 @@ import { Handlers } from 'fresh/server.ts';
 
 import { Budget, Expense, FreshContextState } from '/lib/types.ts';
 import { concurrentPromises } from '/lib/utils/misc.ts';
-import {
-  createBudget,
-  createExpense,
-  deleteAllBudgetsAndExpenses,
-  getBudgets,
-  getExpenses,
-} from '/lib/data/expenses.ts';
+import { BudgetModel, deleteAllBudgetsAndExpenses, ExpenseModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -47,14 +41,14 @@ export const handler: Handlers<Data, FreshContextState> = {
     try {
       await concurrentPromises(
         requestBody.budgets.map((budget) => () =>
-          createBudget(context.state.user!.id, budget.name, budget.month, budget.value)
+          BudgetModel.create(context.state.user!.id, budget.name, budget.month, budget.value)
         ),
         5,
       );
 
       await concurrentPromises(
         requestBody.expenses.map((expense) => () =>
-          createExpense(
+          ExpenseModel.create(
             context.state.user!.id,
             expense.cost,
             expense.description,
@@ -71,9 +65,9 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newExpenses = await getExpenses(context.state.user.id, requestBody.month);
+    const newExpenses = await ExpenseModel.list(context.state.user.id, requestBody.month);
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.month);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.month);
 
     const responseBody: ResponseBody = { success: true, newExpenses, newBudgets };
 

routes/api/expenses/update-budget.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, FreshContextState } from '/lib/types.ts';
-import { getBudgetById, getBudgets, updateBudget } from '/lib/data/expenses.ts';
+import { BudgetModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -34,7 +34,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Bad request', { status: 400 });
     }
 
-    const budget = await getBudgetById(context.state.user.id, requestBody.id);
+    const budget = await BudgetModel.getById(context.state.user.id, requestBody.id);
 
     if (!budget) {
       return new Response('Not found', { status: 404 });
@@ -45,13 +45,13 @@ export const handler: Handlers<Data, FreshContextState> = {
     budget.value = requestBody.value;
 
     try {
-      await updateBudget(budget);
+      await BudgetModel.update(budget);
     } catch (error) {
       console.error(error);
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.currentMonth);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.currentMonth);
 
     const responseBody: ResponseBody = { success: true, newBudgets };
 

routes/api/expenses/update-expense.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { Budget, Expense, FreshContextState } from '/lib/types.ts';
-import { getBudgets, getExpenseById, getExpenses, updateExpense } from '/lib/data/expenses.ts';
+import { BudgetModel, ExpenseModel } from '/lib/models/expenses.ts';
 
 interface Data {}
 
@@ -36,7 +36,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Bad request', { status: 400 });
     }
 
-    const expense = await getExpenseById(context.state.user.id, requestBody.id);
+    const expense = await ExpenseModel.getById(context.state.user.id, requestBody.id);
 
     if (!expense) {
       return new Response('Not found', { status: 404 });
@@ -65,15 +65,15 @@ export const handler: Handlers<Data, FreshContextState> = {
     expense.is_recurring = requestBody.is_recurring;
 
     try {
-      await updateExpense(expense);
+      await ExpenseModel.update(expense);
     } catch (error) {
       console.error(error);
       return new Response(`${error}`, { status: 500 });
     }
 
-    const newExpenses = await getExpenses(context.state.user.id, requestBody.month);
+    const newExpenses = await ExpenseModel.list(context.state.user.id, requestBody.month);
 
-    const newBudgets = await getBudgets(context.state.user.id, requestBody.month);
+    const newBudgets = await BudgetModel.list(context.state.user.id, requestBody.month);
 
     const responseBody: ResponseBody = { success: true, newExpenses, newBudgets };