up

database/migrations/Migration20260626120000.ts

@@ -0,0 +1,13 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260626120000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "requests" drop column if exists "status";`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`alter table "requests" add column "status" text check ("status" in ('pending', 'invoiced')) not null default 'pending';`);
+  }
+
+}

src/modules/invoice/invoice.service.ts

@@ -11,8 +11,6 @@ import { User } from '../user/entities/user.entity';
 import { ProductService } from '../product/providers/product.service';
 import { InvoiceRepository } from './repositories/invoice.repository';
 import { InvoiceCreatedEvent } from './events/invoice.events';
-import { RequestStatusEnum } from '../request/enum/request';
-
 const TAX_RATE = 0.1;
 
 type ResolvedItemDiscount = {
@@ -145,7 +143,7 @@ export class InvoiceService {
         if (!requestEntity) {
           throw new NotFoundException('Request not found');
         }
-        requestEntity.status = RequestStatusEnum.INVOICED;
+        requestEntity.deletedAt = new Date();
       }
 
       await em.flush();

src/modules/request/dto/find-requests.dto.ts

@@ -4,13 +4,10 @@ import {
   IsNumber,
   Min,
   IsIn,
-  IsEnum,
   IsDateString,
-  IsArray,
 } from 'class-validator';
-import { Type, Transform } from 'class-transformer';
+import { Type } from 'class-transformer';
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { RequestStatusEnum } from '../enum/request';
 
 const sortOrderOptions = ['asc', 'desc'] as const;
 type SortOrder = (typeof sortOrderOptions)[number];
@@ -30,17 +27,6 @@ export class FindRequestsDto {
   @Min(1)
   limit: number = 10;
 
-  @ApiPropertyOptional({
-    description: 'Filter by request statuses',
-    enum: RequestStatusEnum,
-    isArray: true,
-  })
-  @IsOptional()
-  @Transform(({ value }) => (Array.isArray(value) ? value : value?.split(',')))
-  @IsArray()
-  @IsEnum(RequestStatusEnum, { each: true })
-  statuses?: RequestStatusEnum[];
-
   @ApiPropertyOptional({
     description: 'Search by request number or user info',
   })

src/modules/request/entities/request.entity.ts

@@ -6,7 +6,6 @@ import {
   Property,
   Collection,
   Cascade,
-  Enum,
   PrimaryKey,
   OptionalProps,
 } from '@mikro-orm/core';
@@ -14,7 +13,6 @@ import { User } from '../../user/entities/user.entity';
 import { ulid } from 'ulid';
 import { BaseEntity } from 'src/common/entities/base.entity';
 import { RequestItem } from './request-item.entity';
-import { RequestStatusEnum } from '../enum/request';
 import { Invoice } from 'src/modules/invoice/entities/invoice.entity';
 
 @Entity({ tableName: 'requests' })
@@ -45,8 +43,4 @@ export class Request extends BaseEntity {
   })
   requestNumber: number;
 
-
-  @Enum(() => RequestStatusEnum)
-  status: RequestStatusEnum = RequestStatusEnum.PENDING;
-
 }

src/modules/request/enum/request.ts

@@ -1,5 +0,0 @@
-
-export enum RequestStatusEnum{
-    PENDING = 'pending',
-    INVOICED = 'invoiced',
-}

src/modules/request/repositories/request.repository.ts

@@ -4,7 +4,6 @@ import { FilterQuery } from '@mikro-orm/core';
 import { Request } from '../entities/request.entity';
 import { PaginatedResult } from 'src/common/interfaces/pagination.interface';
 import { FindRequestsDto } from '../dto/find-requests.dto';
-import { RequestStatusEnum } from '../enum/request';
 
 class FindRequestsOpts extends FindRequestsDto {
   userId?: string;
@@ -20,7 +19,6 @@ export class RequestRepository extends EntityRepository<Request> {
     const {
       page = 1,
       limit = 10,
-      statuses,
       search,
       orderBy = 'createdAt',
       order = 'desc',
@@ -37,19 +35,6 @@ export class RequestRepository extends EntityRepository<Request> {
       where.user = { id: userId };
     }
 
-    if (statuses) {
-      const normalizedStatuses = Array.isArray(statuses) ? statuses : [statuses];
-      const validStatuses = normalizedStatuses.filter((s): s is RequestStatusEnum => !!s);
-
-      if (validStatuses.length > 0) {
-        if (validStatuses.length === 1) {
-          where.status = validStatuses[0];
-        } else {
-          where.status = { $in: validStatuses };
-        }
-      }
-    }
-
     if (from || to) {
       where.createdAt = {};
       if (from) {

src/modules/request/request.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 import { EntityManager } from '@mikro-orm/postgresql';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CreateRequestDto } from './dto/create-request.dto';
@@ -6,7 +6,6 @@ import { UpdateRequestDto } from './dto/update-request.dto';
 import { FindRequestsDto } from './dto/find-requests.dto';
 import { Request } from './entities/request.entity';
 import { RequestItem } from './entities/request-item.entity';
-import { RequestStatusEnum } from './enum/request';
 import { UserService } from '../user/providers/user.service';
 import { ProductService } from '../product/providers/product.service';
 import { FieldRepository } from '../form-builder/repository/field.repository';
@@ -32,7 +31,6 @@ export class RequestService {
     const request = await this.em.transactional(async (em) => {
       const request = em.create(Request, {
         user,
-        status: RequestStatusEnum.PENDING,
       });
       em.persist(request);
 
@@ -134,10 +132,6 @@ export class RequestService {
       throw new NotFoundException('Request not found');
     }
 
-    if (request.status !== RequestStatusEnum.PENDING) {
-      throw new BadRequestException('Only pending requests can be updated');
-    }
-
     const { items } = updateRequestDto;
     if (items?.length) {
       return this.em.transactional(async (em) => {
@@ -208,9 +202,6 @@ export class RequestService {
     if (!request) {
       throw new NotFoundException('Request not found');
     }
-    if (request.status !== RequestStatusEnum.PENDING) {
-      throw new BadRequestException('Only pending requests can be deleted');
-    }
     request.deletedAt = new Date();
     await this.em.flush();
     return request;