#175

Author: tima101

book/6-end/server/models/Book.js

@@ -84,9 +84,11 @@ class BookClass {
       modifier.slug = await generateSlug(this, name);
     }
 
-    await this.updateOne({ _id: id }, { $set: modifier });
-
-    const editedBook = await this.findById(id, 'slug');
+    const editedBook = await this.findOneAndUpdate(
+      { _id: id },
+      { $set: modifier },
+      { fields: 'slug', new: true },
+    );
 
     return editedBook;
   }

book/7-end/server/models/Book.js

@@ -84,9 +84,11 @@ class BookClass {
       modifier.slug = await generateSlug(this, name);
     }
 
-    await this.updateOne({ _id: id }, { $set: modifier });
-
-    const editedBook = await this.findById(id, 'slug');
+    const editedBook = await this.findOneAndUpdate(
+      { _id: id },
+      { $set: modifier },
+      { fields: 'slug', new: true },
+    );
 
     return editedBook;
   }

book/7-start/server/models/Book.js

@@ -84,9 +84,11 @@ class BookClass {
       modifier.slug = await generateSlug(this, name);
     }
 
-    await this.updateOne({ _id: id }, { $set: modifier });
-
-    const editedBook = await this.findById(id, 'slug');
+    const editedBook = await this.findOneAndUpdate(
+      { _id: id },
+      { $set: modifier },
+      { fields: 'slug', new: true },
+    );
 
     return editedBook;
   }

book/8-end/pages/admin/index.js

@@ -8,10 +8,7 @@ import notify from '../../lib/notifier';
 
 import withLayout from '../../lib/withLayout';
 import withAuth from '../../lib/withAuth';
-import {
-  getBookList,
-} from '../../lib/api/admin';
-
+import { getBookList } from '../../lib/api/admin';
 
 const Index = ({ books }) => (
   <div style={{ padding: '10px 45px' }}>
@@ -22,27 +19,26 @@ const Index = ({ books }) => (
       </Link>
       <p />
       <ul>
-        {books.map(b => (
+        {books.map((b) => (
           <li key={b._id}>
-            <Link
-              as={`/admin/book-detail/${b.slug}`}
-              href={`/admin/book-detail?slug=${b.slug}`}
-            >
+            <Link as={`/admin/book-detail/${b.slug}`} href={`/admin/book-detail?slug=${b.slug}`}>
               <a>{b.name}</a>
             </Link>
           </li>
-          ))}
+        ))}
       </ul>
       <br />
     </div>
   </div>
 );
 
 Index.propTypes = {
-  books: PropTypes.arrayOf(PropTypes.shape({
-    name: PropTypes.string.isRequired,
-    slug: PropTypes.string.isRequired,
-  })).isRequired,
+  books: PropTypes.arrayOf(
+    PropTypes.shape({
+      name: PropTypes.string.isRequired,
+      slug: PropTypes.string.isRequired,
+    }),
+  ).isRequired,
 };
 
 class IndexWithData extends React.Component {
@@ -60,11 +56,7 @@ class IndexWithData extends React.Component {
   }
 
   render() {
-    return (
-      <Index
-        {...this.state}
-      />
-    );
+    return <Index {...this.state} />;
   }
 }
 

book/8-end/pages/customer/my-books.js

@@ -9,10 +9,13 @@ import withAuth from '../../lib/withAuth';
 
 class MyBooks extends React.Component {
   static propTypes = {
-    purchasedBooks: PropTypes.arrayOf(PropTypes.shape({
-      name: PropTypes.string.isRequired,
-    })),
+    purchasedBooks: PropTypes.arrayOf(
+      PropTypes.shape({
+        name: PropTypes.string.isRequired,
+      }),
+    ),
   };
+
   static defaultProps = {
     purchasedBooks: [],
   };
@@ -45,7 +48,7 @@ class MyBooks extends React.Component {
             <div>
               <h3>Your books</h3>
               <ul>
-                {purchasedBooks.map(book => (
+                {purchasedBooks.map((book) => (
                   <li key={book._id}>
                     <Link
                       as={`/books/${book.slug}/introduction`}

book/8-end/server/models/Book.js

@@ -97,9 +97,11 @@ class BookClass {
       modifier.slug = await generateSlug(this, name);
     }
 
-    await this.updateOne({ _id: id }, { $set: modifier });
-
-    const editedBook = await this.findById(id, 'slug');
+    const editedBook = await this.findOneAndUpdate(
+      { _id: id },
+      { $set: modifier },
+      { fields: 'slug', new: true },
+    );
 
     return editedBook;
   }

book/8-start/server/models/Book.js

@@ -84,9 +84,11 @@ class BookClass {
       modifier.slug = await generateSlug(this, name);
     }
 
-    await this.updateOne({ _id: id }, { $set: modifier });
-
-    const editedBook = await this.findById(id, 'slug');
+    const editedBook = await this.findOneAndUpdate(
+      { _id: id },
+      { $set: modifier },
+      { fields: 'slug', new: true },
+    );
 
     return editedBook;
   }

server/models/Book.js

@@ -117,9 +117,11 @@ class BookClass {
       modifier.slug = await generateSlug(this, name);
     }
 
-    await this.updateOne({ _id: id }, { $set: modifier });
-
-    const editedBook = await this.findById(id, 'slug');
+    const editedBook = await this.findOneAndUpdate(
+      { _id: id },
+      { $set: modifier },
+      { fields: 'slug', new: true },
+    );
 
     return editedBook;
   }