Feat/backend/income crud

client/src/types/Income.ts

@@ -0,0 +1,37 @@
+export interface Income {
+  income_id: number;
+  amount: number;
+  date: string;
+  source: string;
+  description?: string;
+  creation_date: string;
+  user_id: number;
+  category_id: number;
+  category?: IncomeCategory;
+}
+
+export interface IncomeCategory {
+  category_id: number;
+  category_name: string;
+  icon_url?: string;
+  is_custom: boolean;
+  user_id?: number;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface CreateIncomeRequest {
+  amount: number;
+  date: string;
+  source: string;
+  description?: string;
+  category_id: number;
+}
+
+export interface UpdateIncomeRequest {
+  amount?: number;
+  date?: string;
+  source?: string;
+  description?: string;
+  category_id?: number;
+}

server/controllers/income.controller.js

@@ -0,0 +1,154 @@
+import incomeService from "../services/income.service.js";
+import { asyncHandler } from "../utils/asyncHandler.js";
+
+//---------------INCOME---------------//
+
+export const createIncome = asyncHandler(async (req, res) => {
+  const { amount, date, source, description, category_id } = req.body;
+
+  if (!amount || !source || !category_id) {
+    return res.status(400).json({ error: "Missing required fields" });
+  }
+
+  const incomeData = {
+    amount: parseFloat(amount),
+    source,
+    description,
+    category: { connect: { category_id: parseInt(category_id) } },
+  };
+
+  if (date) {
+    const parsedDate = new Date(date);
+    if (!isNaN(parsedDate.getTime())) {
+      incomeData.date = parsedDate;
+    }
+  }
+
+  const income = await incomeService.createIncome(req.user.user_id, incomeData);
+  res.status(201).json(income);
+});
+
+export const getIncomes = asyncHandler(async (req, res) => {
+  const { start, end } = req.query;
+  const filters = {};
+
+  if (start) filters.start = new Date(start);
+  if (end) filters.end = new Date(end);
+
+  const incomes = await incomeService.getIncomes(req.user.user_id, filters);
+  res.json(incomes);
+});
+
+export const getIncome = asyncHandler(async (req, res) => {
+  const { id } = req.params;
+  const income = await incomeService.getIncomeById(id, req.user.user_id);
+
+  if (!income) {
+    return res.status(404).json({ error: "Income not found" });
+  }
+
+  res.json(income);
+});
+
+export const updateIncome = asyncHandler(async (req, res) => {
+  const { id } = req.params;
+  const updates = req.body;
+
+  if (updates.date) updates.date = new Date(updates.date);
+  if (updates.amount) updates.amount = parseFloat(updates.amount);
+  if (updates.category_id) {
+    updates.category = {
+      connect: { category_id: parseInt(updates.category_id) },
+    };
+    delete updates.category_id;
+  }
+
+  try {
+    const income = await incomeService.updateIncome(
+      id,
+      req.user.user_id,
+      updates
+    );
+    res.json(income);
+  } catch (error) {
+    res.status(404).json({ error: error.message });
+  }
+});
+
+export const deleteIncome = asyncHandler(async (req, res) => {
+  const { id } = req.params;
+
+  try {
+    await incomeService.deleteIncome(id, req.user.user_id);
+    res.status(204).send();
+  } catch (error) {
+    res.status(404).json({ error: error.message });
+  }
+});
+
+//---------------INCOME CATEGORIES---------------//
+
+export const getIncomeCategories = asyncHandler(async (req, res) => {
+  const categories = await incomeService.getIncomeCategories(req.user.user_id);
+  res.json(categories);
+});
+
+export const getIncomeCategoriesByUser = asyncHandler(async (req, res) => {
+  const categories = await incomeService.getIncomeCategoriesByUser(
+    req.user.user_id
+  );
+  res.json(categories);
+});
+
+export const createIncomeCategory = asyncHandler(async (req, res) => {
+  const { category_name, icon_url, icon_emoji } = req.body;
+
+  if (!category_name) {
+    return res.status(400).json({ error: "Category name is required" });
+  }
+
+  try {
+    const category = await incomeService.createIncomeCategory(
+      req.user.user_id,
+      {
+        category_name,
+        icon_url,
+        icon_emoji,
+      }
+    );
+    res.status(201).json(category);
+  } catch (error) {
+    res.status(400).json({ error: error.message });
+  }
+});
+
+export const updateIncomeCategory = asyncHandler(async (req, res) => {
+  const { id } = req.params;
+  const { category_name, icon_url, icon_emoji } = req.body;
+
+  if (!category_name) {
+    return res.status(400).json({ error: "Category name is required" });
+  }
+
+  try {
+    const category = await incomeService.updateIncomeCategory(
+      id,
+      req.user.user_id,
+      { category_name, icon_url, icon_emoji }
+    );
+    res.json(category);
+  } catch (error) {
+    res.status(400).json({ error: error.message });
+  }
+});
+
+export const deleteIncomeCategory = asyncHandler(async (req, res) => {
+  const { id } = req.params;
+
+  try {
+    await incomeService.deleteIncomeCategory(id, req.user.user_id);
+    res.status(204).send();
+  } catch (error) {
+    res.status(400).json({ error: error.message });
+  }
+});

server/package.json

@@ -27,8 +27,7 @@
     "express": "^4.18.2",
     "helmet": "^7.1.0",
     "morgan": "^1.10.0",
-    "pg": "^8.11.3",
-    "@prisma/client": "^5.18.0"
+    "pg": "^8.11.3"
   },
   "devDependencies": {
     "nodemon": "^3.0.2",

server/prisma/schema.prisma

@@ -6,7 +6,6 @@
 
 generator client {
   provider = "prisma-client-js"
-  output   = "../generated/prisma"
 }
 
 datasource db {
@@ -49,7 +48,6 @@ model IncomeCategory {
   category_id   Int       @id @default(autoincrement())
   category_name String    @db.VarChar(50)
   icon_url      String?   @db.VarChar(500)
-  icon_emoji    String?   @db.VarChar(10)
   is_custom     Boolean   @default(false)
   user_id       Int?
   user          User?     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)

server/routes/income.route.js

@@ -0,0 +1,22 @@
+import { Router } from 'express';
+import { createIncome, getIncomes, getIncome, updateIncome, deleteIncome, getIncomeCategories, getIncomeCategoriesByUser,createIncomeCategory, updateIncomeCategory, deleteIncomeCategory } from '../controllers/income.controller.js';
+
+const router = Router();
+
+//INCOME CATEGORY
+router.get('/categories', getIncomeCategories);
+router.get('/custom-categories', getIncomeCategoriesByUser)
+router.post('/categories', createIncomeCategory);
+router.put('/categories/:id', updateIncomeCategory);
+router.delete('/categories/:id', deleteIncomeCategory);
+
+//INCOME
+router.get('/', getIncomes);
+router.get('/:id', getIncome);
+router.post('/', createIncome);
+router.put('/:id', updateIncome);
+router.delete('/:id', deleteIncome);
+
+
+
+export default router;

server/server.js

@@ -2,6 +2,7 @@ import express from 'express';
 import cors from 'cors';
 import dotenv from 'dotenv';
 import { PrismaClient } from '@prisma/client';
+import incomeRoutes from './routes/income.route.js';
 
 dotenv.config();
 
@@ -11,6 +12,15 @@ const PORT = process.env.PORT || 8080;
 app.use(cors());
 app.use(express.json());
 
+//temporary middleware for testing
+app.use((req, res, next) => {
+  req.user = { user_id: 4 }; // fake user, but you have to create a fake user with id 4 as well in your local database
+  next();
+});
+
+//Routes
+app.use('/api/incomes', incomeRoutes);
+
 // Initialize a single Prisma client instance
 const prisma = new PrismaClient();