- Added helpers and toJson

- Added 'all' route
- Added _id in models

Author: Chahat Gupta

src/helper/mock.helper.ts

@@ -0,0 +1,13 @@
+import {MockModel} from "../models/mock.model";
+
+export default class MockHelper {
+
+    static toJson(model: MockModel) {
+        return {
+            id: model._id,
+            name: model.name,
+            response: model.response
+        }
+    }
+
+}

src/helper/mock_folder.helper.ts

@@ -0,0 +1,15 @@
+import {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) {
+        return {
+            id: model._id,
+            name: model.name,
+            folders: child?.map((e) => MockHelper.toJson(e))
+        }
+    }
+
+}

src/models/mock.model.ts

@@ -1,12 +1,14 @@
 import { Schema, Model, model } from 'mongoose'
 
 export type MockModel = {
+    _id: string
     folderId: string | null
     name: string
     response: string
-};
+}
 
 const MockSchema: Schema<MockModel> = new Schema<MockModel>({
+    _id: Schema.Types.ObjectId,
     folderId: {
         type: String,
         required: false,
@@ -20,6 +22,6 @@ const MockSchema: Schema<MockModel> = new Schema<MockModel>({
         type: String,
         required: true
     }
-});
+})
 
 export const Mock: Model<MockModel> = model('Mock', MockSchema)

src/models/mock_folder.model.ts

@@ -1,14 +1,16 @@
 import { Schema, Model, model } from 'mongoose'
 
 export type MockFolderModel = {
+    _id: string
     name: string
-};
+}
 
 const MockFolderSchema: Schema<MockFolderModel> = new Schema<MockFolderModel>({
+    _id: Schema.Types.ObjectId,
     name: {
         type: String,
         required: true
     }
-});
+})
 
 export const MockFolder: Model<MockFolderModel> = model('MockFolder', MockFolderSchema)

src/routes/all.routes.ts

@@ -2,6 +2,8 @@ import express, { Request, Response } from 'express'
 import { MockFolder, MockFolderModel } from '../models/mock_folder.model'
 import { ApiResponse } from '../common/api_response'
 import {Mock, MockModel} from "../models/mock.model";
+import MockFolderHelper from "../helper/mock_folder.helper";
+import MockHelper from "../helper/mock.helper";
 
 const router = express.Router()
 
@@ -10,8 +12,8 @@ router.get('/', async (req: Request, res: Response): Promise<void> => {
         const mockFolders: MockFolderModel[] = await MockFolder.find()
         const mocks: MockModel[] = await Mock.find({ folderId: null })
         const response: ApiResponse = ApiResponse.success({
-            folders: mockFolders,
-            files: mocks
+            folders: mockFolders.map((e) => MockFolderHelper.toJson(e, null)),
+            files: mocks.map((e) => MockHelper.toJson(e))
         })
         res.status(200).json(response)
     } catch (error: unknown) {

src/routes/mock.routes.ts

@@ -2,13 +2,15 @@ import express, { Request, Response } from 'express'
 import { Mock, MockModel } from '../models/mock.model'
 import { ApiResponse } from '../common/api_response'
 import mongoose from 'mongoose'
+import MockHelper from "../helper/mock.helper";
+import { Types } from "mongoose";
 
 const router = express.Router()
 
 router.get('/', async (req: Request, res: Response): Promise<void> => {
     try {
         const mocks: MockModel[] = await Mock.find()
-        const response: ApiResponse = ApiResponse.success(mocks)
+        const response: ApiResponse = ApiResponse.success(mocks.map((e) => MockHelper.toJson(e)))
         res.status(200).json(response)
     } catch (error: unknown) {
         const response: ApiResponse = ApiResponse.error((error as Error).message)
@@ -20,7 +22,7 @@ router.get('/:id', async (req: Request, res: Response): Promise<void> => {
     try {
         const mock: MockModel | null = await Mock.findById(req.params.id)
         if (mock != null) {
-            const response: ApiResponse = ApiResponse.success(mock)
+            const response: ApiResponse = ApiResponse.success(MockHelper.toJson(mock))
             res.status(200).json(response)
         } else {
             const response: ApiResponse = ApiResponse.error(`No document found with id ${req.params.id}`)
@@ -50,13 +52,14 @@ router.get('/mock/:id', async (req: Request, res: Response): Promise<void> => {
 router.post('/', async (req: Request, res: Response): Promise<void> => {
 
     const data = new Mock({
+        _id: new Types.ObjectId(),
         folderId: req.body.folderId,
         name: req.body.name,
         response: req.body.response
     })
     try {
         const mock: MockModel = await data.save()
-        const response: ApiResponse = ApiResponse.success(mock, 'Document created')
+        const response: ApiResponse = ApiResponse.success(MockHelper.toJson(mock), 'Document created')
         res.status(201).json(response)
     } catch (error: unknown) {
         const response: ApiResponse = ApiResponse.error((error as Error).message)

src/routes/mock_folder.routes.ts

@@ -1,14 +1,16 @@
 import express, { Request, Response } from 'express'
 import { MockFolder, MockFolderModel } from '../models/mock_folder.model'
 import { ApiResponse } from '../common/api_response'
-import mongoose from 'mongoose'
+import mongoose, {Types} from 'mongoose'
+import {Mock, MockModel} from "../models/mock.model";
+import MockFolderHelper from "../helper/mock_folder.helper";
 
 const router = express.Router()
 
 router.get('/', async (req: Request, res: Response): Promise<void> => {
     try {
         const mockFolders: MockFolderModel[] = await MockFolder.find()
-        const response: ApiResponse = ApiResponse.success(mockFolders)
+        const response: ApiResponse = ApiResponse.success(mockFolders.map((e) => MockFolderHelper.toJson(e, null)))
         res.status(200).json(response)
     } catch (error: unknown) {
         const response: ApiResponse = ApiResponse.error((error as Error).message)
@@ -20,7 +22,8 @@ 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 response: ApiResponse = ApiResponse.success(mockFolder)
+            const mocks: MockModel[] = await Mock.find({ folderId: req.params.id })
+            const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(mockFolder, mocks))
             res.status(200).json(response)
         } else {
             const response: ApiResponse = ApiResponse.error(`No document found with id ${req.params.id}`)
@@ -35,11 +38,12 @@ router.get('/:id', async (req: Request, res: Response): Promise<void> => {
 router.post('/', async (req: Request, res: Response): Promise<void> => {
 
     const data = new MockFolder({
+        _id: new Types.ObjectId(),
         name: req.body.name
     })
     try {
         const mockFolder: MockFolderModel = await data.save()
-        const response: ApiResponse = ApiResponse.success(mockFolder, 'Document created')
+        const response: ApiResponse = ApiResponse.success(MockFolderHelper.toJson(mockFolder, null), 'Document created')
         res.status(201).json(response)
     } catch (error: unknown) {
         const response: ApiResponse = ApiResponse.error((error as Error).message)