Part4 2

.eslintrc.js

@@ -2,7 +2,8 @@ module.exports = {
   'env': {
     'commonjs': true,
     'es2021': true,
-    'node': true
+    'node': true,
+    'jest': true,
   },
   'extends': 'eslint:recommended',
   'parserOptions': {

app.js

@@ -1,30 +1,38 @@
-const config = require('./utils/config')
-const express = require('express')
-const app = express()
-const cors = require('cors')
-const notesRouter = require('./controllers/notes')
-const middleware = require('./utils/middleware')
-const logger = require('./utils/logger')
-const mongoose = require('mongoose')
+const config = require("./utils/config");
+const express = require("express");
+const app = express();
+require("express-async-errors");
 
-logger.info('connecting to', config.MONGODB_URI)
+const cors = require("cors");
+const notesRouter = require("./controllers/notes");
+const middleware = require("./utils/middleware");
+const logger = require("./utils/logger");
+const mongoose = require("mongoose");
 
-mongoose.connect(config.MONGODB_URI, { useNewUrlParser: true, useUnifiedTopology: true })
-  .then(() => {
-    logger.info('connected to MongoDB')
-  })
-  .catch((error) => {
-    logger.error('error connection to MongoDB:', error.message)
-  })
+logger.info("connecting to", config.MONGODB_URI);
 
-app.use(cors())
-app.use(express.static('build'))
-app.use(express.json())
-app.use(middleware.requestLogger)
+mongoose
+    .connect(config.MONGODB_URI, {
+        useNewUrlParser: true,
+        useUnifiedTopology: true,
+        useFindAndModify: false,
+        useCreateIndex: true,
+    })
+    .then(() => {
+        logger.info("connected to MongoDB");
+    })
+    .catch((error) => {
+        logger.error("error connection to MongoDB:", error.message);
+    });
 
-app.use('/api/notes', notesRouter)
+app.use(cors());
+app.use(express.static("build"));
+app.use(express.json());
+app.use(middleware.requestLogger);
 
-app.use(middleware.unknownEndpoint)
-app.use(middleware.errorHandler)
+app.use("/api/notes", notesRouter);
 
-module.exports = app
+app.use(middleware.unknownEndpoint);
+app.use(middleware.errorHandler);
+
+module.exports = app;

controllers/notes.js

@@ -1,61 +1,51 @@
-const notesRouter = require('express').Router()
-const Note = require('../models/note')
-
-notesRouter.get('/', (request, response) => {
-  Note.find({}).then(notes => {
-    response.json(notes.map(note => note.toJSON()))
-  })
-})
-
-notesRouter.get('/:id', (request, response, next) => {
-  Note.findById(request.params.id)
-    .then(note => {
-      if (note) {
-        response.json(note.toJSON())
-      } else {
-        response.status(404).end()
-      }
-    })
-    .catch(error => next(error))
-})
-
-notesRouter.post('/', (request, response, next) => {
-  const body = request.body
-
-  const note = new Note({
-    content: body.content,
-    important: body.important || false,
-    date: new Date(),
-  })
-
-  note.save()
-    .then(savedNote => {
-      response.json(savedNote.toJSON())
-    })
-    .catch(error => next(error))
-})
-
-notesRouter.delete('/:id', (request, response, next) => {
-  Note.findByIdAndRemove(request.params.id)
-    .then(() => {
-      response.status(204).end()
-    })
-    .catch(error => next(error))
-})
-
-notesRouter.put('/:id', (request, response, next) => {
-  const body = request.body
-
-  const note = {
-    content: body.content,
-    important: body.important,
-  }
-
-  Note.findByIdAndUpdate(request.params.id, note, { new: true })
-    .then(updatedNote => {
-      response.json(updatedNote.toJSON())
-    })
-    .catch(error => next(error))
-})
-
-module.exports = notesRouter
+const notesRouter = require("express").Router();
+const Note = require("../models/note");
+
+notesRouter.get("/", (request, response) => {
+    Note.find({}).then((notes) => {
+        response.json(notes.map((note) => note.toJSON()));
+    });
+});
+
+notesRouter.post("/", async (request, response, next) => {
+    const body = request.body;
+
+    const note = new Note({
+        content: body.content,
+        important: body.important || false,
+        date: new Date(),
+    });
+
+    const savedNote = await note.save();
+    response.json(savedNote);
+});
+
+notesRouter.get("/:id", async (request, response, next) => {
+    const note = await Note.findById(request.params.id);
+    if (note) {
+        response.json(note);
+    } else {
+        response.status(404).end();
+    }
+});
+
+notesRouter.delete("/:id", async (request, response) => {
+    await Note.findByIdAndRemove(request.params.id);
+    response.status(204).end();
+});
+notesRouter.put("/:id", (request, response, next) => {
+    const body = request.body;
+
+    const note = {
+        content: body.content,
+        important: body.important,
+    };
+
+    Note.findByIdAndUpdate(request.params.id, note, { new: true })
+        .then((updatedNote) => {
+            response.json(updatedNote.toJSON());
+        })
+        .catch((error) => next(error));
+});
+
+module.exports = notesRouter;

jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    testEnvironment: "node",
+};

models/note.js

@@ -18,4 +18,4 @@ noteSchema.set('toJSON', {
   }
 })
 
-module.exports = mongoose.model('Note', noteSchema)
+module.exports = mongoose.model('Note', noteSchema)