added schema

Author: ElenaDiachenko

app.js

@@ -4,7 +4,7 @@ const cors = require('cors');
 require('dotenv').config();
 
 const contactsRouter = require('./routes/api/contacts');
-
+const usersRouter = require('./routes/api/users');
 const app = express();
 
 const formatsLogger = app.get('env') === 'development' ? 'dev' : 'short';
@@ -13,6 +13,7 @@ app.use(logger(formatsLogger));
 app.use(cors());
 app.use(express.json());
 
+app.use('/api/users', usersRouter);
 app.use('/api/contacts', contactsRouter);
 
 app.use((req, res) => {

controllers/index.js

@@ -1,5 +1,6 @@
 const contacts = require('./contacts');
-
+const users = require('./users');
 module.exports = {
   contacts,
+  users,
 };

controllers/users/index.js

@@ -0,0 +1,6 @@
+const signup = require('./signup');
+
+
+module.exports = {
+    signup
+}

controllers/users/signup.js

@@ -0,0 +1,3 @@
+const signup = async (req, res) => {};
+
+module.exports = signup;

models/contact.js

@@ -9,9 +9,12 @@ const contactSchema = Schema(
     },
     email: {
       type: String,
+      required: [true, 'Email is required'],
+      match: /[a-z0-9]+@[a-z]+\.[a-z]{2,3}/,
     },
     phone: {
       type: String,
+      required: [true, 'Phone is required'],
     },
     favorite: {
       type: Boolean,
@@ -23,7 +26,9 @@ const contactSchema = Schema(
 
 const joiSchema = Joi.object({
   name: Joi.string().min(3).max(30).required(),
-  email: Joi.string().min(5).required().email(),
+  email: Joi.string()
+    .pattern(/[a-z0-9]+@[a-z]+\.[a-z]{2,3}/)
+    .required(),
   phone: Joi.string().required(),
   favorite: Joi.bool(),
 });

models/user.js

@@ -0,0 +1,39 @@
+const { Schema, model } = require('mongoose');
+const Joi = require('joi');
+
+const userSchema = Schema({
+  password: {
+    type: String,
+    required: [true, 'Password is required'],
+  },
+  email: {
+    type: String,
+    required: [true, 'Email is required'],
+    match: /[a-z0-9]+@[a-z]+\.[a-z]{2,3}/,
+    unique: true,
+  },
+  subscription: {
+    type: String,
+    enum: ['starter', 'pro', 'business'],
+    default: 'starter',
+  },
+  token: {
+    type: String,
+    default: null,
+  },
+});
+
+const joiSchema = Joi.object({
+  password: Joi.string().min(6).required(),
+  email: Joi.string()
+    .pattern(/[a-z0-9]+@[a-z]+\.[a-z]{2,3}/)
+    .required(),
+  subscription: Joi.string().valueOf('starter', 'pro', 'business'),
+});
+
+const User = model('user', userSchema);
+
+module.exports = {
+  User,
+  joiSchema,
+};

routes/api/users.js

@@ -0,0 +1,9 @@
+const express = require('express');
+const router = express.Router();
+const { users: ctrl } = require('../../controllers');
+const { validation, ctrlWrapper } = require('../../middlewares');
+const { joiSchema } = require('../../models/user');
+
+router.post('/signup', validation(joiSchema), ctrlWrapper(ctrl.signup));
+
+module.exports = router;

utils/createError.js

@@ -0,0 +1,14 @@
+const messages = {
+    400: "Bad Request",
+    401: "Unauthorized",
+    403: "Forbidden",
+    404: "Not found",
+    409: "Conflict",
+}
+const createError = (status, message = messages[status]) => {
+    const error = new Error(message);
+    error.status = status;
+    return error;
+}
+
+module.exports = createError;

utils/index.js

@@ -1,5 +1,6 @@
 const getErrorMessage = require('./getErrorMessage');
-
+const createError = require('./createError');
 module.exports = {
   getErrorMessage,
+  createError,
 };