Merge cd21cce into f26ee48

olusoladavid · Aug 18, 2018 · 518ccb7 · 518ccb7
2 parents f26ee48 + cd21cce
commit 518ccb7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/server/controllers/entryController.js b/server/controllers/entryController.js
@@ -133,7 +133,7 @@ class entryController {
       if (!deleted.rowCount) {
         res.status(404).json({ error: { message: 'Entry not found' } });
       }
-      res.sendStatus(204);
+      res.status(204).json();
     } catch (error) {
       next(error);
     }

diff --git a/server/controllers/userController.js b/server/controllers/userController.js
@@ -103,7 +103,7 @@ class userController {
         fav_count: favEntries.rows.length,
         created_on: user.rows[0].created_on,
         push_sub: JSON.parse(user.rows[0].push_sub),
-        email_reminder: user.rows[0].reminderisset,
+        reminder_set: user.rows[0].reminderisset,
       });
     } catch (error) {
       next(error);
@@ -112,11 +112,11 @@ class userController {
 
   static async updateProfile(req, res, next) {
     try {
-      const { push_sub: pushSub, email_reminder: reminderIsSet } = req.body;
+      const { push_sub: pushSub, reminder_set: reminderIsSet } = req.body;
       const pushSubString = JSON.stringify(pushSub);
       await query(queries.updateProfile, [req.authorizedUser.email,
         pushSubString, reminderIsSet]);
-      res.sendStatus(204);
+      res.status(204).json();
     } catch (error) {
       next(error);
     }

diff --git a/server/db/queries.js b/server/db/queries.js
@@ -6,7 +6,7 @@ queries.insertOneUser = 'INSERT INTO users(email, password) VALUES($1, $2) RETUR
 
 queries.getAllEntries = `SELECT entries.id, entries.title, entries.content, entries.created_on, 
 entries.updated_on, entries.is_favorite FROM entries INNER JOIN users ON entries.user_id=users.id 
-WHERE (users.email=$1) AND ($2='all' OR entries.is_favorite='t')`;
+WHERE (users.email=$1) AND ($2='all' OR entries.is_favorite='t') ORDER BY entries.created_on DESC`;
 
 queries.getOneEntry = `SELECT entries.id, entries.title, entries.content, 
 entries.created_on, entries.is_favorite FROM entries INNER JOIN users ON entries.user_id = users.id 

diff --git a/server/utils/validate.js b/server/utils/validate.js
@@ -95,7 +95,7 @@ validate.updateProfile = [
     .isJSON()
     .withMessage('Push Subscription should be JSON')
     .optional(),
-  body('email_reminder')
+  body('reminder_set')
     .isBoolean()
     .withMessage('Email reminder preference should be boolean')
     .optional(),

diff --git a/test/sampleData.js b/test/sampleData.js
@@ -44,7 +44,7 @@ const sampleData = {
     push_sub: JSON.stringify({ channel: 'foo' }),
   },
   invalidProfile: {
-    email_reminder: '',
+    reminder_set: '',
   },
   timestampNow: 1534258252771,
   justOverADay: 24 * 3600 * 1000 + 1,

diff --git a/test/test.js b/test/test.js
@@ -18,6 +18,8 @@ let entryCreationDate; // for storing pg date of cached entry
 const makeAuthHeader = authToken => `Bearer ${authToken}`;
 
 before(async () => {
+  // try to create tables if they dont exist
+  await createTables();
   // remove all entries
   const task1 = await query('TRUNCATE TABLE entries CASCADE');
   // remove all users
@@ -616,7 +618,7 @@ describe('/GET profile', () => {
         expect(res).to.have.status(200);
         expect(res.body).to.be.an('object');
         expect(res.body).to.be.have.keys(['entries_count', 'fav_count', 'push_sub',
-          'email_reminder', 'email', 'created_on']);
+          'reminder_set', 'email', 'created_on']);
         done();
       });
   });