Not Found 404 case handled.

Author: heyrandhir

constants/progresses.js

@@ -1,6 +1,6 @@
 const PROGRESS_DOCUMENT_CREATED_SUCCEEDED = "Progress document created successfully.";
 const PROGRESS_DOCUMENT_RETRIEVAL_SUCCEEDED = "Progress document retrieved successfully.";
-const PROGRESS_DOCUMENT_NOT_FOUND = "No Progress document found.";
+const PROGRESS_DOCUMENT_NOT_FOUND = "No progress records found.";
 const PROGRESS_ALREADY_CREATED = "Progress for the day has already been created.";
 const MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
 

controllers/progresses.js

@@ -1,8 +1,7 @@
-const { Conflict } = require("http-errors");
+const { Conflict, NotFound } = require("http-errors");
 const { createProgressDocument, getProgressDocument, getRangeProgressData } = require("../models/progresses");
 const { RESPONSE_MESSAGES } = require("../constants/progresses");
-const { PROGRESS_DOCUMENT_RETRIEVAL_SUCCEEDED, PROGRESS_DOCUMENT_NOT_FOUND, PROGRESS_DOCUMENT_CREATED_SUCCEEDED } =
-  RESPONSE_MESSAGES;
+const { PROGRESS_DOCUMENT_RETRIEVAL_SUCCEEDED, PROGRESS_DOCUMENT_CREATED_SUCCEEDED } = RESPONSE_MESSAGES;
 
 /**
  * Adds Progress Document
@@ -41,13 +40,17 @@ const createProgress = async (req, res) => {
 const getProgress = async (req, res) => {
   try {
     const data = await getProgressDocument(req.query);
-    const count = data.length;
     return res.json({
-      message: count ? PROGRESS_DOCUMENT_RETRIEVAL_SUCCEEDED : PROGRESS_DOCUMENT_NOT_FOUND,
-      count,
+      message: PROGRESS_DOCUMENT_RETRIEVAL_SUCCEEDED,
+      count: data.length,
       data,
     });
   } catch (error) {
+    if (error instanceof NotFound) {
+      return res.status(404).json({
+        message: error.message,
+      });
+    }
     return res.status(400).json({
       message: error.message,
     });
@@ -68,6 +71,11 @@ const getProgressRangeData = async (req, res) => {
       data,
     });
   } catch (error) {
+    if (error instanceof NotFound) {
+      return res.status(404).json({
+        message: error.message,
+      });
+    }
     return res.status(400).json({
       message: error.message,
     });

utils/progresses.js

@@ -1,6 +1,10 @@
+const { NotFound } = require("http-errors");
 const { fetchTask } = require("../models/tasks");
 const { fetchUser } = require("../models/users");
 const fireStore = require("../utils/firestore");
+const {
+  RESPONSE_MESSAGES: { PROGRESS_DOCUMENT_NOT_FOUND },
+} = require("../constants/progresses");
 const progressesCollection = fireStore.collection("progresses");
 
 const buildQueryForPostingProgress = ({ type, userId, taskId }) => {
@@ -13,14 +17,14 @@ const buildQueryForPostingProgress = ({ type, userId, taskId }) => {
 const assertUserExists = async (userId) => {
   const { userExists } = await fetchUser({ userId });
   if (!userExists) {
-    throw new Error(`User with id ${userId} does not exist`);
+    throw new NotFound(`User with id ${userId} does not exist.`);
   }
 };
 
 const assertTaskExists = async (taskId) => {
   const { taskData } = await fetchTask(taskId);
   if (!taskData) {
-    throw new Error(`Task with id ${taskId} does not exist`);
+    throw new NotFound(`Task with id ${taskId} does not exist.`);
   }
 };
 
@@ -49,6 +53,9 @@ const buildQueryToFetchDocs = (queryParams) => {
 
 const getProgressDocs = async (query) => {
   const progressesDocs = await query.get();
+  if (!progressesDocs.size) {
+    throw new NotFound(PROGRESS_DOCUMENT_NOT_FOUND);
+  }
   const docsData = [];
   progressesDocs.forEach((doc) => {
     docsData.push({ id: doc.id, ...doc.data() });
@@ -76,6 +83,9 @@ const getProgressRecords = async (query, queryParams) => {
   const { startDate, endDate } = queryParams;
   const docsData = {};
   const progressesDocs = (await query.get()).docs;
+  if (!progressesDocs.size) {
+    throw new NotFound(PROGRESS_DOCUMENT_NOT_FOUND);
+  }
   progressesDocs.forEach((doc) => {
     const date = new Date(doc.data().date).toISOString().slice(0, 10);
     docsData[date] = true;