issue fixes: budet date (#82)

* new design login,signup,dashboard,startup page is done * page design has done for 1st phase and need refactorization * unused import removed * routing almost done * Main container margin padding. cart border,color resolve almost * re arranged * form submitting going on * form submission ndone * # api created for budget, category, wallet. # in frontend cin budget and wallet page ids type has changed * # api created for budget, category, wallet. # in frontend cin budget and wallet page ids type has changed * Added notify stack, added title and amount range in all forms, income model frontend backend completed for get and post, * added joi validation * Joi validation pending task * Joi validation pending task * Joi validation pending task * budget date issue dix * budget date issue dix * budget date issue dix * auto comepele addted * auto comepele added * auto comepele added * auto comepele issue fix, base url set
techtwig · Nov 1, 2023 · 392e8c9 · 392e8c9
1 parent 0b6ee2c
commit 392e8c9
Show file tree

Hide file tree

Showing 21 changed files with 467 additions and 290 deletions.
diff --git a/api-server-nestjs/src/budget/budget.controller.ts b/api-server-nestjs/src/budget/budget.controller.ts
@@ -28,6 +28,7 @@ export class BudgetController {
     createBudgetDto: CreateBudgetDto,
   ) {
     try {
+      /**TODO: valid wallet_id check */
       const budget = await this.budgetService.createBudget(
         req,
         createBudgetDto,
@@ -63,6 +64,23 @@ export class BudgetController {
     }
   }
 
+  @Get('total')
+  async getTotalBudget(@Req() req: CustomRequest, @Res() res: Response) {
+    try {
+      const budget = await this.budgetService.getTotalBudgets();
+
+      res.json({
+        status: 200,
+        budget,
+      });
+    } catch (e) {
+      res.json({
+        status: 500,
+        message: e.message,
+      });
+    }
+  }
+
   @Get('month')
   async getBudgetsByMonth(@Req() req: CustomRequest, @Res() res: Response) {
     try {

diff --git a/api-server-nestjs/src/budget/budget.service.ts b/api-server-nestjs/src/budget/budget.service.ts
@@ -38,6 +38,14 @@ export class BudgetService {
     }
   }
 
+  async getTotalBudgets() {
+    try {
+      return await this.budgetModel.find({});
+    } catch (e) {
+      throw new Error(e.message);
+    }
+  }
+
   async getBudgetsByMonth(req) {
     try {
       const { month } = req.query;

diff --git a/api-server-nestjs/src/budget/dtos/create-budget.dto.ts b/api-server-nestjs/src/budget/dtos/create-budget.dto.ts
@@ -1,4 +1,13 @@
-import { ArrayMinSize, IsEmpty, IsNumber, IsString } from 'class-validator';
+import {
+  ArrayMinSize,
+  IsDate,
+  IsEmpty,
+  IsNotEmpty,
+  IsNumber,
+  IsString,
+  MinDate,
+} from 'class-validator';
+import { Transform } from 'class-transformer';
 
 export class CreateBudgetDto {
   @IsString()
@@ -14,8 +23,11 @@ export class CreateBudgetDto {
   @ArrayMinSize(1)
   category_ids: string[];
 
-  @IsString()
-  month: string;
+  @IsNotEmpty()
+  @Transform(({ value }) => new Date(value))
+  @IsDate()
+  @MinDate(new Date())
+  month: Date;
 
   @IsEmpty()
   user_id: string;

diff --git a/api-server-nestjs/src/budget/dtos/update-budget.dto.ts b/api-server-nestjs/src/budget/dtos/update-budget.dto.ts
@@ -1,4 +1,4 @@
-import { IsNumber, IsOptional, IsString } from 'class-validator';
+import { IsDateString, IsNumber, IsOptional, IsString } from 'class-validator';
 
 export class UpdateBudgetDto {
   @IsOptional()
@@ -15,5 +15,9 @@ export class UpdateBudgetDto {
 
   @IsOptional()
   @IsString()
-  category_id?: string;
+  category_ids?: string;
+
+  @IsOptional()
+  @IsDateString()
+  month?: Date;
 }
diff --git a/api-server-nestjs/src/budget/validation-schema/create-budget.schema.ts b/api-server-nestjs/src/budget/validation-schema/create-budget.schema.ts
@@ -1,8 +1,8 @@
 import * as joi from 'joi';
 export const createBudgetSchema = joi.object({
-  budget_title: joi.string().required(),
-  amount: joi.number().required(),
+  budget_title: joi.string().max(30).required(),
+  amount: joi.number().min(100).max(2000000).required(),
   wallet_id: joi.string().required(),
   category_ids: joi.array().items(joi.string()),
-  month: joi.string().required(),
+  month: joi.date().required(),
 });
diff --git a/api-server-nestjs/src/expense/dtos/update-expense.dto.ts b/api-server-nestjs/src/expense/dtos/update-expense.dto.ts
@@ -1,21 +1,30 @@
-import { IsOptional, IsString, IsNumber, IsDate } from "class-validator";
+import {
+  IsOptional,
+  IsString,
+  IsNumber,
+  IsDate,
+  IsArray,
+  IsDateString,
+} from 'class-validator';
 
 export class UpdateExpenseDto {
   @IsOptional()
   @IsString()
-  expenseItem?: string;
+  title?: string;
 
   @IsOptional()
   @IsNumber()
-  expenseAmount?: number;
+  balance?: number;
 
   @IsOptional()
   @IsString()
-  expenseMonth?: string;
+  wallet_id?: number;
 
   @IsOptional()
-  @IsDate()
-  expenseTime?: Date;
-
+  @IsArray()
+  category_ids: string[];
 
+  @IsOptional()
+  @IsDateString()
+  date: string;
 }
diff --git a/api-server-nestjs/src/expense/expense.controller.ts b/api-server-nestjs/src/expense/expense.controller.ts
@@ -124,25 +124,25 @@ export class ExpenseController {
     }
   }
 
-  @Delete(':id')
-  async deleteExpense(@Req() req: CustomRequest, @Res() res: Response) {
-    try {
-      const expense = await this.expenseService.deleteExpense(req);
-      if (!expense) {
-        return res.json({
-          status: 200,
-          message: 'No expense found',
-        });
-      }
-      res.json({
-        status: 200,
-        expense: null,
-      });
-    } catch (e) {
-      res.json({
-        status: 500,
-        message: e.message,
-      });
-    }
-  }
+  // @Delete(':id')
+  // async deleteExpense(@Req() req: CustomRequest, @Res() res: Response) {
+  //   try {
+  //     const expense = await this.expenseService.deleteExpense(req);
+  //     if (!expense) {
+  //       return res.json({
+  //         status: 200,
+  //         message: 'No expense found',
+  //       });
+  //     }
+  //     res.json({
+  //       status: 200,
+  //       expense: null,
+  //     });
+  //   } catch (e) {
+  //     res.json({
+  //       status: 500,
+  //       message: e.message,
+  //     });
+  //   }
+  // }
 }
diff --git a/api-server-nestjs/src/expense/validation-schema/create-expense.schema.ts b/api-server-nestjs/src/expense/validation-schema/create-expense.schema.ts
@@ -1,7 +1,7 @@
 import * as joi from 'joi';
 export const createExpenseSchema = joi.object({
-  title: joi.string().required(),
-  balance: joi.number().required(),
+  title: joi.string().max(30).required(),
+  balance: joi.number().min(100).max(2000000).required(),
   wallet_id: joi.string().required(),
   category_ids: joi.array().items(joi.string()),
   date: joi.string().required(),

diff --git a/api-server-nestjs/src/income/dtos/update-income.dto.ts b/api-server-nestjs/src/income/dtos/update-income.dto.ts
@@ -1,21 +1,30 @@
-import { IsOptional, IsString, IsNumber, IsDate } from "class-validator";
+import {
+  IsOptional,
+  IsString,
+  IsNumber,
+  IsDate,
+  IsArray,
+  IsDateString,
+} from 'class-validator';
 
 export class UpdateIncomeDto {
   @IsOptional()
   @IsString()
-  income_source?: string;
+  title?: string;
 
   @IsOptional()
   @IsNumber()
-  income_amount?: number;
+  balance?: number;
 
   @IsOptional()
   @IsString()
-  income_month?: string;
+  wallet_id?: number;
 
   @IsOptional()
-  @IsDate()
-  income_time?: Date;
-
+  @IsArray()
+  category_ids: string[];
 
+  @IsOptional()
+  @IsDateString()
+  date: string;
 }
diff --git a/api-server-nestjs/src/income/validation-schema/create-income.schema.ts b/api-server-nestjs/src/income/validation-schema/create-income.schema.ts
@@ -1,7 +1,7 @@
 import * as joi from 'joi';
 export const createIncomeSchema = joi.object({
-  title: joi.string().required(),
-  balance: joi.number().required(),
+  title: joi.string().max(30).required(),
+  balance: joi.number().min(100).max(2000000).required(),
   wallet_id: joi.string().required(),
   category_ids: joi.array().items(joi.string()),
   date: joi.string().required(),

diff --git a/api-server-nestjs/src/wallet/validation-schema/create-wallet.schema.ts b/api-server-nestjs/src/wallet/validation-schema/create-wallet.schema.ts
diff --git a/api-server-nestjs/src/wallet/validation-schema/create-wallet.validation.schema.ts b/api-server-nestjs/src/wallet/validation-schema/create-wallet.validation.schema.ts
@@ -0,0 +1,8 @@
+import * as joi from 'joi';
+export const createWalletValidationSchema = joi.object({
+  wallet_title: joi.string().required(),
+
+  type_id: joi.number().required(),
+
+  balance: joi.number().min(100).max(2000000).required(),
+});
diff --git a/api-server-nestjs/src/wallet/wallet.controller.ts b/api-server-nestjs/src/wallet/wallet.controller.ts
@@ -14,7 +14,7 @@ import { WalletService } from './wallet.service';
 import { CreateWalletDto } from './dtos/create-wallet.dto';
 import { UpdateWalletDto } from './dtos/update-wallet.dto';
 import { JoiValidationPipe } from '../validation-pipe/validation.pipe';
-import { createWalletSchema } from './validation-schema/create-wallet.schema';
+import { createWalletValidationSchema } from './validation-schema/create-wallet.validation.schema';
 
 @Controller('wallet')
 export class WalletController {
@@ -24,7 +24,8 @@ export class WalletController {
   async createWallet(
     @Req() req: CustomRequest,
     @Res() res: Response,
-    @Body(new JoiValidationPipe(createWalletSchema)) body: CreateWalletDto,
+    @Body(new JoiValidationPipe(createWalletValidationSchema))
+    body: CreateWalletDto,
   ) {
     try {
       const wallet = await this.walletService.createWallet(req, res, body);