Initial web app consumption/integration (#5)

Co-authored-by: Joe Arndt <jmarndt@users.noreply.github.com>
Reviewed-on: #5

src/expenses/dto/create-expense.dto.ts

@@ -1,10 +1,35 @@
-import { Category } from '../../categories/entities/category.entity';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Temporal } from '@js-temporal/polyfill';
 
 export class CreateExpenseDto {
-  year: string;
-  month: string;
-  day: string;
+  @ApiProperty({
+    description: 'Date in YYYY-MM-DD format'
+  })
+  date: Temporal.PlainDate;
+
+  @ApiProperty({
+    description: 'Amount of expense in cents'
+  })
   cents: number;
-  description: string;
-  category: Category
+
+  @ApiProperty({
+    description: 'Category ID of expense'
+  })
+  categoryId: string;
+
+  @ApiPropertyOptional({
+    description: 'Optional note about expense'
+  })
+  note?: string;
+
+  @ApiPropertyOptional({
+    description: 'Optional merchant ID for the expense'
+  })
+  merchantId?: string;
+
+  @ApiPropertyOptional({
+    type: [String],
+    description: 'Optional list of tag IDs for the expense'
+  })
+  tagIds: string[];
 }

src/expenses/dto/get-expense.dto.ts

@@ -0,0 +1,43 @@
+import { Category } from '../../categories/entities/category.entity';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Merchant } from '../../merchants/entities/merchant.entity';
+import { Tag } from '../../tags/entities/tag.entity';
+import { Temporal } from '@js-temporal/polyfill';
+
+export class GetExpenseDto {
+  @ApiProperty({
+    description: 'Unique ID of expense'
+  })
+  id: string;
+
+  @ApiProperty({
+    description: 'Date in YYYY-MM-DD format'
+  })
+  date: Temporal.PlainDate;
+
+  @ApiProperty({
+    description: 'Amount of expense in cents'
+  })
+  cents: number;
+
+  @ApiProperty({
+    description: 'Category of expense'
+  })
+  category: Category
+
+  @ApiPropertyOptional({
+    description: 'Note about expense'
+  })
+  note?: string;
+
+  @ApiPropertyOptional({
+    description: 'Merchant for the expense'
+  })
+  merchant?: Merchant;
+
+  @ApiPropertyOptional({
+    type: [Tag],
+    description: 'List of tags for the expense'
+  })
+  tags?: Tag[];
+}

src/expenses/dto/update-expense.dto.ts

@@ -1,6 +1,9 @@
-import { PartialType } from '@nestjs/mapped-types';
 import { CreateExpenseDto } from './create-expense.dto';
+import { ApiProperty } from '@nestjs/swagger';
 
-export class UpdateExpenseDto extends PartialType(CreateExpenseDto) {
+export class UpdateExpenseDto extends CreateExpenseDto {
+  @ApiProperty({
+    description: 'Unique ID of the expense'
+  })
   id: string;
 }

src/expenses/entities/expense.entity.ts

@@ -1,6 +1,5 @@
 import { Column, Entity, JoinTable, ManyToMany, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { Tag } from '../../tags/entities/tag.entity';
-import { SubCategory } from '../../sub-categories/entities/sub-category.entity';
 import { Category } from '../../categories/entities/category.entity';
 import { Merchant } from '../../merchants/entities/merchant.entity';
 
@@ -10,25 +9,16 @@ export class Expense {
   id: string;
 
   @Column()
-  year: string;
-
-  @Column()
-  month: string;
-
-  @Column()
-  day: string;
+  date: string;
 
   @Column()
   cents: number;
 
-  @Column({ nullable: true })
-  description: string;
-
   @ManyToOne(() => Category, { eager: true })
   category: Category;
 
-  @ManyToOne(() => SubCategory, { nullable: true, eager: true })
-  subCategory: SubCategory;
+  @Column({ nullable: true })
+  note: string;
 
   @ManyToOne(() => Merchant, { nullable: true, eager: true })
   merchant: Merchant;

src/expenses/expense-data.service.ts

@@ -1,8 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 import { Expense } from './entities/expense.entity';
-import { UpdateExpenseDto } from './dto/update-expense.dto';
-import { CreateExpenseDto } from './dto/create-expense.dto';
 
 @Injectable()
 export class ExpenseDataService {
@@ -20,15 +18,36 @@ export class ExpenseDataService {
     return await this.expenses.findOneBy({ id });
   }
 
-  public async create(expense: CreateExpenseDto): Promise<Expense> {
-    return await this.expenses.save(expense);
+  public async create(expense: CreateExpense): Promise<Expense> {
+    const created = await this.expenses.save(expense);
+    return await this.expenses.findOneBy({ id: created.id }) as Expense;
   }
 
-  public async update(expense: UpdateExpenseDto): Promise<Expense> {
-    return await this.expenses.save(expense);
+  public async update(expense: UpdateExpense): Promise<Expense> {
+    await this.expenses.save(expense);
+    return await this.expenses.findOneBy({ id: expense.id }) as Expense;
   }
 
   public async delete(id: string): Promise<void> {
     await this.expenses.delete({ id });
   }
 }
+
+export interface CreateExpense {
+  date: string;
+  cents: number;
+  category: {
+    id: string;
+  };
+  note?: string;
+  merchant?: {
+    id: string;
+  };
+  tags?: {
+    id: string;
+  }[];
+}
+
+export interface UpdateExpense extends CreateExpense{
+  id: string;
+}

src/expenses/expenses.controller.ts

@@ -15,7 +15,7 @@ import {
 import { ExpensesService } from './expenses.service';
 import { CreateExpenseDto } from './dto/create-expense.dto';
 import { UpdateExpenseDto } from './dto/update-expense.dto';
-import { Expense } from './entities/expense.entity';
+import { GetExpenseDto } from './dto/get-expense.dto';
 
 @Controller('expenses')
 export class ExpensesController {
@@ -23,13 +23,13 @@ export class ExpensesController {
 
   @Get()
   @HttpCode(HttpStatus.OK)
-  public async findAll(): Promise<Expense[]> {
+  public async findAll(): Promise<GetExpenseDto[]> {
     return await this.expensesService.findAll();
   }
 
   @Get(':id')
   @HttpCode(HttpStatus.OK)
-  public async findOne(@Param('id') id: string): Promise<Expense> {
+  public async findOne(@Param('id') id: string): Promise<GetExpenseDto> {
     if (!id) {
       throw new BadRequestException('No ID provided.');
     }
@@ -44,7 +44,7 @@ export class ExpensesController {
 
   @Post()
   @HttpCode(HttpStatus.CREATED)
-  public async create(@Body() expense: CreateExpenseDto): Promise<Expense> {
+  public async create(@Body() expense: CreateExpenseDto): Promise<GetExpenseDto> {
     if (!expense) {
       throw new BadRequestException('Expense name cannot be empty.');
     }
@@ -59,7 +59,7 @@ export class ExpensesController {
 
   @Put()
   @HttpCode(HttpStatus.OK)
-  public async update(@Body() expense: UpdateExpenseDto): Promise<Expense> {
+  public async update(@Body() expense: UpdateExpenseDto): Promise<GetExpenseDto> {
     if (!expense.id) {
       throw new BadRequestException('Expense ID cannot be empty.');
     }

src/expenses/expenses.service.ts

@@ -2,31 +2,68 @@ import { Injectable } from '@nestjs/common';
 import { CreateExpenseDto } from './dto/create-expense.dto';
 import { UpdateExpenseDto } from './dto/update-expense.dto';
 import { ExpenseDataService } from './expense-data.service';
-import { Expense } from './entities/expense.entity';
+import { GetExpenseDto } from './dto/get-expense.dto';
+import { Temporal } from '@js-temporal/polyfill';
 
 @Injectable()
 export class ExpensesService {
   public constructor(private expenseDataService: ExpenseDataService) { }
 
-  public async findAll(): Promise<Expense[]> {
-    return await this.expenseDataService.getAll();
+  public async findAll(): Promise<GetExpenseDto[]> {
+    const expenses = await this.expenseDataService.getAll();
+
+    return expenses.map(exp => {
+      return { ...exp, date: Temporal.PlainDate.from(exp.date) };
+    })
   }
 
-  public async findById(id: string): Promise<Expense> {
+  public async findById(id: string): Promise<GetExpenseDto> {
     const expense = await this.expenseDataService.getById(id);
     if (!expense) {
       throw new Error('No expense found');
     }
 
-    return expense;
+    return { ...expense, date: Temporal.PlainDate.from(expense.date) };
   }
 
-  public async create(expense: CreateExpenseDto): Promise<Expense> {
-    return await this.expenseDataService.create(expense);
+  public async create(createExpense: CreateExpenseDto): Promise<GetExpenseDto> {
+    const date = createExpense.date.toString();
+    const category = { id: createExpense.categoryId };
+    const merchant = createExpense.merchantId ? { id: createExpense.merchantId } : undefined;
+    const tags = createExpense.tagIds?.map(id => {
+      return { id };
+    })
+
+    const expense = await this.expenseDataService.create({
+      date,
+      cents: createExpense.cents,
+      note: createExpense.note,
+      category,
+      merchant,
+      tags
+    });
+
+    return { ...expense, date: Temporal.PlainDate.from(expense.date) };
   }
 
-  public async update(expense: UpdateExpenseDto): Promise<Expense> {
-    return await this.expenseDataService.update(expense);
+  public async update(updateExpense: UpdateExpenseDto): Promise<GetExpenseDto> {
+    const date = updateExpense.date.toString();
+    const category = { id: updateExpense.categoryId };
+    const merchant = updateExpense.merchantId ? { id: updateExpense.merchantId } : undefined;
+    const tags = updateExpense.tagIds?.map(id => {
+      return { id };
+    })
+    const expense = await this.expenseDataService.update({
+      id: updateExpense.id,
+      date,
+      cents: updateExpense.cents,
+      note: updateExpense.note,
+      category,
+      merchant,
+      tags
+    });
+
+    return { ...expense, date: Temporal.PlainDate.from(expense.date) };
   }
 
   public async remove(id: string): Promise<void> {