feat: added budget proposal

.env.example

@@ -3,4 +3,5 @@ DATABASE_PORT=5432
 DATABASE_USERNAME=postgres
 DATABASE_PASSWORD=your_password
 DATABASE_NAME=mydatabase
-APP_PORT=3000
+APP_PORT=3000
+JWT_SECRET=secret

package.json

@@ -37,6 +37,7 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "compression": "^1.8.0",
+    "dotenv": "^16.5.0",
     "helmet": "^8.1.0",
     "jsonwebtoken": "^9.0.2",
     "nest-winston": "^1.10.2",

src/app.module.ts

@@ -15,6 +15,7 @@ import configuration from './config/configuration';
 import { ConfigModule as NestConfigModule } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { User } from './modules/user/entities/user.entity';
+import { BudgetProposalModule } from './modules/budget-proposal/budget-proposal.module';
 
 @Module({
   imports: [
@@ -31,6 +32,7 @@ import { User } from './modules/user/entities/user.entity';
     BudgetModule,
     AuthModule,
     TreasuryModule,
+    BudgetProposalModule,
     TypeOrmModule.forRoot({
       type: 'postgres',
       host: process.env.DATABASE_HOST || 'localhost',

src/config/configuration.ts

@@ -1,5 +1,5 @@
-import dotenv from 'dotenv';
-dotenv.config();
+import { config } from 'dotenv';
+config();
 
 // Helper to parse integers robustly
 const toInt = (value: string | undefined, fallback: number): number => {

src/config/jwt-config.service.ts

@@ -7,9 +7,8 @@ export class JwtConfigService {
   private readonly jwtExpiresIn: string;
 
   constructor(private readonly configService: ConfigService) {
-    this.jwtSecret = this.configService.getOrThrow<string>('app.jwt.secret');
-    this.jwtExpiresIn =
-      this.configService.getOrThrow<string>('app.jwt.expiresIn');
+    this.jwtSecret = this.configService.getOrThrow<string>('jwt.secret');
+    this.jwtExpiresIn = this.configService.getOrThrow<string>('jwt.expiresIn');
   }
 
   get secret(): string {

src/modules/auth/types/auth.request.ts

@@ -0,0 +1,6 @@
+import { Request } from 'express';
+import { User } from '../../user/entities/user.entity';
+
+export interface AuthRequest extends Request {
+  user: User;
+}

src/modules/budget-proposal/budget-proposal.module.ts

@@ -0,0 +1,28 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { BudgetProposalController } from './controllers/budget-proposal.controller';
+import { BudgetProposalService } from './services/budget-proposal.service';
+import { BudgetProposalImpl } from '../repository/budget-proposal.repository';
+import { BudgetProposal } from './entities/budget-proposal.entity';
+import { BudgetProposalCategory } from './entities/budget-proposal-category.entity';
+import { BudgetProposalMetric } from './entities/budget-proposal-metric.entity';
+import { BudgetProposalComment } from './entities/budget-proposal-comment.entity';
+import { TreasuryModule } from '../treasury/treasury.module';
+import { UserModule } from '../user/user.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      BudgetProposal,
+      BudgetProposalCategory,
+      BudgetProposalMetric,
+      BudgetProposalComment,
+    ]),
+    TreasuryModule,
+    UserModule,
+  ],
+  controllers: [BudgetProposalController],
+  providers: [BudgetProposalService, BudgetProposalImpl],
+  exports: [BudgetProposalService],
+})
+export class BudgetProposalModule {}

src/modules/budget-proposal/controllers/budget-proposal.controller.ts

@@ -0,0 +1,105 @@
+import {
+  Controller,
+  Get,
+  Post,
+  Body,
+  Param,
+  Put,
+  Delete,
+  Query,
+  Req,
+} from '@nestjs/common';
+import { BudgetProposalService } from '../services/budget-proposal.service';
+import { BudgetProposal } from '../entities/budget-proposal.entity';
+import { CreateBudgetProposalDto } from '../entities/dto/create-budget-proposal.dto';
+import { UpdateBudgetProposalDto } from '../entities/dto/update-budget-proposal.dto';
+import { Roles } from '../../../shared/decorators/roles.decorator';
+import { UserRole } from '../../user/entities/user.entity';
+import { AddCommentDto } from '../entities/dto/add-comment.dto';
+import { BudgetProposalStatus } from '../entities/budget-proposal.entity';
+import { AuthRequest } from '../../auth/types/auth.request';
+
+@Controller('budget-proposals')
+export class BudgetProposalController {
+  constructor(private readonly budgetProposalService: BudgetProposalService) {}
+
+  @Post()
+  @Roles(UserRole.USER)
+  create(
+    @Body() createBudgetProposalDto: CreateBudgetProposalDto,
+    @Req() req: AuthRequest
+  ): Promise<BudgetProposal> {
+    return this.budgetProposalService.create(createBudgetProposalDto, req.user);
+  }
+
+  @Get()
+  @Roles(UserRole.USER)
+  findAll(
+    @Query('treasuryId') treasuryId?: string,
+    @Query('status') status?: BudgetProposalStatus,
+    @Query('submitterId') submitterId?: string,
+    @Query('search') search?: string
+  ): Promise<BudgetProposal[]> {
+    return this.budgetProposalService.findAll(
+      treasuryId,
+      status,
+      submitterId,
+      search
+    );
+  }
+
+  @Get(':id')
+  @Roles(UserRole.USER)
+  findOne(@Param('id') id: string): Promise<BudgetProposal> {
+    return this.budgetProposalService.findOne(id);
+  }
+
+  @Put(':id')
+  @Roles(UserRole.USER)
+  update(
+    @Param('id') id: string,
+    @Body() updateBudgetProposalDto: UpdateBudgetProposalDto,
+    @Req() req: AuthRequest
+  ): Promise<BudgetProposal> {
+    return this.budgetProposalService.update(
+      id,
+      updateBudgetProposalDto,
+      req.user
+    );
+  }
+
+  @Post(':id/submit')
+  @Roles(UserRole.USER)
+  submitForReview(
+    @Param('id') id: string,
+    @Req() req: AuthRequest
+  ): Promise<BudgetProposal> {
+    return this.budgetProposalService.submitForReview(id, req.user);
+  }
+
+  @Put(':id/status')
+  @Roles(UserRole.USER)
+  changeStatus(
+    @Param('id') id: string,
+    @Body('status') status: BudgetProposalStatus,
+    @Body('allocatedAmount') allocatedAmount?: number
+  ): Promise<BudgetProposal> {
+    return this.budgetProposalService.changeStatus(id, status, allocatedAmount);
+  }
+
+  @Post(':id/comments')
+  @Roles(UserRole.USER)
+  addComment(
+    @Param('id') id: string,
+    @Body() addCommentDto: AddCommentDto,
+    @Req() req: AuthRequest
+  ): Promise<BudgetProposal> {
+    return this.budgetProposalService.addComment(id, addCommentDto, req.user);
+  }
+
+  @Delete(':id')
+  @Roles(UserRole.USER)
+  remove(@Param('id') id: string, @Req() req: AuthRequest): Promise<void> {
+    return this.budgetProposalService.remove(id, req.user);
+  }
+}

src/modules/budget-proposal/entities/budget-proposal-category.entity.ts

@@ -0,0 +1,23 @@
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
+import { BudgetProposal } from './budget-proposal.entity';
+
+@Entity()
+export class BudgetProposalCategory {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column()
+  name: string;
+
+  @Column({ type: 'decimal', precision: 18, scale: 2 })
+  amount: number;
+
+  @Column()
+  description: string;
+
+  @ManyToOne(
+    () => BudgetProposal,
+    budget_proposal => budget_proposal.categories
+  )
+  budget_proposal: BudgetProposal;
+}

src/modules/budget-proposal/entities/budget-proposal-comment.entity.ts

@@ -0,0 +1,31 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  JoinColumn,
+} from 'typeorm';
+import { BudgetProposal } from './budget-proposal.entity';
+import { User } from '../../user/entities/user.entity';
+
+@Entity()
+export class BudgetProposalComment {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column('text')
+  content: string;
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: 'authorId' })
+  author: User;
+
+  @Column()
+  authorId: string;
+
+  @ManyToOne(() => BudgetProposal, budget_proposal => budget_proposal.comments)
+  budget_proposal: BudgetProposal;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  createdAt: Date;
+}

src/modules/budget-proposal/entities/budget-proposal-metric.entity.ts

@@ -0,0 +1,20 @@
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
+import { BudgetProposal } from './budget-proposal.entity';
+
+@Entity()
+export class BudgetProposalMetric {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column()
+  name: string;
+
+  @Column()
+  value: string;
+
+  @Column()
+  description: string;
+
+  @ManyToOne(() => BudgetProposal, budget_proposal => budget_proposal.metrics)
+  budget_proposal: BudgetProposal;
+}

src/modules/budget-proposal/entities/budget-proposal.entity.ts

@@ -0,0 +1,110 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  ManyToOne,
+  JoinColumn,
+  OneToMany,
+  CreateDateColumn,
+  UpdateDateColumn,
+  VersionColumn,
+} from 'typeorm';
+import { Budget as Treasury } from '../../treasury/entities/budget.entity';
+import { User } from '../../user/entities/user.entity';
+import { BudgetProposalComment } from './budget-proposal-comment.entity';
+import { BudgetProposalCategory } from './budget-proposal-category.entity';
+import { BudgetProposalMetric } from './budget-proposal-metric.entity';
+
+export enum BudgetProposalStatus {
+  DRAFT = 'Draft',
+  SUBMITTED = 'Submitted',
+  UNDER_REVIEW = 'Under Review',
+  APPROVED = 'Approved',
+  REJECTED = 'Rejected',
+}
+
+@Entity('budget_proposals')
+export class BudgetProposal {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @ManyToOne(() => Treasury, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'treasuryId' })
+  treasury: Treasury;
+
+  @Column()
+  treasuryId: string;
+
+  @Column()
+  name: string;
+
+  @Column('text')
+  description: string;
+
+  @Column()
+  department: string;
+
+  @ManyToOne(() => User)
+  @JoinColumn({ name: 'submitterId' })
+  submitter: User;
+
+  @Column()
+  submitterId: string;
+
+  @Column({ type: 'date' })
+  startDate: Date;
+
+  @Column({ type: 'date' })
+  endDate: Date;
+
+  @Column({ type: 'decimal', precision: 18, scale: 2 })
+  requestedAmount: number;
+
+  @Column({ type: 'decimal', precision: 18, scale: 2, nullable: true })
+  allocatedAmount: number | null;
+
+  @Column({
+    type: 'enum',
+    enum: BudgetProposalStatus,
+    default: BudgetProposalStatus.DRAFT,
+  })
+  status: BudgetProposalStatus;
+
+  @Column({ type: 'decimal', precision: 5, scale: 2, nullable: true })
+  score: number | null;
+
+  @OneToMany(
+    () => BudgetProposalCategory,
+    category => category.budget_proposal,
+    {
+      cascade: true,
+    }
+  )
+  categories: BudgetProposalCategory[];
+
+  @OneToMany(() => BudgetProposalMetric, metric => metric.budget_proposal, {
+    cascade: true,
+  })
+  metrics: BudgetProposalMetric[];
+
+  @Column('simple-array', { nullable: true })
+  supportingDocuments: string[];
+
+  @Column({ type: 'timestamp', nullable: true })
+  submissionDate: Date | null;
+
+  @Column({ type: 'timestamp', nullable: true })
+  approvalDate: Date | null;
+
+  @OneToMany(() => BudgetProposalComment, comment => comment.budget_proposal)
+  comments: BudgetProposalComment[];
+
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @UpdateDateColumn()
+  updatedAt: Date;
+
+  @VersionColumn()
+  version: number;
+}

src/modules/budget-proposal/entities/dto/add-comment.dto.ts

@@ -0,0 +1,7 @@
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class AddCommentDto {
+  @IsNotEmpty()
+  @IsString()
+  content: string;
+}