diff --git a/.gitignore b/.gitignore index 5eff649..bd599f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,106 @@ -node_modules -.idea -/model/test.json + +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.idea/ +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# Next.js build output +.next + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and *not* Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + diff --git a/README.md b/README.md index 2890de4..142d63a 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,18 @@ -## GoIT Node.js Course Template Homework +# rest_api_node_js -Выполните форк этого репозитория для выполнения домашних заданий (2-6) -Форк создаст репозиторий на вашем http://github.com +[db connect](https://ibb.co/6v28jyD) -Добавьте ментора в коллаборацию +[get all list](https://ibb.co/9rt82SK) -Для каждой домашней работы создавайте свою ветку. +[Get contact by id](https://ibb.co/s6D8D64) -- hw02 -- hw03 -- hw04 -- hw05 -- hw06 +[Add new contact](https://ibb.co/y054Zkb) -Каждая новая ветка для дз должна делаться с master +[Update ](https://ibb.co/7QqwG24) -После того как вы закончили выполнять домашнее задание в своей ветке, необходимо сделать пулл-реквест (PR). Потом добавить ментора для ревью кода. Только после того как ментор заапрувит PR, вы можете выполнить мердж ветки с домашним заданием в мастер. +[Update status](https://ibb.co/1zTF2SJ) -Внимательно читайте комментарии ментора. Исправьте замечания и сделайте коммит в ветке с домашним заданием. Изменения подтянуться в PR автоматически после того как вы отправите коммит с исправлениями на github -После исправления снова добавьте ментора на ревью кода. +[Remove contact by id](https://ibb.co/RYncNR2) -- При сдаче домашней работы есть ссылка на PR -- JS-код чистый и понятный, для форматирования используется Prettier +[Remove check](https://ibb.co/c1qt2fp) -### Команды: - -- `npm start` — старт сервера в режиме production -- `npm run start:dev` — старт сервера в режиме разработки (development) -- `npm run lint` — запустить выполнение проверки кода с eslint, необходимо выполнять перед каждым PR и исправлять все ошибки линтера -- `npm lint:fix` — та же проверка линтера, но с автоматическими исправлениями простых ошибок diff --git a/app.js b/app.js index e3270de..9b2e99c 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ const express = require('express') const logger = require('morgan') const cors = require('cors') -const contactsRouter = require('./routes/api/contacts') +const contactsRouter = require('./routes/api/contacts_routers') const app = express() @@ -23,3 +23,4 @@ app.use((err, req, res, next) => { }) module.exports = app +// 4DQJWQGk6Hyo14Lz diff --git a/bin/server.js b/bin/server.js index 8cc5942..be21b04 100644 --- a/bin/server.js +++ b/bin/server.js @@ -1,7 +1,12 @@ const app = require('../app') +const db = require('../model/db') +const PORT = process.env.PORT || 3001 -const PORT = process.env.PORT || 3000 - -app.listen(PORT, () => { - console.log(`Example app listening at http://localhost:${PORT} !!! :))`) +db.then(() => { + app.listen(PORT, () => { + console.log(`Example app listening at http://localhost:${PORT})`) + }) +}).catch((error) => { + console.log(`server is not running. Error: ${error.message}`) + process.exit(1) }) diff --git a/routes/api/contacts.js b/controllers/contacts_controlers.js similarity index 58% rename from routes/api/contacts.js rename to controllers/contacts_controlers.js index 21c2990..05aaa26 100644 --- a/routes/api/contacts.js +++ b/controllers/contacts_controlers.js @@ -1,18 +1,8 @@ -const express = require('express') -const router = express.Router() +const Contacts = require('../model/contacts_model') -const { - listContacts, - getContactById, - removeContact, - addContact, - updateContact, -} = require('../../model/index') -const { validCreateContact, validUpdateContact } = require('./validation') - -router.get('/', async (req, res, next) => { +const getAll = async (req, res, next) => { try { - const contacts = await listContacts() + const contacts = await Contacts.getAllContacts() res.json({ status: 'success', code: 200, @@ -23,12 +13,12 @@ router.get('/', async (req, res, next) => { } catch (e) { next(e) } -}) +} -router.get('/:contactId', async (req, res, next) => { +const getByID = async (req, res, next) => { try { - const contactById = await getContactById(req.params.contactId) - if (contactById) { + const contactById = await Contacts.getContactById(req.params.contactId) + if (contactById.length !== 0) { return res.json({ status: 'success', code: 200, @@ -46,11 +36,11 @@ router.get('/:contactId', async (req, res, next) => { } catch (e) { next(e) } -}) +} -router.post('/', validCreateContact, async (req, res, next) => { +const createContact = async (req, res, next) => { try { - const contact = await addContact(req.body) + const contact = await Contacts.addContact(req.body) return res.status(201).json({ status: 'success', code: 201, @@ -61,11 +51,11 @@ router.post('/', validCreateContact, async (req, res, next) => { } catch (e) { next(e) } -}) +} -router.delete('/:contactId', async (req, res, next) => { +const deleteContact = async (req, res, next) => { try { - const contactById = await removeContact(req.params.contactId) + const contactById = await Contacts.removeContact(req.params.contactId) if (contactById) { return res.json({ status: 'success', @@ -82,11 +72,11 @@ router.delete('/:contactId', async (req, res, next) => { } catch (e) { next(e) } -}) +} -router.patch('/:contactId', validUpdateContact, async (req, res, next) => { +const updateContact = async (req, res, next) => { try { - const contactById = await updateContact(req.params.contactId, req.body) + const contactById = await Contacts.updateContact(req.params.contactId, req.body) if (contactById) { return res.json({ status: 'success', @@ -103,7 +93,11 @@ router.patch('/:contactId', validUpdateContact, async (req, res, next) => { } catch (e) { next(e) } -}) - -// res.json({ message: 'template message' }) -module.exports = router +} +module.exports = { + createContact, + getAll, + getByID, + updateContact, + deleteContact, +} diff --git a/model/contacts.json b/model/contacts.json deleted file mode 100644 index 3ba2ac3..0000000 --- a/model/contacts.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "id": 1, - "name": "Allen Raymond", - "email": "nulla.ante@vestibul.co.uk", - "phone": "(992) 914-3792" - }, - { - "id": 2, - "name": "Chaim Lewis", - "email": "dui.in@egetlacus.ca", - "phone": "(294) 840-6685" - }, - { - "id": 3, - "name": "Kennedy Lane", - "email": "mattis.Cras@nonenimMauris.net", - "phone": "(542) 451-7038" - }, - { - "id": 4, - "name": "Wylie Pope", - "email": "est@utquamvel.net", - "phone": "(692) 802-2949" - }, - { - "id": 5, - "name": "Cyrus Jackson", - "email": "nibh@semsempererat.com", - "phone": "(501) 472-5218" - }, - { - "id": 6, - "name": "Abbot Franks", - "email": "scelerisque@magnis.org", - "phone": "(186) 568-3720" - }, - { - "id": 7, - "name": "Reuben Henry", - "email": "pharetra.ut@dictum.co.uk", - "phone": "(715) 598-5792" - }, - { - "id": 8, - "name": "Simon Morton", - "email": "dui.Fusce.diam@Donec.com", - "phone": "(233) 738-2360" - }, - { - "id": 9, - "name": "Thomas Lucas", - "email": "nec@Nulla.com", - "phone": "(704) 398-7993" - }, - { - "id": "aef1feea-c40e-4e74-8019-ac60c45925c7", - "name": "77User Id", - "email": "user22@id.net", - "phone": "2216345" - }, - { - "id": 2, - "name": "Stats", - "email": "dui.in@egetlacus.ca", - "phone": "(294) 840-6685" - }, - { - "id": "aef1feea-c40e-4e74-8019-ac60c45925c7", - "name": "Stats Update", - "email": "user22@id.net", - "phone": "2216345" - } -] \ No newline at end of file diff --git a/model/contacts_model.js b/model/contacts_model.js new file mode 100644 index 0000000..af4b9fc --- /dev/null +++ b/model/contacts_model.js @@ -0,0 +1,37 @@ +const Contacts = require('./schemas/contacts_schemas') + +const addContact = async (body) => { + const result = await Contacts.create(body) + return result +} +const getAllContacts = async () => { + const res = await Contacts.find({}) + return res +} + +const getContactById = async (contactId) => { + const res = await Contacts.find({ _id: contactId }) + return res +} + +const updateContact = async (contactId, body) => { + const res = await Contacts.findOneAndUpdate( + { _id: contactId }, + { ...body }, + { new: true } + ) + return res +} + +const removeContact = async (contactId) => { + const res = await Contacts.findOneAndDelete({ _id: contactId },) + return res +} + +module.exports = { + addContact, + getAllContacts, + getContactById, + updateContact, + removeContact, +} diff --git a/model/db.js b/model/db.js new file mode 100644 index 0000000..7509939 --- /dev/null +++ b/model/db.js @@ -0,0 +1,37 @@ +const mongoose = require('mongoose') + +require('dotenv').config() +const uriDb = process.env.URI_DB + +const db = mongoose.connect(uriDb, { + useNewUrlParser: true, + useUnifiedTopology: true, + useFindAndModify: false, + useCreateIndex: true, + poolSize: 5, +}) + +mongoose.connection.on('connected', () => { + console.log('Database connection successful') +}) + +mongoose.connection.on('error', (err) => { + console.log(`Mongoose connection error: ${err.message}`) + process.exit(1) +}) + +mongoose.connection.on('disconnected', () => { + console.log('Mongoose disconnection ') +}) + +process.on('SIGINT', async () => { + try { + await mongoose.connection.close() + console.log('Connection for db closed') + process.exit(1) + } catch (error) { + console.error(error.message) + } +}) + +module.exports = db diff --git a/model/index.js b/model/index.js deleted file mode 100644 index e20fb90..0000000 --- a/model/index.js +++ /dev/null @@ -1,95 +0,0 @@ -const fs = require('fs').promises -const { v4: uuid } = require('uuid') -const path = require('path') - -const contactsPath = path.join(__dirname, 'contacts.json') - -console.log(contactsPath, '<= contactsPath') - -const listContacts = async () => { - try { - const res = await fs.readFile(contactsPath) - return JSON.parse(res) - } catch (error) { - console.log(error) - } -} - -const getContactById = async (contactId) => { - try { - const res = await fs.readFile(contactsPath) - // if(contactId !== typeof String) - const findContact = JSON.parse(res).find( - (contact) => String(contact.id) === contactId - ) - if (findContact === undefined) { - console.log(`Your id:${contactId} not found!`) - } - // console.log(findContact) - return findContact - } catch (error) { - console.log(error) - } -} - -const removeContact = async (contactId) => { - try { - const res = await fs.readFile(contactsPath) - const dataArr = JSON.parse(res) - const contact = dataArr.find((el) => String(el.id) === contactId) - const contacts = dataArr.filter((contact) => String(contact.id) !== contactId) - - if (contacts.length !== dataArr.length) { - fs.writeFile(contactsPath, JSON.stringify(contacts, null, 2)) - return contact - // console.log(`Contact with id: ${contactId} removed!`) - } else { - console.log(`Id:${contactId} not found!`) - return null - } - } catch (error) { - console.log(error) - } -} - -const addContact = async (body) => { - try { - const res = await fs.readFile(contactsPath) - const contacts = JSON.parse(res) - const id = uuid() - const newContact = { - id, - ...body, - } - contacts.push(newContact) - - await fs.writeFile(contactsPath, JSON.stringify(contacts, null, 2)) - return newContact - } catch (error) { - console.log(error) - } -} - -const updateContact = async (contactId, body) => { - try { - const res = await fs.readFile(contactsPath) - const contacts = JSON.parse(res) - const findContact = contacts.find((contact) => String(contact.id) === contactId) - const update = { ...findContact, ...body } - console.log(findContact, update) - contacts.push(update) - - await fs.writeFile(contactsPath, JSON.stringify(contacts, null, 2)) - return update - } catch (error) { - console.log(error) - } -} -// updateContact(3, { name: 'Yura Yretc' }) -module.exports = { - listContacts, - getContactById, - removeContact, - addContact, - updateContact, -} diff --git a/model/schemas/contacts_schemas.js b/model/schemas/contacts_schemas.js new file mode 100644 index 0000000..e1902c1 --- /dev/null +++ b/model/schemas/contacts_schemas.js @@ -0,0 +1,26 @@ +const mongoose = require('mongoose') +const { Schema, model } = mongoose + +const contactSchema = new Schema( + { + name: { + type: String, + required: [true, 'Set name for contact'], + }, + email: { + type: String, + }, + phone: { + type: String, + }, + favorite: { + type: Boolean, + default: false, + }, + }, + { versionKey: false, timestamps: true } +) + +const Contacts = model('contact', contactSchema) + +module.exports = Contacts diff --git a/package-lock.json b/package-lock.json index 53b2d01..4c370c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -139,12 +139,34 @@ "defer-to-connect": "^1.0.1" } }, + "@types/bson": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/bson/-/bson-4.0.3.tgz", + "integrity": "sha512-mVRvYnTOZJz3ccpxhr3wgxVmSeiYinW+zlzQz3SXWaJmD1DuL05Jeq7nKw3SnbKmbleW5qrLG5vdyWe/A9sXhw==", + "requires": { + "@types/node": "*" + } + }, "@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, + "@types/mongodb": { + "version": "3.6.12", + "resolved": "https://registry.npmjs.org/@types/mongodb/-/mongodb-3.6.12.tgz", + "integrity": "sha512-49aEzQD5VdHPxyd5dRyQdqEveAg9LanwrH8RQipnMuulwzKmODXIZRp0umtxi1eBUfEusRkoy8AVOMr+kVuFog==", + "requires": { + "@types/bson": "*", + "@types/node": "*" + } + }, + "@types/node": { + "version": "14.14.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz", + "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -301,6 +323,20 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, + "bl": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", + "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -368,6 +404,11 @@ "fill-range": "^7.0.1" } }, + "bson": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz", + "integrity": "sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -555,6 +596,11 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, "cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -633,6 +679,11 @@ "object-keys": "^1.0.12" } }, + "denque": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz", + "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -661,6 +712,11 @@ "is-obj": "^2.0.0" } }, + "dotenv": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" + }, "duplexer3": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", @@ -1651,8 +1707,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -1714,6 +1769,11 @@ "minimist": "^1.2.0" } }, + "kareem": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.2.tgz", + "integrity": "sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ==" + }, "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -1807,6 +1867,12 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -1856,6 +1922,50 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, + "mongodb": { + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.6.tgz", + "integrity": "sha512-WlirMiuV1UPbej5JeCMqE93JRfZ/ZzqE7nJTwP85XzjAF4rRSeq2bGCb1cjfoHLOF06+HxADaPGqT0g3SbVT1w==", + "requires": { + "bl": "^2.2.1", + "bson": "^1.1.4", + "denque": "^1.4.1", + "optional-require": "^1.0.2", + "safe-buffer": "^5.1.2", + "saslprep": "^1.0.0" + } + }, + "mongoose": { + "version": "5.12.5", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.12.5.tgz", + "integrity": "sha512-VVoqiELZcoI2HhHDuPpfN3qmExrtIeXSWNb1nihf4w1SJoWGXilU/g2cQgeeSMc2vAHSZd5Nv2sNPvbZHFw+pg==", + "requires": { + "@types/mongodb": "^3.5.27", + "bson": "^1.1.4", + "kareem": "2.3.2", + "mongodb": "3.6.6", + "mongoose-legacy-pluralize": "1.0.2", + "mpath": "0.8.3", + "mquery": "3.2.5", + "ms": "2.1.2", + "regexp-clone": "1.0.0", + "safe-buffer": "5.2.1", + "sift": "7.0.1", + "sliced": "1.0.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } + }, + "mongoose-legacy-pluralize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", + "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==" + }, "morgan": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", @@ -1888,11 +1998,42 @@ } } }, + "mpath": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.3.tgz", + "integrity": "sha512-eb9rRvhDltXVNL6Fxd2zM9D4vKBxjVVQNLNijlj7uoXUy19zNDsIif5zR+pWmPCWNKwAtqyo4JveQm4nfD5+eA==" + }, + "mquery": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.5.tgz", + "integrity": "sha512-VjOKHHgU84wij7IUoZzFRU07IAxd5kWJaDmyUzQlbjHjyoeK5TNeeo8ZsFDtTYnSgpW6n/nMNIHvE3u8Lbrf4A==", + "requires": { + "bluebird": "3.5.1", + "debug": "3.1.0", + "regexp-clone": "^1.0.0", + "safe-buffer": "5.1.2", + "sliced": "1.0.1" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "natural-compare": { "version": "1.4.0", @@ -2030,6 +2171,11 @@ "wrappy": "1" } }, + "optional-require": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.0.3.tgz", + "integrity": "sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA==" + }, "optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -2187,6 +2333,11 @@ "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "dev": true }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -2287,6 +2438,20 @@ "read-pkg": "^2.0.0" } }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -2296,6 +2461,11 @@ "picomatch": "^2.2.1" } }, + "regexp-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", + "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" + }, "regexpp": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", @@ -2370,6 +2540,15 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "saslprep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -2464,6 +2643,11 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, + "sift": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", + "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==" + }, "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", @@ -2489,6 +2673,20 @@ } } }, + "sliced": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", + "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=" + }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "optional": true, + "requires": { + "memory-pager": "^1.0.2" + } + }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", @@ -2592,6 +2790,14 @@ "define-properties": "^1.1.3" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -2819,16 +3025,16 @@ "prepend-http": "^2.0.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, "v8-compile-cache": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", diff --git a/package.json b/package.json index 45ac2bb..b979958 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,12 @@ "dependencies": { "cors": "2.8.5", "cross-env": "7.0.3", + "dotenv": "8.2.0", "express": "4.17.1", "joi": "^17.4.0", - "morgan": "1.10.0", - "uuid": "^8.3.2" + "mongodb": "3.6.6", + "mongoose": "^5.12.5", + "morgan": "1.10.0" }, "devDependencies": { "eslint": "^7.19.0", diff --git a/routes/api/contacts_routers.js b/routes/api/contacts_routers.js new file mode 100644 index 0000000..f0722dd --- /dev/null +++ b/routes/api/contacts_routers.js @@ -0,0 +1,15 @@ +const express = require('express') +const router = express.Router() + +const contactController = require('../../controllers/contacts_controlers') +const { validCreateContact, validUpdateContact, validUpdateStatusContact } = require('./validation') + +router.get('/', contactController.getAll) + .post('/', validCreateContact, contactController.createContact) + +router.get('/:contactId', contactController.getByID) + .delete('/:contactId', contactController.deleteContact) + .put('/:contactId', validUpdateContact, contactController.updateContact) + .patch('/:contactId', validUpdateStatusContact, contactController.updateContact) + +module.exports = router diff --git a/routes/api/validation.js b/routes/api/validation.js index 00db647..bdc029d 100644 --- a/routes/api/validation.js +++ b/routes/api/validation.js @@ -1,20 +1,11 @@ const Joi = require('joi') const schemaCreateContact = Joi.object({ - name: Joi.string() - .alphanum() - .min(3) - .max(40) - .required(), - + name: Joi.string().alphanum().min(3).max(40).required(), email: Joi.string() .email({ minDomainSegments: 2, tlds: { allow: ['com', 'net'] } }).required(), - - phone: Joi.number() - .integer() - .min(10) - .max(13) - .required(), + phone: Joi.number().integer().min(10).required(), + favorite: Joi.boolean().optional(), }) @@ -37,22 +28,32 @@ const schemaUpdateContact = Joi.object({ }) -const validate = (schema, obj, next) => { - const { error } = schema.validate(obj) - if (error) { - // const [{ message }] = error.details - return next({ +const validate = async (schema, obj, next) => { + try { + await schema.validateAsync(obj) + return next() + } catch (err) { + console.log(err) + next({ status: 400, - message: 'missing required name field' + message: err.message.replace(/"/g, "'"), }) } - next() } -module.exports.validCreateContact = (req, res, next) => { - return validate(schemaCreateContact, req.body, next) -} +const schemaUpdateStatusContact = Joi.object({ + favorite: Joi.boolean().required(), +}) + +module.exports = { + validCreateContact: async (req, res, next) => { + return await validate(schemaCreateContact, req.body, next) + }, + validUpdateContact: (req, res, next) => { + return validate(schemaUpdateContact, req.body, next) + }, + validUpdateStatusContact: (req, res, next) => { + return validate(schemaUpdateStatusContact, req.body, next) + }, -module.exports.validUpdateContact = (req, res, next) => { - return validate(schemaUpdateContact, req.body, next) }