Merge branch 'master' into auth-backend-3

functions/handlers/post.js

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
 const admin = require('firebase-admin');
 
@@ -63,3 +64,7 @@ exports.getallPosts = (req, res) => {
     res.status(500).send("Failed to retrieve posts from database.", err);
     });
 };
+
+exports.getFilteredPosts = (req, res) => {
+    admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
+};

functions/handlers/topic.js

@@ -1,52 +1,61 @@
-/* eslint-disable promise/always-return */
+/* eslint-disable promise/always-return */
 const { admin, db } = require("../util/admin");
 exports.putTopic = (req, res) => {
+  const newTopic = {
+    topic: req.body.topic
+  };
 
-    const newTopic = {
-        topic: req.body.topic
-    };
-
-    admin.firestore().collection('topics').add(newTopic)
-    .then((doc) => {
-        const resTopic = newTopic;
-        newTopic.topicId = doc.id;
-        return res.status(200).json(resTopic);
+  admin
+    .firestore()
+    .collection("topics")
+    .add(newTopic)
+    .then(doc => {
+      const resTopic = newTopic;
+      return res.status(200).json(resTopic);
     })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({ error: 'something is wrong'});
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: "something is wrong" });
     });
 };
 
 exports.getAllTopics = (req, res) => {
-    admin.firestore().collection('topics').get()
-    .then((data) => {
-        let topics = [];
-        data.forEach(function(doc) {
-            topics.push(doc.data());
+  admin
+    .firestore()
+    .collection("topics")
+    .get()
+    .then(data => {
+      let topics = [];
+      data.forEach(function(doc) {
+        topics.push({
+          topic: doc.data().topic,
+          id: doc.id
         });
-        return res.status(200).json(topics);
-    })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({error: 'Failed to fetch all topics.'})
+      });
+      return res.status(200).json(topics);
     })
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: "Failed to fetch all topics." });
+    });
 };
 
 exports.deleteTopic = (req, res) => {
-    const topic = db.doc(`/topics/${req.params.topicId}`);
-    topic.get().then((doc) => {
-        if (!doc.exists) {
-            return res.status(404).json({error: 'Topic not found'});
-        } else {
-            return topic.delete();
-        }
+  const topic = db.doc(`/topics/${req.params.topicId}`);
+  topic
+    .get()
+    .then(doc => {
+      if (!doc.exists) {
+        return res.status(404).json({ error: "Topic not found" });
+      } else {
+        return topic.delete();
+      }
     })
     .then(() => {
-        res.json({ message: 'Topic successfully deleted!'});
+      res.json({ message: "Topic successfully deleted!" });
     })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({error: 'Failed to delete topic.'})
-    })
-}
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: "Failed to delete topic." });
+    });
+};

functions/index.js

@@ -56,11 +56,7 @@ app.post("/putPost", fbAuth, putPost);
 /*------------------------------------------------------------------*
  *  handlers/topic.js                                                *
  *------------------------------------------------------------------*/
-const {
-  putTopic,
-  getAllTopics,
-  deleteTopic
-} = require("./handlers/topic");
+const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic");
 
 // add topic to database
 app.post("/putTopic", fbAuth, putTopic);