Catchup with docs (#326)

* Remove unnecessary if/else/return

* import/label/comment formatting

* use modern syntax, object shorthand

Author: hamishwillee

app.js

@@ -24,6 +24,7 @@ app.use(limiter);
 
 // Set up mongoose connection
 const mongoose = require("mongoose");
+
 mongoose.set("strictQuery", false);
 
 const dev_db_url =

controllers/authorController.js

@@ -30,7 +30,7 @@ exports.author_detail = asyncHandler(async (req, res, next) => {
 
   res.render("author_detail", {
     title: "Author Detail",
-    author: author,
+    author,
     author_books: allBooksByAuthor,
   });
 });
@@ -83,18 +83,16 @@ exports.author_create_post = [
       // There are errors. Render form again with sanitized values/errors messages.
       res.render("author_form", {
         title: "Create Author",
-        author: author,
+        author,
         errors: errors.array(),
       });
       return;
-    } else {
-      // Data from form is valid.
-
-      // Save author.
-      await author.save();
-      // Redirect to new author record.
-      res.redirect(author.url);
     }
+
+    // Data from form is valid.
+    await author.save();
+    // Redirect to new author record.
+    res.redirect(author.url);
   }),
 ];
 
@@ -113,7 +111,7 @@ exports.author_delete_get = asyncHandler(async (req, res, next) => {
 
   res.render("author_delete", {
     title: "Delete Author",
-    author: author,
+    author,
     author_books: allBooksByAuthor,
   });
 });
@@ -130,15 +128,15 @@ exports.author_delete_post = asyncHandler(async (req, res, next) => {
     // Author has books. Render in same way as for GET route.
     res.render("author_delete", {
       title: "Delete Author",
-      author: author,
+      author,
       author_books: allBooksByAuthor,
     });
     return;
-  } else {
-    // Author has no books. Delete object and redirect to the list of authors.
-    await Author.findByIdAndDelete(req.body.authorid);
-    res.redirect("/catalog/authors");
   }
+
+  // Author has no books. Delete object and redirect to the list of authors.
+  await Author.findByIdAndDelete(req.body.authorid);
+  res.redirect("/catalog/authors");
 });
 
 // Display Author update form on GET.
@@ -151,7 +149,7 @@ exports.author_update_get = asyncHandler(async (req, res, next) => {
     return next(err);
   }
 
-  res.render("author_form", { title: "Update Author", author: author });
+  res.render("author_form", { title: "Update Author", author });
 });
 
 // Handle Author update on POST.
@@ -198,14 +196,14 @@ exports.author_update_post = [
       // There are errors. Render the form again with sanitized values and error messages.
       res.render("author_form", {
         title: "Update Author",
-        author: author,
+        author,
         errors: errors.array(),
       });
       return;
-    } else {
-      // Data from form is valid. Update the record.
-      await Author.findByIdAndUpdate(req.params.id, author);
-      res.redirect(author.url);
     }
+
+    // Data from form is valid. Update the record.
+    await Author.findByIdAndUpdate(req.params.id, author);
+    res.redirect(author.url);
   }),
 ];

controllers/bookController.js

@@ -59,7 +59,7 @@ exports.book_detail = asyncHandler(async (req, res, next) => {
 
   res.render("book_detail", {
     title: book.title,
-    book: book,
+    book,
     book_instances: bookInstances,
   });
 });
@@ -139,7 +139,7 @@ exports.book_create_post = [
         title: "Create Book",
         authors: allAuthors,
         genres: allGenres,
-        book: book,
+        book,
         errors: errors.array(),
       });
     } else {
@@ -164,7 +164,7 @@ exports.book_delete_get = asyncHandler(async (req, res, next) => {
 
   res.render("book_delete", {
     title: "Delete Book",
-    book: book,
+    book,
     book_instances: bookInstances,
   });
 });
@@ -187,15 +187,15 @@ exports.book_delete_post = asyncHandler(async (req, res, next) => {
     // Book has book_instances. Render in same way as for GET route.
     res.render("book_delete", {
       title: "Delete Book",
-      book: book,
+      book,
       book_instances: bookInstances,
     });
     return;
-  } else {
-    // Book has no BookInstance objects. Delete object and redirect to the list of books.
-    await Book.findByIdAndDelete(req.body.id);
-    res.redirect("/catalog/books");
   }
+
+  // Book has no BookInstance objects. Delete object and redirect to the list of books.
+  await Book.findByIdAndDelete(req.body.id);
+  res.redirect("/catalog/books");
 });
 
 // Display book update form on GET.
@@ -223,7 +223,7 @@ exports.book_update_get = asyncHandler(async (req, res, next) => {
     title: "Update Book",
     authors: allAuthors,
     genres: allGenres,
-    book: book,
+    book,
   });
 });
 
@@ -288,15 +288,15 @@ exports.book_update_post = [
         title: "Update Book",
         authors: allAuthors,
         genres: allGenres,
-        book: book,
+        book,
         errors: errors.array(),
       });
       return;
-    } else {
-      // Data from form is valid. Update the record.
-      const thebook = await Book.findByIdAndUpdate(req.params.id, book, {});
-      // Redirect to book detail page.
-      res.redirect(thebook.url);
     }
+
+    // Data from form is valid. Update the record.
+    const thebook = await Book.findByIdAndUpdate(req.params.id, book, {});
+    // Redirect to book detail page.
+    res.redirect(thebook.url);
   }),
 ];

controllers/bookinstanceController.js

@@ -83,11 +83,11 @@ exports.bookinstance_create_post = [
         bookinstance: bookInstance,
       });
       return;
-    } else {
-      // Data from form is valid
-      await bookInstance.save();
-      res.redirect(bookInstance.url);
     }
+
+    // Data from form is valid
+    await bookInstance.save();
+    res.redirect(bookInstance.url);
   }),
 ];
 
@@ -180,11 +180,11 @@ exports.bookinstance_update_post = [
         bookinstance: bookInstance,
       });
       return;
-    } else {
-      // Data from form is valid.
-      await BookInstance.findByIdAndUpdate(req.params.id, bookInstance, {});
-      // Redirect to detail page.
-      res.redirect(bookInstance.url);
     }
+
+    // Data from form is valid.
+    await BookInstance.findByIdAndUpdate(req.params.id, bookInstance, {});
+    // Redirect to detail page.
+    res.redirect(bookInstance.url);
   }),
 ];

controllers/genreController.js

@@ -29,7 +29,7 @@ exports.genre_detail = asyncHandler(async (req, res, next) => {
 
   res.render("genre_detail", {
     title: "Genre Detail",
-    genre: genre,
+    genre,
     genre_books: booksInGenre,
   });
 });
@@ -59,24 +59,24 @@ exports.genre_create_post = [
       // There are errors. Render the form again with sanitized values/error messages.
       res.render("genre_form", {
         title: "Create Genre",
-        genre: genre,
+        genre,
         errors: errors.array(),
       });
       return;
+    }
+
+    // Data from form is valid.
+    // Check if Genre with same name (case insensitive) already exists.
+    const genreExists = await Genre.findOne({ name: req.body.name })
+      .collation({ locale: "en", strength: 2 })
+      .exec();
+    if (genreExists) {
+      // Genre exists, redirect to its detail page.
+      res.redirect(genreExists.url);
     } else {
-      // Data from form is valid.
-      // Check if Genre with same name (case insensitive) already exists.
-      const genreExists = await Genre.findOne({ name: req.body.name })
-        .collation({ locale: "en", strength: 2 })
-        .exec();
-      if (genreExists) {
-        // Genre exists, redirect to its detail page.
-        res.redirect(genreExists.url);
-      } else {
-        await genre.save();
-        // New genre saved. Redirect to genre detail page.
-        res.redirect(genre.url);
-      }
+      await genre.save();
+      // New genre saved. Redirect to genre detail page.
+      res.redirect(genre.url);
     }
   }),
 ];
@@ -95,7 +95,7 @@ exports.genre_delete_get = asyncHandler(async (req, res, next) => {
 
   res.render("genre_delete", {
     title: "Delete Genre",
-    genre: genre,
+    genre,
     genre_books: booksInGenre,
   });
 });
@@ -112,15 +112,15 @@ exports.genre_delete_post = asyncHandler(async (req, res, next) => {
     // Genre has books. Render in same way as for GET route.
     res.render("genre_delete", {
       title: "Delete Genre",
-      genre: genre,
+      genre,
       genre_books: booksInGenre,
     });
     return;
-  } else {
-    // Genre has no books. Delete object and redirect to the list of genres.
-    await Genre.findByIdAndDelete(req.body.id);
-    res.redirect("/catalog/genres");
   }
+
+  // Genre has no books. Delete object and redirect to the list of genres.
+  await Genre.findByIdAndDelete(req.body.id);
+  res.redirect("/catalog/genres");
 });
 
 // Display Genre update form on GET.
@@ -134,7 +134,7 @@ exports.genre_update_get = asyncHandler(async (req, res, next) => {
     return next(err);
   }
 
-  res.render("genre_form", { title: "Update Genre", genre: genre });
+  res.render("genre_form", { title: "Update Genre", genre });
 });
 
 // Handle Genre update on POST.
@@ -160,14 +160,14 @@ exports.genre_update_post = [
       // There are errors. Render the form again with sanitized values and error messages.
       res.render("genre_form", {
         title: "Update Genre",
-        genre: genre,
+        genre,
         errors: errors.array(),
       });
       return;
-    } else {
-      // Data from form is valid. Update the record.
-      await Genre.findByIdAndUpdate(req.params.id, genre);
-      res.redirect(genre.url);
     }
+
+    // Data from form is valid. Update the record.
+    await Genre.findByIdAndUpdate(req.params.id, genre);
+    res.redirect(genre.url);
   }),
 ];

populatedb.js

@@ -60,10 +60,10 @@ async function authorCreate(index, first_name, family_name, d_birth, d_death) {
 
 async function bookCreate(index, title, summary, isbn, author, genre) {
   const bookdetail = {
-    title: title,
-    summary: summary,
-    author: author,
-    isbn: isbn,
+    title,
+    summary,
+    author,
+    isbn,
   };
   if (genre != false) bookdetail.genre = genre;
 
@@ -75,8 +75,8 @@ async function bookCreate(index, title, summary, isbn, author, genre) {
 
 async function bookInstanceCreate(index, book, imprint, due_back, status) {
   const bookinstancedetail = {
-    book: book,
-    imprint: imprint,
+    book,
+    imprint,
   };
   if (due_back != false) bookinstancedetail.due_back = due_back;
   if (status != false) bookinstancedetail.status = status;

routes/catalog.js

@@ -1,12 +1,13 @@
 const express = require("express");
-const router = express.Router();
 
 // Require our controllers.
 const book_controller = require("../controllers/bookController");
 const author_controller = require("../controllers/authorController");
 const genre_controller = require("../controllers/genreController");
 const book_instance_controller = require("../controllers/bookinstanceController");
 
+const router = express.Router();
+
 /// BOOK ROUTES ///
 
 // GET catalog home page.

routes/index.js

@@ -1,4 +1,5 @@
 const express = require("express");
+
 const router = express.Router();
 
 /* GET home page. */

routes/users.js

@@ -1,4 +1,5 @@
 const express = require("express");
+
 const router = express.Router();
 
 /* GET users listing. */