Added parentId in folder and moved /all to folder/

Author: Chahat Gupta

src/helper/mock_folder.helper.ts

@@ -1,14 +1,15 @@
-import {MockFolderModel} from "../models/mock_folder.model";
+import {MockFolder, MockFolderModel} from "../models/mock_folder.model";
 import {MockModel} from "../models/mock.model";
 import MockHelper from "./mock.helper";
 
 export default class MockFolderHelper {
 
-    static toJson(model: MockFolderModel, child: MockModel[] | null) {
+    static toJson(model: MockFolderModel, folders: MockFolderModel[] | null = null, files: MockModel[] | null = null) : any {
         return {
             id: model._id,
             name: model.name,
-            folders: child?.map((e) => MockHelper.toJson(e))
+            folders: folders?.map((e) => MockFolderHelper.toJson(e)),
+            files: files?.map((e) => MockHelper.toJson(e))
         }
     }
 

src/models/mock_folder.model.ts

@@ -2,11 +2,17 @@ import { Schema, Model, model } from 'mongoose'
 
 export type MockFolderModel = {
     _id: string
+    parentId: string | null
     name: string
 }
 
 const MockFolderSchema: Schema<MockFolderModel> = new Schema<MockFolderModel>({
     _id: Schema.Types.ObjectId,
+    parentId: {
+        type: String,
+        required: false,
+        default: null
+    },
     name: {
         type: String,
         required: true

src/routes/mock_folder.routes.ts

@@ -9,8 +9,14 @@ const router = express.Router()
 
 router.get('/', async (req: Request, res: Response): Promise<void> => {
     try {
+        const root: MockFolderModel = {
+            _id: 'root',
+            parentId: null,
+            name: 'Root'
+        }
         const mockFolders: MockFolderModel[] = await MockFolder.find()
-        const response: ApiResponse = ApiResponse.success(mockFolders.map((e) => MockFolderHelper.toJson(e, null)))
+        const mocks: MockModel[] = await Mock.find({ parentId: null })
+        const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(root, mockFolders, mocks))
         res.status(200).json(response)
     } catch (error: unknown) {
         const response: ApiResponse = ApiResponse.error((error as Error).message)
@@ -22,8 +28,9 @@ router.get('/:id', async (req: Request, res: Response): Promise<void> => {
     try {
         const mockFolder: MockFolderModel | null = await MockFolder.findById(req.params.id)
         if (mockFolder != null) {
+            const subFolders: MockFolderModel[] = await MockFolder.find({ parentId: req.params.id })
             const mocks: MockModel[] = await Mock.find({ parentId: req.params.id })
-            const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(mockFolder, mocks))
+            const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(mockFolder, subFolders, mocks))
             res.status(200).json(response)
         } else {
             const response: ApiResponse = ApiResponse.error(`No document found with id ${req.params.id}`)
@@ -43,7 +50,7 @@ router.post('/', async (req: Request, res: Response): Promise<void> => {
     })
     try {
         const mockFolder: MockFolderModel = await data.save()
-        const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(mockFolder, null), 'Document created')
+        const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(mockFolder), 'Document created')
         res.status(201).json(response)
     } catch (error: unknown) {
         const response: ApiResponse = ApiResponse.error((error as Error).message)