Merge pull request #216 from Black-Dot-2024/revert-205-feat/RF32-Expe…

…nseReportDeets Revert "Feat/Expenses/RF32: Endpoint for expenseReport data by id"
Black-Dot-2024 · May 24, 2024 · 8ec4f0e · 8ec4f0e
2 parents e748fa3 + 3237ae9
commit 8ec4f0e
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 482 deletions.
diff --git a/prisma/migrations/20240522045959_expenses_update_fields/migration.sql b/prisma/migrations/20240522045959_expenses_update_fields/migration.sql
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -1,6 +1,5 @@
 generator client {
   provider = "prisma-client-js"
-  previewFeatures = ["omitApi"]
 }
 
 datasource db {
@@ -105,24 +104,35 @@ model expense {
   created_at     DateTime       @default(now()) @db.Timestamp(6)
   updated_at     DateTime?      @updatedAt @db.Timestamp(6)
   id_report      String         @db.Uuid
-  url_file       String?        @db.VarChar(512)
+  id_file        String?        @db.Uuid
+  file           file?          @relation(fields: [id_file], references: [id], onDelete: NoAction, onUpdate: NoAction)
   expense_report expense_report @relation(fields: [id_report], references: [id], onDelete: NoAction, onUpdate: NoAction)
 }
 
 model expense_report {
   id           String    @id @db.Uuid
-  title        String    @db.VarChar(70)
   description  String    @db.VarChar(255)
   start_date   DateTime  @db.Date
   end_date     DateTime? @db.Date
   status       String?   @db.VarChar(256)
+  total_amount Decimal?  @db.Decimal(8, 2)
   created_at   DateTime  @default(now()) @db.Timestamp(6)
   updated_at   DateTime? @updatedAt @db.Timestamp(6)
   id_employee  String    @db.Uuid
   expense      expense[]
   employee     employee  @relation(fields: [id_employee], references: [id], onDelete: NoAction, onUpdate: NoAction)
 }
 
+model file {
+  id          String    @id @db.Uuid
+  description String?   @db.VarChar(256)
+  format      String    @default(".zip") @db.VarChar(256)
+  url         String    @unique @db.VarChar(256)
+  created_at  DateTime  @default(now()) @db.Timestamp(6)
+  updated_at  DateTime? @updatedAt @db.Timestamp(6)
+  expense     expense[]
+}
+
 model form {
   id                             String    @id @db.Uuid
   title                          String    @db.VarChar(70)

diff --git a/src/api/controllers/expense.controller.ts b/src/api/controllers/expense.controller.ts
diff --git a/src/api/routes/expense.routes.ts b/src/api/routes/expense.routes.ts
diff --git a/src/api/routes/index.routes.ts b/src/api/routes/index.routes.ts
@@ -4,7 +4,6 @@ import { AdminRouter } from './admin.routes';
 import { CompanyRouter } from './company.routes';
 import { DepartmentRouter } from './department.routes';
 import { EmployeeRouter } from './employee.routes';
-import { ExpenseRouter } from './expense.routes';
 import { HomeRouter } from './home.routes';
 import { NotificationRouter } from './notification.routes';
 import { ProjectRouter } from './project.routes';
@@ -40,9 +39,6 @@ baseRouter.use(`${V1_PATH}/company`, CompanyRouter);
 // Notification
 baseRouter.use(`${V1_PATH}/notification`, NotificationRouter);
 
-// Expense
-baseRouter.use(`${V1_PATH}/expense`, ExpenseRouter);
-
 // Health check
 baseRouter.use(`${V1_PATH}/health`, (_req, res) => res.send('OK'));
 

diff --git a/src/core/app/services/__tests__/expense.service.test.ts b/src/core/app/services/__tests__/expense.service.test.ts
diff --git a/src/core/app/services/expense.service.ts b/src/core/app/services/expense.service.ts