From c9fa1a59d191313913f6e7883afd16663d2ef5be Mon Sep 17 00:00:00 2001
From: Suman991 <sumanmoni27@gmail.com>
Date: Thu, 9 Apr 2026 13:19:01 +0530
Subject: [PATCH] removed isDeleted field from schema and updated related
 services

---
 src/form/form.service.ts        | 11 ++++-------
 src/form/schemas/form.schema.ts |  3 ---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/form/form.service.ts b/src/form/form.service.ts
index 5d53cf9..22f5244 100644
--- a/src/form/form.service.ts
+++ b/src/form/form.service.ts
@@ -4,7 +4,6 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Form, FormDocument, Status } from './schemas/form.schema';
 import { Model } from 'mongoose';
 import { v4 as uuidv4 } from 'uuid';
-import { CreateFieldDto } from './dto/create-field.dto';
 import { UpdateFieldDto } from './dto/update-field.dto';
 import { CreateUpdateDto } from './dto/create-update.dto';
 
@@ -38,11 +37,11 @@ export class FormService {
   }
 
   async findAll(): Promise<Form[]> {
-    return await this.formModel.find({isDeleted:false}).exec();
+    return await this.formModel.find({deletedAt:null}).exec();
   }
 
   async find(formId: string): Promise<Form> {
-    const form = await this.formModel.findOne({ id: formId, isDeleted:false }).exec();
+    const form = await this.formModel.findOne({ id: formId, deletedAt:null }).exec();
     if (!form) throw new NotFoundException(`Form ${formId} not found`);
     return form;
   }
@@ -82,10 +81,9 @@ export class FormService {
 
   async softDelete(FormId: string): Promise<Form> {
     const form = await this.formModel.findOneAndUpdate(
-      { id: FormId, isDeleted: false }, // prevent double deletion
+      { id: FormId, deletedAt:null }, // prevent double deletion
       {
         $set: {
-          isDeleted: true,
           deletedAt: new Date(),
         },
       },
@@ -98,10 +96,9 @@ export class FormService {
 
   async restore(FormId: string): Promise<Form> {
     const form = await this.formModel.findOneAndUpdate(
-      { id: FormId, isDeleted: true },
+      { id: FormId, deletedAt:{$ne:null} }, // only restore if actually deleted
       {
         $set: {
-          isDeleted: false,
           deletedAt: null,
         },
       },
diff --git a/src/form/schemas/form.schema.ts b/src/form/schemas/form.schema.ts
index 0642ec0..42e01f0 100644
--- a/src/form/schemas/form.schema.ts
+++ b/src/form/schemas/form.schema.ts
@@ -26,9 +26,6 @@ export class Form {
   })
   status!: Status;
 
-  @Prop({ default: false })
-  isDeleted?: boolean;
-
   @Prop({ type: Date, default: null })
   deletedAt?: Date;
 }