@misterzik/espressojs 3.1.17 → 3.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@misterzik/espressojs",
-    "version": "3.1.17",
+    "version": "3.1.19",
     "description": "EspressoJS Introducing Espresso.JS, your ultimate Express configuration starting point and boilerplate. With its simplicity and lack of opinionation, EspressoJS offers plug-and-play configurations built on top of Express.",
     "main": "index.js",
     "scripts": {

package/routes/api/index.js

@@ -8,51 +8,8 @@
  */
 
 const express = require("express");
-const axios = require("axios");
 const router = express.Router();
-const configuration = require("../../server");
-
-const getAPI = (req, res) => {
-  axios
-    .get(configuration.api.uri, configuration.api.configs)
-    .then(function (response) {
-      if (response.status == 200) {
-        res.json(response.data);
-      } else if (response.status == 400) {
-        res.json({ message: "400" });
-      }
-    })
-    .catch((err) => res.send(err));
-};
-
-const getItem = (req, res, params) => {
-  axios
-    .get(configuration.api.uri + "/" + params, configuration.api.configs)
-    .then(function (response) {
-      if (response.status === 200) {
-        res.json(response.data);
-      } else if (response.status === 400) {
-        res.json({ message: "400" });
-      }
-    })
-    .catch((err) => res.send(err));
-};
-
-const getItemId = (req, res, params, paramsId) => {
-  axios
-    .get(
-      configuration.api.uri + params + "/" + paramsId + "/",
-      configuration.api.configs
-    )
-    .then(function (response) {
-      if (response.status === 200) {
-        res.json(response.data);
-      } else if (response.status === 400) {
-        res.json({ message: "400" });
-      }
-    })
-    .catch((err) => res.send(err));
-};
+const { getAPI, getItem, getItemId } = require("../utils");
 router.get("/v1/", (req, res) => {
   getAPI(req, res);
 });

package/routes/db/index.js

@@ -10,27 +10,28 @@
  * @param {*} app - Vimedev.com Labs
  */
 
+const clientController = require("./controllers");
+const url = "/api/clients/";
+
 module.exports = (app) => {
-  const clientRouter = require("../../server/controllers/client/client.controller.js");
-  const url = "/api/clients/";
-  /**
-   * Create
-   */
-  app.post(url, clientRouter.create);
-  /**
-   * Get All
-   */
-  app.get(url, clientRouter.findAll);
-  /**
-   * Retrieve a single Note with clientId
-   */
-  app.get(url + ":clientId", clientRouter.findOne);
-  /**
-   * Update a Note with clientId
-   */
-  app.put(url + ":clientId", clientRouter.update);
-  /**
-   * Delete a Note with clientId
-   */
-  app.delete(url + ":clientId", clientRouter.delete);
+  /*  Get All */
+  app.get(url, (req, res) => {
+    clientController.findAll("client", req, res);
+  });
+  /* Create */
+  app.post(url, (req, res) => {
+    clientController.create("client", req, res);
+  });
+  /* Retrieve a single Note with clientId */
+  app.get(url + ":clientId", (req, res) => {
+    clientController.findOne("client", req, res);
+  });
+  /** Update a Note with clientId */
+  app.put(url + ":clientId", (req, res) => {
+    clientController.update("client", req, res);
+  });
+  /* Delete a Note with clientId */
+  app.delete(url + ":clientId", (req, res) => {
+    clientController.delete("client", req, res);
+  });
 };

package/routes/index.js

@@ -9,17 +9,21 @@
  * @param {*} app - Vimedev.com Labs
  */
 
+const Path = require("path");
+const configuration = require("../server");
+const api = require("./api");
+const db = require("./db");
+
 module.exports = (app) => {
-  const Path = require("path");
-  const configuration = require("../server");
-  const api = require("./api");
   app.get("/", function (res) {
     res.sendFile("index.html", { root: Path.join("./public") });
   });
   if (configuration.api_isEnabled === true) {
     app.use("/api", api);
   }
-  require("./db")(app);
+  if (configuration.mongo_isEnabled === true) {
+    db(app);
+  }
   app.use(function (req, res, next) {
     res.status(404).send("404 - Sorry can't find that!");
   });

package/routes/utils/index.js

@@ -0,0 +1,42 @@
+const axios = require("axios");
+const configuration = require("../../server");
+
+const handleResponse = (res, response) => {
+  if (response.status === 200) {
+    res.json(response.data);
+  } else if (response.status === 400) {
+    res.json({ message: "400" });
+  }
+};
+
+const getAPI = (req, res) => {
+  axios
+    .get(configuration.api.uri, configuration.api.configs)
+    .then(function (response) {
+      handleResponse(res, response);
+    })
+    .catch((err) => res.send(err));
+};
+
+const getItem = (req, res, params) => {
+  axios
+    .get(configuration.api.uri + "/" + params, configuration.api.configs)
+    .then(function (response) {
+      handleResponse(res, response);
+    })
+    .catch((err) => res.send(err));
+};
+
+const getItemId = (req, res, params, paramsId) => {
+  axios
+    .get(
+      configuration.api.uri + params + "/" + paramsId + "/",
+      configuration.api.configs
+    )
+    .then(function (response) {
+      handleResponse(res, response);
+    })
+    .catch((err) => res.send(err));
+};
+
+module.exports = { getAPI, getItem, getItemId };

package/server/controllers/index.js

@@ -0,0 +1,166 @@
+/**
+ * Retrieve and return all clients from the collection.
+ * @param {string} clientName - Name of the client model
+ * @param {*} req - Request data
+ * @param {*} res - Response data
+ */
+exports.findAll = (clientName, req, res) => {
+  const PropertyName = require(`../../models/${clientName}.model.js`);
+
+  PropertyName.find()
+    .then((clients) => {
+      res.send(clients);
+    })
+    .catch((err) => {
+      res.status(500).send({
+        message:
+          err.message ||
+          `Error occurred while retrieving ${clientName} clients.`,
+      });
+    });
+};
+
+/**
+ * Create and save a new client to the collection.
+ * @param {string} clientName - Name of the client model
+ * @param {*} req - Request data
+ * @param {*} res - Response data
+ */
+exports.create = (clientName, req, res) => {
+  const PropertyName = require(`../../models/${clientName}.model.js`);
+
+  if (!req.body.email) {
+    return res.status(400).send({
+      message: "Email cannot be an empty field.",
+    });
+  }
+
+  const dataProperty = new PropertyName({
+    name: req.body.name,
+    email: req.body.email,
+    location: req.body.location,
+  });
+
+  dataProperty
+    .save()
+    .then((data) => {
+      res.send(data);
+    })
+    .catch((err) => {
+      res.status(500).send({
+        message:
+          err.message ||
+          `Error occurred while creating ${clientName} PropertyName.`,
+      });
+    });
+};
+
+/**
+ * Find a single client by clientId.
+ * @param {string} clientName - Name of the client model
+ * @param {*} req - Request data
+ * @param {*} res - Response data
+ */
+exports.findOne = (clientName, req, res) => {
+  const PropertyName = require(`../../models/${clientName}.model.js`);
+
+  PropertyName.findById(req.params.clientId)
+    .then((client) => {
+      if (!client) {
+        return res.status(404).send({
+          message:
+            `${clientName} client not found with id ` + req.params.clientId,
+        });
+      }
+      res.send(client);
+    })
+    .catch((err) => {
+      if (err.kind === "ObjectId") {
+        return res.status(404).send({
+          message:
+            `${clientName} client not found with id ` + req.params.clientId,
+        });
+      }
+      return res.status(500).send({
+        message: "Error retrieving client with id " + req.params.clientId,
+      });
+    });
+};
+
+/**
+ * Update a client identified by clientId.
+ * @param {string} clientName - Name of the client model
+ * @param {*} req - Request data
+ * @param {*} res - Response data
+ */
+exports.update = (clientName, req, res) => {
+  const PropertyName = require(`../../models/${clientName}.model.js`);
+
+  if (!req.body.email) {
+    return res.status(400).send({
+      message: "Client content cannot be empty",
+    });
+  }
+
+  PropertyName.findByIdAndUpdate(
+    req.params.clientId,
+    {
+      name: req.body.name || "John Doe",
+      email: req.body.email,
+      location: req.body.location,
+    },
+    { new: true }
+  )
+    .then((client) => {
+      if (!client) {
+        return res.status(404).send({
+          message:
+            `${clientName} client not found with id ` + req.params.clientId,
+        });
+      }
+      res.send(client);
+    })
+    .catch((err) => {
+      if (err.kind === "ObjectId") {
+        return res.status(404).send({
+          message:
+            `${clientName} client not found with id ` + req.params.clientId,
+        });
+      }
+      return res.status(500).send({
+        message: "Error updating client with id " + req.params.clientId,
+      });
+    });
+};
+
+/**
+ * Delete a client by clientId.
+ * @param {string} clientName - Name of the client model
+ * @param {*} req - Request data
+ * @param {*} res - Response data
+ */
+exports.delete = (clientName, req, res) => {
+  const PropertyName = require(`../../models/${clientName}.model.js`);
+
+  PropertyName.findByIdAndRemove(req.params.clientId)
+    .then((client) => {
+      if (!client) {
+        return res.status(404).send({
+          message:
+            `${clientName} client not found with id ` + req.params.clientId,
+        });
+      }
+      res.send({ message: "Client deleted successfully!" });
+    })
+    .catch((err) => {
+      if (err.kind === "ObjectId" || err.name === "NotFound") {
+        return res.status(404).send({
+          message:
+            `${clientName} client not found with id ` + req.params.clientId,
+        });
+      }
+      return res.status(500).send({
+        message: "Could not delete client with id " + req.params.clientId,
+      });
+    });
+};

package/server/models/client.model.js

@@ -4,7 +4,7 @@
  * _|      _|  _|  _|  _|  _|    _|
  *   _|  _|    _|      _|  _|    _|
  *     _|      _|      _|  _|_|_|
- * MongoDB Schema Example
+ * MongoDB Schema Clients Sample
  */
 const mongoose = require("mongoose");
 const clientSchema = mongoose.Schema(

package/server/utils/espresso-cli.js

@@ -28,7 +28,7 @@ Running ....
 
 Instance Config:
 Configuration: ${cfgB.instance}
-Endpoint: localhost:${cfgB.port}
+Endpoint: http://localhost:${cfgB.port}
 JSON:`,
       cfgB,
       `\n\nTo stop process press CTRL+C`
@@ -59,7 +59,7 @@ function envCommand(argv) {
   } else {
     console.warn("Config already saved...");
   }
-  writeConfigFile(cfgB)
+  writeConfigFile(cfgB);
 }
 
 yargs.command({