From 5d49a677f658c42cda8c462c91c1e2fc5b366d3b Mon Sep 17 00:00:00 2001 From: Komal Date: Sun, 4 Feb 2024 11:26:12 +0530 Subject: [PATCH] Migrate api's to use async and change their import in server js --- .gitignore | 2 ++ .vscode/settings.json | 2 +- server/src/controllers/examplesController.js | 23 ++++++++++---------- server/src/controllers/tagController.js | 8 +++---- server/src/controllers/userController.js | 12 +++++----- server/src/server.js | 9 +++++--- 6 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index ded64d425..1f56d4bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +node_modules*/ node_modules/ client/build/ **/.DS_Store @@ -9,3 +10,4 @@ client/src/.sass-cache/ server/package-lock.json client/package-lock.json package-lock.json +package-lock_old.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 9ebec6039..18114accf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "eslint.autoFixOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, } \ No newline at end of file diff --git a/server/src/controllers/examplesController.js b/server/src/controllers/examplesController.js index ade09b3b8..5de1c8a5a 100644 --- a/server/src/controllers/examplesController.js +++ b/server/src/controllers/examplesController.js @@ -3,19 +3,18 @@ const exampleRoutes = express.Router(); const Page = require('../models/page.js'); const User = require('../models/user.js'); -export function getExamples(req, res) { - return User.find({ name: 'peblioexamples' }, (userFindError, user) => { - if (userFindError) { - return res.status(500).send(userFindError); +export async function getExamples(req, res) { + try { + const user = await User.findOne({ name: 'peblioexamples' }).exec(); + if(user && user._id) { + const pages = await Page.find({ user: user._id }).exec(); + return res.status(200).send(pages); } - return Page.find({ user: user[0]._id }, (pageFindError, page) => { - if (pageFindError) { - return res.status(500).send(pageFindError); - } - return res.status(200).send(page); - }); - }); + return res.status(500).send('Error while retrieving examples'); + } catch (err) { + return res.status(500).send({ error: 'Error while retrieving examples' }); + } } exampleRoutes.route('/').get(getExamples); -export default exampleRoutes; +module.exports = exampleRoutes; diff --git a/server/src/controllers/tagController.js b/server/src/controllers/tagController.js index dedae7a0a..58b979fab 100644 --- a/server/src/controllers/tagController.js +++ b/server/src/controllers/tagController.js @@ -2,19 +2,19 @@ const express = require('express'); const tagRoutes = express.Router(); import * as tagService from '../service/tagService.js'; -export function saveTag(req, res) { +function saveTag(req, res) { return tagService.saveTag(req, res); } -export function getAllTags(req, res) { +function getAllTags(req, res) { return tagService.getAllTags(req, res); } -export function getAllTagsStartingWith(req, res) { +function getAllTagsStartingWith(req, res) { return tagService.getAllTagsStartingWith(req, res); } tagRoutes.route('/').post(saveTag); tagRoutes.route('/startingWith/:tagPrefix').get(getAllTagsStartingWith); tagRoutes.route('/').get(getAllTags); -export default tagRoutes; +module.exports = tagRoutes; diff --git a/server/src/controllers/userController.js b/server/src/controllers/userController.js index 35d96638c..e652b7840 100644 --- a/server/src/controllers/userController.js +++ b/server/src/controllers/userController.js @@ -2,23 +2,23 @@ const express = require('express'); const userRoutes = express.Router(); import * as userService from '../service/userService.js'; -export function getUserProfile(req, res) { +function getUserProfile(req, res) { return userService.getUserProfile(req, res); } -export function getUserDetailsById(req, res) { +function getUserDetailsById(req, res) { return userService.getUserDetailsById(req, res); } -export function getUserDetailsForPage(req, res) { +function getUserDetailsForPage(req, res) { return userService.getUserDetailsForPage(req, res); }; -export function getUserDetailsForParentPage(req, res) { +function getUserDetailsForParentPage(req, res) { return userService.getUserDetailsForParentPage(req, res); }; -export function makePayment(req, res) { +function makePayment(req, res) { return userService.makePayment(req, res); }; @@ -27,4 +27,4 @@ userRoutes.route('/:userObjectId').get(getUserDetailsById); userRoutes.route('/pageAuthor/:pageId').get(getUserDetailsForPage); userRoutes.route('/parentPageAuthor/:pageId').get(getUserDetailsForParentPage); userRoutes.route('/payment').post(makePayment); -export default userRoutes; +module.exports = userRoutes; diff --git a/server/src/server.js b/server/src/server.js index 043f23e82..4e0169399 100644 --- a/server/src/server.js +++ b/server/src/server.js @@ -5,9 +5,7 @@ const mongoose = require('mongoose'); mongoose.Promise = Promise; const bodyParser = require('body-parser'); import express from 'express'; -import userRoutes from './controllers/userController'; -import examplesRoutes from './controllers/examplesController'; -import tagRoutes from './controllers/tagController'; + const passport = require('passport'); const cors = require('cors'); let app = express(); @@ -15,6 +13,11 @@ const expressWs = require('express-ws')(app); app = expressWs.app; const session = require('express-session'); const MongoStore = require('connect-mongo')(session); + + +const userRoutes = require('./controllers/userController'); +const examplesRoutes = require('./controllers/examplesController'); +const tagRoutes = require('./controllers/tagController'); const currentUserRoutes = require('./controllers/currentUserController'); const webSocketRoutes = require('./routes/webSocketRoutes.js')(expressWs); const pageRoutes = require('./routes/pageRoutes.js');