Spaces:
Sleeping
Sleeping
Commit
Β·
2003362
1
Parent(s):
8a36cc5
refactor: rename files
Browse files- src/index.route.ts +2 -2
- src/modules/common/{Template/models/templet.model.ts β templates/models/template.model.ts} +0 -0
- src/modules/common/{User β users}/models/user.model.ts +0 -0
- src/modules/common/{User/services/user.base.service.ts β users/services/users.base.service.ts} +1 -1
- src/modules/common/{User β users}/validation/user.baseValidation.ts +0 -0
- src/modules/console/User/services/user.service.ts +0 -8
- src/modules/console/{Admin/controllers/admin.controller.ts β admins/controllers/admins.controller.ts} +0 -0
- src/modules/console/{Admin β admins}/models/admin.model.ts +0 -0
- src/modules/console/{Admin/services/admin.service.ts β admins/services/admins.service.ts} +1 -1
- src/modules/console/index.route.ts +6 -6
- src/modules/console/{User/controllers/user.controller.ts β users/controllers/users.controller.ts} +3 -3
- src/modules/console/{User/routes/admin.userRoute.ts β users/routes/admin-users.route.ts} +2 -2
- src/modules/console/users/services/users.service.ts +3 -0
- src/modules/console/{User β users}/validation/admin.userValidation.ts +1 -2
- src/modules/user/index.route.ts +1 -1
- src/modules/user/{User β users}/controllers/auth.controller.ts +3 -3
- src/modules/user/{User β users}/routes/auth.route.ts +0 -0
- src/modules/user/{User/services/user.service.ts β users/services/users.service.ts} +4 -4
- src/modules/user/{User β users}/validation/user.Validation.ts +1 -1
src/index.route.ts
CHANGED
@@ -1,12 +1,12 @@
|
|
1 |
import express from "express";
|
2 |
|
3 |
import { userRoutes } from "./modules/user/index.route";
|
4 |
-
import {
|
5 |
|
6 |
const mainRouter = express.Router();
|
7 |
|
8 |
mainRouter.use("/user", userRoutes);
|
9 |
-
mainRouter.use("/admin",
|
10 |
|
11 |
mainRouter.get("/health", (_req: any, res: any) => {
|
12 |
res.status(200).json({ success: true, message: "Server is up!", code: 200 });
|
|
|
1 |
import express from "express";
|
2 |
|
3 |
import { userRoutes } from "./modules/user/index.route";
|
4 |
+
import { adminRouter } from "./modules/console/index.route";
|
5 |
|
6 |
const mainRouter = express.Router();
|
7 |
|
8 |
mainRouter.use("/user", userRoutes);
|
9 |
+
mainRouter.use("/admin", adminRouter);
|
10 |
|
11 |
mainRouter.get("/health", (_req: any, res: any) => {
|
12 |
res.status(200).json({ success: true, message: "Server is up!", code: 200 });
|
src/modules/common/{Template/models/templet.model.ts β templates/models/template.model.ts}
RENAMED
File without changes
|
src/modules/common/{User β users}/models/user.model.ts
RENAMED
File without changes
|
src/modules/common/{User/services/user.base.service.ts β users/services/users.base.service.ts}
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
import { userModel, } from '../models/user.model'
|
2 |
|
3 |
|
4 |
-
export class
|
5 |
static async find(filterObject) {
|
6 |
try {
|
7 |
const resultObject = await userModel.findOne(filterObject).lean();
|
|
|
1 |
import { userModel, } from '../models/user.model'
|
2 |
|
3 |
|
4 |
+
export class UsersBaseService {
|
5 |
static async find(filterObject) {
|
6 |
try {
|
7 |
const resultObject = await userModel.findOne(filterObject).lean();
|
src/modules/common/{User β users}/validation/user.baseValidation.ts
RENAMED
File without changes
|
src/modules/console/User/services/user.service.ts
DELETED
@@ -1,8 +0,0 @@
|
|
1 |
-
import { UserBaseService } from "../../../common/User/services/user.base.service";
|
2 |
-
|
3 |
-
export class userService extends UserBaseService {
|
4 |
-
|
5 |
-
}
|
6 |
-
|
7 |
-
|
8 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
src/modules/console/{Admin/controllers/admin.controller.ts β admins/controllers/admins.controller.ts}
RENAMED
File without changes
|
src/modules/console/{Admin β admins}/models/admin.model.ts
RENAMED
File without changes
|
src/modules/console/{Admin/services/admin.service.ts β admins/services/admins.service.ts}
RENAMED
@@ -2,7 +2,7 @@ import bcrypt from "bcrypt";
|
|
2 |
import { adminModel, saltrounds } from '../models/admin.model'
|
3 |
|
4 |
|
5 |
-
export class
|
6 |
static async find(filterObject) {
|
7 |
try {
|
8 |
const resultObject = await adminModel.findOne(filterObject).lean();
|
|
|
2 |
import { adminModel, saltrounds } from '../models/admin.model'
|
3 |
|
4 |
|
5 |
+
export class AdminsService {
|
6 |
static async find(filterObject) {
|
7 |
try {
|
8 |
const resultObject = await adminModel.findOne(filterObject).lean();
|
src/modules/console/index.route.ts
CHANGED
@@ -1,11 +1,11 @@
|
|
1 |
-
import express from
|
2 |
-
const
|
3 |
|
4 |
-
import { jwtHelper } from
|
5 |
const allowedRoles = ["superAdmin", "admin"];
|
6 |
|
7 |
-
import { adminUserRoutes } from
|
8 |
|
9 |
-
|
10 |
|
11 |
-
export {
|
|
|
1 |
+
import express from "express";
|
2 |
+
const adminRouter = express.Router();
|
3 |
|
4 |
+
import { jwtHelper } from "../../helpers/jwt.helper";
|
5 |
const allowedRoles = ["superAdmin", "admin"];
|
6 |
|
7 |
+
import { adminUserRoutes } from "./users/routes/admin-users.route";
|
8 |
|
9 |
+
adminRouter.use("/users", jwtHelper.verifyToken(allowedRoles), adminUserRoutes);
|
10 |
|
11 |
+
export { adminRouter };
|
src/modules/console/{User/controllers/user.controller.ts β users/controllers/users.controller.ts}
RENAMED
@@ -1,10 +1,10 @@
|
|
1 |
-
import {
|
2 |
|
3 |
-
export class
|
4 |
|
5 |
static async create(req, res) {
|
6 |
try {
|
7 |
-
let result = await
|
8 |
return res.status(result.code).json(result);
|
9 |
} catch (err) {
|
10 |
console.log(`err.message`, err.message);
|
|
|
1 |
+
import { usersService } from "../services/users.service";
|
2 |
|
3 |
+
export class adminUsersController {
|
4 |
|
5 |
static async create(req, res) {
|
6 |
try {
|
7 |
+
let result = await usersService.create(req.body);
|
8 |
return res.status(result.code).json(result);
|
9 |
} catch (err) {
|
10 |
console.log(`err.message`, err.message);
|
src/modules/console/{User/routes/admin.userRoute.ts β users/routes/admin-users.route.ts}
RENAMED
@@ -1,11 +1,11 @@
|
|
1 |
import express from "express";
|
2 |
-
import {
|
3 |
import { adminUserValidation } from "../validation/admin.userValidation";
|
4 |
import { validator } from "../../../../helpers/validation.helper";
|
5 |
|
6 |
const app = express.Router();
|
7 |
|
8 |
-
app.post("/create", validator(adminUserValidation.createValidation),
|
9 |
|
10 |
export { app as adminUserRoutes };
|
11 |
|
|
|
1 |
import express from "express";
|
2 |
+
import { adminUsersController } from "../controllers/users.controller";
|
3 |
import { adminUserValidation } from "../validation/admin.userValidation";
|
4 |
import { validator } from "../../../../helpers/validation.helper";
|
5 |
|
6 |
const app = express.Router();
|
7 |
|
8 |
+
app.post("/create", validator(adminUserValidation.createValidation), adminUsersController.create);
|
9 |
|
10 |
export { app as adminUserRoutes };
|
11 |
|
src/modules/console/users/services/users.service.ts
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
import { UsersBaseService } from "../../../common/users/services/users.base.service";
|
2 |
+
|
3 |
+
export class usersService extends UsersBaseService {}
|
src/modules/console/{User β users}/validation/admin.userValidation.ts
RENAMED
@@ -1,5 +1,4 @@
|
|
1 |
-
import
|
2 |
-
import { userBaseValidation } from '../../../common/User/validation/user.baseValidation';
|
3 |
|
4 |
export class adminUserValidation extends userBaseValidation {
|
5 |
|
|
|
1 |
+
import { userBaseValidation } from '../../../common/users/validation/user.baseValidation';
|
|
|
2 |
|
3 |
export class adminUserValidation extends userBaseValidation {
|
4 |
|
src/modules/user/index.route.ts
CHANGED
@@ -4,7 +4,7 @@ const app = express();
|
|
4 |
import { jwtHelper } from '../../helpers/jwt.helper';
|
5 |
const allowedRoles = ["user"];
|
6 |
|
7 |
-
import { authRoutes } from './
|
8 |
|
9 |
app.use(authRoutes);
|
10 |
|
|
|
4 |
import { jwtHelper } from '../../helpers/jwt.helper';
|
5 |
const allowedRoles = ["user"];
|
6 |
|
7 |
+
import { authRoutes } from './users/routes/auth.route';
|
8 |
|
9 |
app.use(authRoutes);
|
10 |
|
src/modules/user/{User β users}/controllers/auth.controller.ts
RENAMED
@@ -1,11 +1,11 @@
|
|
1 |
-
import {
|
2 |
import { jwtHelper } from "../../../../helpers/jwt.helper";
|
3 |
|
4 |
export class authController {
|
5 |
|
6 |
static async register(req, res) {
|
7 |
try {
|
8 |
-
let result = await
|
9 |
return res.status(result.code).json(result);
|
10 |
} catch (err) {
|
11 |
console.log(`err.message`, err.message);
|
@@ -20,7 +20,7 @@ export class authController {
|
|
20 |
static async login(req, res) {
|
21 |
try {
|
22 |
const { email, password } = req.body;
|
23 |
-
let result: { success: boolean; code: number; record?: any; message?: string } = await
|
24 |
if (!result.success) return res.status(result.code).json(result);
|
25 |
let payload = {
|
26 |
_id: result.record?._id, name: result.record?.name,
|
|
|
1 |
+
import { usersService } from "../services/users.service";
|
2 |
import { jwtHelper } from "../../../../helpers/jwt.helper";
|
3 |
|
4 |
export class authController {
|
5 |
|
6 |
static async register(req, res) {
|
7 |
try {
|
8 |
+
let result = await usersService.create(req.body);
|
9 |
return res.status(result.code).json(result);
|
10 |
} catch (err) {
|
11 |
console.log(`err.message`, err.message);
|
|
|
20 |
static async login(req, res) {
|
21 |
try {
|
22 |
const { email, password } = req.body;
|
23 |
+
let result: { success: boolean; code: number; record?: any; message?: string } = await usersService.comparePassword(email, password);
|
24 |
if (!result.success) return res.status(result.code).json(result);
|
25 |
let payload = {
|
26 |
_id: result.record?._id, name: result.record?.name,
|
src/modules/user/{User β users}/routes/auth.route.ts
RENAMED
File without changes
|
src/modules/user/{User/services/user.service.ts β users/services/users.service.ts}
RENAMED
@@ -1,15 +1,15 @@
|
|
1 |
-
import {
|
2 |
-
import { userModel, } from "../../../common/
|
3 |
import bcrypt from "bcrypt";
|
4 |
|
5 |
-
export class
|
6 |
|
7 |
static async comparePassword(email: string, password: string) {
|
8 |
try {
|
9 |
if (email != undefined) {
|
10 |
email = email.toLowerCase();
|
11 |
}
|
12 |
-
let result = await
|
13 |
if (!result.success) return result;
|
14 |
|
15 |
let match = await bcrypt.compare(password, result.record.password)
|
|
|
1 |
+
import { UsersBaseService } from "../../../common/users/services/users.base.service";
|
2 |
+
import { userModel, } from "../../../common/users/models/user.model";
|
3 |
import bcrypt from "bcrypt";
|
4 |
|
5 |
+
export class usersService extends UsersBaseService {
|
6 |
|
7 |
static async comparePassword(email: string, password: string) {
|
8 |
try {
|
9 |
if (email != undefined) {
|
10 |
email = email.toLowerCase();
|
11 |
}
|
12 |
+
let result = await UsersBaseService.find({ email })
|
13 |
if (!result.success) return result;
|
14 |
|
15 |
let match = await bcrypt.compare(password, result.record.password)
|
src/modules/user/{User β users}/validation/user.Validation.ts
RENAMED
@@ -1,5 +1,5 @@
|
|
1 |
import joi from 'joi';
|
2 |
-
import { userBaseValidation } from '../../../common/
|
3 |
|
4 |
export class userValidation extends userBaseValidation {
|
5 |
static loginValidation = {
|
|
|
1 |
import joi from 'joi';
|
2 |
+
import { userBaseValidation } from '../../../common/users/validation/user.baseValidation';
|
3 |
|
4 |
export class userValidation extends userBaseValidation {
|
5 |
static loginValidation = {
|