Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
major feat: updated the whole project to ESM module.
  • Loading branch information
hanoak20 committed Mar 13, 2024
commit 137ecc34237b0114bd4eb17ab30193fd15dcb5c0
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
"name": "migration-v2-node-server",
"version": "1.0.0",
"description": "This is the TSO migration V2's node server",
"main": "index.js",
"exports": "./src/server.ts",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "npx tsc",
"start": "NODE_ENV=production node dist/server.js",
"dev": "NODE_ENV=development nodemon ./src/server.ts",
"dev": "NODE_ENV=development tsx watch ./src/server.ts",
"precommit": "lint-staged --concurrent false"
},
"type": "commonjs",
"type": "module",
"repository": {
"type": "git",
"url": "git+https://github.com/contentstack-expert-services/migration-v2-node-server.git"
Expand Down Expand Up @@ -40,15 +39,14 @@
"@types/node": "^20.10.4",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"concurrently": "^8.2.2",
"eslint": "^8.56.0",
"eslint-config-airbnb": "^19.0.0",
"eslint-config-prettier": "^8.3.0",
"husky": "^4.3.8",
"lint-staged": "^15.2.2",
"nodemon": "^3.0.2",
"prettier": "^2.4.1",
"ts-node": "^10.9.2",
"tsx": "^4.7.1",
"typescript": "^5.3.3",
"validate-branch-name": "^1.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions src/config/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import dotenv from "dotenv";
import path from "path";
import { prodConfig } from "./prod.config";
import { devConfig } from "./dev.config";
import { prodConfig } from "./prod.config.js";
import { devConfig } from "./dev.config.js";

dotenv.config({
path: path.resolve(process.cwd(), `${process.env.NODE_ENV}.env`),
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/auth.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { authService } from "../services/auth.service";
import { authService } from "../services/auth.service.js";

const login = async (req: Request, res: Response) => {
const resp = await authService.login(req);
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/org.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { orgService } from "../services/org.service";
import { orgService } from "../services/org.service.js";

const getAllStacks = async (req: Request, res: Response) => {
const resp = await orgService.getAllStacks(req);
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/projects.contentMapper.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { contentMapperService } from "../services/contentMapper.service";
import { contentMapperService } from "../services/contentMapper.service.js";
const putTestData = async (req: Request, res: Response): Promise<void> => {
const resp = await contentMapperService.putTestData(req);
res.status(200).json(resp);
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/projects.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { projectService } from "../services/projects.service";
import { projectService } from "../services/projects.service.js";

const getAllProjects = async (req: Request, res: Response): Promise<void> => {
const allProjects = await projectService.getAllProjects(req);
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/user.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { userService } from "../services/user.service";
import { userService } from "../services/user.service.js";

const getUserProfile = async (req: Request, res: Response) => {
const resp = await userService.getUserProfile(req);
Expand Down
12 changes: 6 additions & 6 deletions src/database.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// database.ts
import mongoose from "mongoose";
import { config } from "./config";
import logger from "./utils/logger";
import ProjectModel from "./models/project";
import AuthenticationModel from "./models/authentication";
import ContentTypesMapperModel from "./models/contentTypesMapper";
import FieldMapperModel from "./models/FieldMapper";
import { config } from "./config/index.js";
import logger from "./utils/logger.js";
import ProjectModel from "./models/project.js";
import AuthenticationModel from "./models/authentication.js";
import ContentTypesMapperModel from "./models/contentTypesMapper.js";
import FieldMapperModel from "./models/FieldMapper.js";

const connectToDatabase = async () => {
try {
Expand Down
4 changes: 2 additions & 2 deletions src/middlewares/auth.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// middleware/authentication.middleware.ts
import { Request, Response, NextFunction } from "express";
import jwt from "jsonwebtoken";
import { config } from "../config";
import { HTTP_CODES } from "../constants";
import { config } from "../config/index.js";
import { HTTP_CODES } from "../constants/index.js";

export const authenticateUser = (
req: Request,
Expand Down
4 changes: 2 additions & 2 deletions src/middlewares/auth.migration.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { HTTP_CODES } from "../constants";
import { config } from "../config";
import { HTTP_CODES } from "../constants/index.js";
import { config } from "../config/index.js";

export const authenticateMigrationService = (
req: Request,
Expand Down
4 changes: 2 additions & 2 deletions src/middlewares/auth.uploadService.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { HTTP_CODES } from "../constants";
import { config } from "../config";
import { HTTP_CODES } from "../constants/index.js";
import { config } from "../config/index.js";

export const authenticateUploadService = (
req: Request,
Expand Down
4 changes: 2 additions & 2 deletions src/middlewares/error.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Request, Response, NextFunction } from "express";
import { AppError } from "../utils/custom-errors.utils";
import logger from "../utils/logger";
import { AppError } from "../utils/custom-errors.utils.js";
import logger from "../utils/logger.js";

export const errorMiddleware = (
err: Error,
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/logger.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import expressWinston from "express-winston";
import logger from "../utils/logger";
import logger from "../utils/logger.js";

//Logger Middleware to log every request
const loggerMiddleware = expressWinston.logger({
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/unmatched-routes.middleware.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Request, Response } from "express";
import { HTTP_CODES, HTTP_TEXTS } from "../constants";
import { HTTP_CODES, HTTP_TEXTS } from "../constants/index.js";

export const unmatchedRoutesMiddleware = (req: Request, res: Response) => {
const status = HTTP_CODES.NOT_FOUND;
Expand Down
2 changes: 1 addition & 1 deletion src/models/authentication.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/models/Authentication.ts

import { Schema, model, Document } from "mongoose";
import { CS_REGIONS } from "../constants";
import { CS_REGIONS } from "../constants/index.js";

interface AuthenticationDocument extends Document {
user_id: string;
Expand Down
2 changes: 1 addition & 1 deletion src/models/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
PREDEFINED_STEPS,
PROJECT_STATUS,
STEPPER_STEPS,
} from "../constants";
} from "../constants/index.js";

interface LegacyCMS {
cms: string;
Expand Down
6 changes: 3 additions & 3 deletions src/routes/auth.routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import express from "express";
import { authController } from "../controllers/auth.controller";
import { asyncRouter } from "../utils/async-router.utils";
import validator from "../validators";
import { authController } from "../controllers/auth.controller.js";
import { asyncRouter } from "../utils/async-router.utils.js";
import validator from "../validators/index.js";

const router = express.Router();

Expand Down
4 changes: 2 additions & 2 deletions src/routes/contentMapper.routes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import express from "express";
import { contentMapperController } from "../controllers/projects.contentMapper.controller";
import { asyncRouter } from "../utils/async-router.utils";
import { contentMapperController } from "../controllers/projects.contentMapper.controller.js";
import { asyncRouter } from "../utils/async-router.utils.js";

const router = express.Router({ mergeParams: true });

Expand Down
4 changes: 2 additions & 2 deletions src/routes/migrationMidlleware.routes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import express from "express";
import { projectController } from "../controllers/projects.controller";
import { asyncRouter } from "../utils/async-router.utils";
import { projectController } from "../controllers/projects.controller.js";
import { asyncRouter } from "../utils/async-router.utils.js";

const router = express.Router({ mergeParams: true });

Expand Down
6 changes: 3 additions & 3 deletions src/routes/org.routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import express from "express";
import { orgController } from "../controllers/org.controller";
import { asyncRouter } from "../utils/async-router.utils";
import validator from "../validators";
import { orgController } from "../controllers/org.controller.js";
import { asyncRouter } from "../utils/async-router.utils.js";
import validator from "../validators/index.js";

const router = express.Router({ mergeParams: true });

Expand Down
6 changes: 3 additions & 3 deletions src/routes/projects.routes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import express from "express";
import { projectController } from "../controllers/projects.controller";
import { asyncRouter } from "../utils/async-router.utils";
import validator from "../validators";
import { projectController } from "../controllers/projects.controller.js";
import { asyncRouter } from "../utils/async-router.utils.js";
import validator from "../validators/index.js";

const router = express.Router({ mergeParams: true });

Expand Down
4 changes: 2 additions & 2 deletions src/routes/user.routes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import express from "express";
import { userController } from "../controllers/user.controller";
import { asyncRouter } from "../utils/async-router.utils";
import { userController } from "../controllers/user.controller.js";
import { asyncRouter } from "../utils/async-router.utils.js";

const router = express.Router();

Expand Down
30 changes: 15 additions & 15 deletions src/server.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// file deepcode ignore UseCsurfForExpress: We've app_token for all the API calls, so we don't need CSRF token.
import { config } from "./config";
import { config } from "./config/index.js";
import express from "express";
import cors from "cors";
import helmet from "helmet";
import authRoutes from "./routes/auth.routes";
import userRoutes from "./routes/user.routes";
import projectRoutes from "./routes/projects.routes";
import orgRoutes from "./routes/org.routes";
import { errorMiddleware } from "./middlewares/error.middleware";
import loggerMiddleware from "./middlewares/logger.middleware";
import connectToDatabase from "./database";
import { authenticateUser } from "./middlewares/auth.middleware";
import { requestHeadersMiddleware } from "./middlewares/req-headers.middleware";
import { unmatchedRoutesMiddleware } from "./middlewares/unmatched-routes.middleware";
import logger from "./utils/logger";
import contentMapperRoutes from "./routes/contentMapper.routes";
import migrationMidllewareRoutes from "./routes/migrationMidlleware.routes";
import { authenticateMigrationService } from "./middlewares/auth.migration.middleware";
import authRoutes from "./routes/auth.routes.js";
import userRoutes from "./routes/user.routes.js";
import projectRoutes from "./routes/projects.routes.js";
import orgRoutes from "./routes/org.routes.js";
import { errorMiddleware } from "./middlewares/error.middleware.js";
import loggerMiddleware from "./middlewares/logger.middleware.js";
import connectToDatabase from "./database.js";
import { authenticateUser } from "./middlewares/auth.middleware.js";
import { requestHeadersMiddleware } from "./middlewares/req-headers.middleware.js";
import { unmatchedRoutesMiddleware } from "./middlewares/unmatched-routes.middleware.js";
import logger from "./utils/logger.js";
import contentMapperRoutes from "./routes/contentMapper.routes.js";
import migrationMidllewareRoutes from "./routes/migrationMidlleware.routes.js";
import { authenticateMigrationService } from "./middlewares/auth.migration.middleware.js";

try {
const app = express();
Expand Down
18 changes: 9 additions & 9 deletions src/services/auth.service.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { Request } from "express";
import { config } from "../config";
import { safePromise, getLogMessage } from "../utils";
import https from "../utils/https.utils";
import { LoginServiceType, AppTokenPayload } from "../models/types";
import { HTTP_CODES, HTTP_TEXTS } from "../constants";
import { generateToken } from "../utils/jwt.utils";
import { config } from "../config/index.js";
import { safePromise, getLogMessage } from "../utils/index.js";
import https from "../utils/https.utils.js";
import { LoginServiceType, AppTokenPayload } from "../models/types.js";
import { HTTP_CODES, HTTP_TEXTS } from "../constants/index.js";
import { generateToken } from "../utils/jwt.utils.js";
import {
BadRequestError,
InternalServerError,
ExceptionFunction,
} from "../utils/custom-errors.utils";
import AuthenticationModel from "../models/authentication";
import logger from "../utils/logger";
} from "../utils/custom-errors.utils.js";
import AuthenticationModel from "../models/authentication.js";
import logger from "../utils/logger.js";

const login = async (req: Request): Promise<LoginServiceType> => {
const srcFun = "Login";
Expand Down
22 changes: 11 additions & 11 deletions src/services/contentMapper.service.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Request } from "express";
import ContentTypesMapperModel from "../models/contentTypesMapper";
import FieldMapperModel from "../models/FieldMapper";
import ProjectModel from "../models/project";
import { getLogMessage, isEmpty, safePromise } from "../utils";
import ContentTypesMapperModel from "../models/contentTypesMapper.js";
import FieldMapperModel from "../models/FieldMapper.js";
import ProjectModel from "../models/project.js";
import { getLogMessage, isEmpty, safePromise } from "../utils/index.js";
import {
BadRequestError,
ExceptionFunction,
} from "../utils/custom-errors.utils";
} from "../utils/custom-errors.utils.js";
import {
CONTENT_TYPE_POPULATE_FIELDS,
HTTP_TEXTS,
Expand All @@ -16,12 +16,12 @@ import {
EXCLUDE_CONTENT_MAPPER,
PROJECT_STATUS,
STEPPER_STEPS,
} from "../constants";
import logger from "../utils/logger";
import { config } from "../config";
import https from "../utils/https.utils";
import getAuthtoken from "../utils/auth.utils";
import getProjectUtil from "../utils/get-project.utils";
} from "../constants/index.js";
import logger from "../utils/logger.js";
import { config } from "../config/index.js";
import https from "../utils/https.utils.js";
import getAuthtoken from "../utils/auth.utils.js";
import getProjectUtil from "../utils/get-project.utils.js";

// Developer service to create dummy contentmapping data
const putTestData = async (req: Request) => {
Expand Down
16 changes: 8 additions & 8 deletions src/services/org.service.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Request } from "express";
import { config } from "../config";
import { safePromise, getLogMessage } from "../utils/index";
import https from "../utils/https.utils";
import { LoginServiceType } from "../models/types";
import getAuthtoken from "../utils/auth.utils";
import logger from "../utils/logger";
import { HTTP_TEXTS, HTTP_CODES } from "../constants";
import { ExceptionFunction } from "../utils/custom-errors.utils";
import { config } from "../config/index.js";
import { safePromise, getLogMessage } from "../utils/index.js";
import https from "../utils/https.utils.js";
import { LoginServiceType } from "../models/types.js";
import getAuthtoken from "../utils/auth.utils.js";
import logger from "../utils/logger.js";
import { HTTP_TEXTS, HTTP_CODES } from "../constants/index.js";
import { ExceptionFunction } from "../utils/custom-errors.utils.js";

const getAllStacks = async (req: Request): Promise<LoginServiceType> => {
const srcFun = "getAllStacks";
Expand Down
20 changes: 10 additions & 10 deletions src/services/projects.service.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Request } from "express";
import ProjectModel from "../models/project";
import ProjectModel from "../models/project.js";
import {
BadRequestError,
ExceptionFunction,
NotFoundError,
} from "../utils/custom-errors.utils";
} from "../utils/custom-errors.utils.js";
import {
EXCLUDE_CONTENT_MAPPER,
PROJECT_UNSELECTED_FIELDS,
Expand All @@ -14,14 +14,14 @@ import {
POPULATE_FIELD_MAPPING,
PROJECT_STATUS,
STEPPER_STEPS,
} from "../constants";
import { config } from "../config";
import { getLogMessage, isEmpty, safePromise } from "../utils";
import getAuthtoken from "../utils/auth.utils";
import https from "../utils/https.utils";
import getProjectUtil from "../utils/get-project.utils";
import logger from "../utils/logger";
import { contentMapperService } from "./contentMapper.service";
} from "../constants/index.js";
import { config } from "../config/index.js";
import { getLogMessage, isEmpty, safePromise } from "../utils/index.js";
import getAuthtoken from "../utils/auth.utils.js";
import https from "../utils/https.utils.js";
import getProjectUtil from "../utils/get-project.utils.js";
import logger from "../utils/logger.js";
import { contentMapperService } from "./contentMapper.service.js";

const getAllProjects = async (req: Request) => {
const orgId = req?.params?.orgId;
Expand Down
Loading