diff --git a/src/api/auth/login.ts b/src/api/auth/login.ts index 7a71395..53cc90b 100644 --- a/src/api/auth/login.ts +++ b/src/api/auth/login.ts @@ -1,4 +1,5 @@ -import { getUser, UserLoginModel } from '@/controller/UserController'; +import { getUser } from '@/controller/UserController'; +import UserLoginModel from '@/models/UserLoginModel'; import { comparePassword } from '@/controller/AuthController'; import { Request, Response } from 'express'; import { User } from '@prisma/client'; diff --git a/src/api/auth/signup.ts b/src/api/auth/signup.ts index b6a9f19..0d58ec7 100644 --- a/src/api/auth/signup.ts +++ b/src/api/auth/signup.ts @@ -1,4 +1,5 @@ -import { newUser, UserModel } from '@/controller/UserController'; +import { newUser } from '@/controller/UserController'; +import UserModel from '@/models/UserModel'; import { hashPassword } from '@/controller/AuthController'; import { User } from '@prisma/client'; import { Request, Response } from 'express'; diff --git a/src/controller/UserController.ts b/src/controller/UserController.ts index 62f776e..c970215 100644 --- a/src/controller/UserController.ts +++ b/src/controller/UserController.ts @@ -1,17 +1,4 @@ import { PrismaClient, User } from '@prisma/client'; -import * as z from 'zod'; - -const UserModel = z.object({ - email: z.string().email(), - password: z.string(), - firstname: z.string(), - lastname: z.string(), -}); - -const UserLoginModel = z.object({ - email: z.string().email(), - password: z.string(), -}); const prisma = new PrismaClient(); @@ -33,4 +20,4 @@ const newUser = (user: User) => { return prismaUser; }; -export { getUser, newUser, UserModel, UserLoginModel }; +export { getUser, newUser }; diff --git a/src/models/UserLoginModel.ts b/src/models/UserLoginModel.ts new file mode 100644 index 0000000..1679190 --- /dev/null +++ b/src/models/UserLoginModel.ts @@ -0,0 +1,8 @@ +import { z } from 'zod'; + +const UserLoginModel = z.object({ + email: z.string().email(), + password: z.string(), +}); + +export default UserLoginModel; diff --git a/src/models/UserModel.ts b/src/models/UserModel.ts new file mode 100644 index 0000000..566a132 --- /dev/null +++ b/src/models/UserModel.ts @@ -0,0 +1,13 @@ +import { z } from 'zod'; + +const UserModel = z.object({ + id: z.string().optional(), + email: z.string().email(), + password: z.string(), + firstname: z.string(), + lastname: z.string(), + role: z.string().default('user'), + posts: z.array(z.string()).optional(), +}); + +export default UserModel;