Release #2

api/controllers/profileController.js

@@ -6,6 +6,7 @@ const Profile = require("../models/profileModel");
 
 module.exports = {
   createProfile: async ({
+    admin,
     firstName,
     lastName,
     email,
@@ -14,6 +15,7 @@ module.exports = {
     workorders,
   }) => {
     const newProfile = new Profile({
+      admin,
       firstName,
       lastName,
       phone,
@@ -29,20 +31,18 @@ module.exports = {
       const profileRes = await Profile.findOne({ email })
         .populate("workorders")
         .exec();
-        console.log(`"profileRes.workorders": ${profileRes.workorders}`);
       return profileRes;
     } catch (err) {
       throw err;
     }
   },
   findProfileById: async (id) => {
     try {
-      const profile = await Profile.findById(id)
-      .populate("workorders")
-      .exec();
+      const profile = await Profile.findById(id).populate("workorders").exec();
       //* return everything but password
       return {
         id: profile._id,
+        admin: profile.admin,
         firstName: profile.firstName,
         lastName: profile.lastName,
         email: profile.email,
@@ -52,4 +52,22 @@ module.exports = {
       throw err;
     }
   },
+  findProfileByAny: async (inputValue) => {
+    try {
+      const profileRes = await Profile.find({
+        $or: [
+          { firstName: inputValue },
+          { lastName: inputValue },
+          { email: inputValue },
+          // TODO - mongoose.js CastError: Cast to number failed for value
+          // { phone: inputValue },
+        ],
+      })
+        .populate("workorders")
+        .exec();
+      return profileRes;
+    } catch (err) {
+      throw err;
+    }
+  },
 };

api/controllers/serviceController.js

@@ -0,0 +1,25 @@
+const Services = require("../models/serviceSchema");
+
+exports.findService = async (title) => {
+  try {
+    const serviceRes = await Services.find({ title });
+    return serviceRes;
+  } catch (err) {
+    throw err;
+  }
+};
+
+exports.createService = async ({ serviceType, title, desc, price }) => {
+  try {
+    const newService = new Service({
+      serviceType,
+      title,
+      desc,
+      price,
+    });
+    const service = await newService.save();
+    return service;
+  } catch (err) {
+    console.log(`error: ${err}`);
+  }
+};

api/controllers/workorderController.js

@@ -1,5 +1,4 @@
 const Workorder = require("../models/workorderModel");
-// const { findProfileById } = require("./profileController");
 const Profile = require("../models/profileModel");
 
 exports.createWorkorder = async ({ userId, brand, model, colour }) => {

api/models/profileModel.js

@@ -9,6 +9,11 @@ const { Schema } = mongoose;
 
 const profileSchema = new Schema(
   {
+    admin: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
     firstName: {
       type: String,
       required: true,
@@ -20,20 +25,28 @@ const profileSchema = new Schema(
     phone: {
       type: Number,
       required: true,
+      minlength: 10,
+      maxlength: 11,
+      match: /^\D?(\d{3})\D?\D?(\d{3})\D?(\d{4})$/,
     },
     email: {
       type: String,
-      required: true,   
+      required: true,
       unique: true,
+      match: /^.+@.+$/,
     },
     password: {
       type: String,
       required: true,
+      minlength: 8,
+      match: /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/,
     },
-    workorders: [{
-      type: Schema.Types.ObjectId,
-      ref: 'Workorder'
-    }] 
+    workorders: [
+      {
+        type: Schema.Types.ObjectId,
+        ref: "Workorder",
+      },
+    ],
   },
   {
     timestamps: { createdAt: "created_at", updatedAt: "updated_at" },

api/models/serviceSchema.js

@@ -2,10 +2,28 @@ const mongoose = require("mongoose");
 const { Schema } = mongoose;
 
 //___ servicesSchema
-// service:        String
+// serviceType:         String
+// title:               String
+// description:         [String]
+// price:               Number
 
 const serviceSchema = new Schema({
-  services: String,
+  serviceType: {
+    type: String,
+    required: true,
+  },
+  title: {
+    type: String,
+    required: true,
+  },
+  desc: {
+    type: [String],
+    required: true,
+  },
+  price: {
+    type: Number,
+    required: true,
+  },
 });
 
-module.exports = serviceSchema;
+module.exports = mongoose.model("Services", serviceSchema);

api/routes/profileRoutes.js

@@ -3,12 +3,12 @@ const {
   createProfile,
   findProfileByEmail,
   findProfileById,
+  findProfileByAny,
 } = require("../controllers/profileController");
 const { verifyToken } = require("../middleware/verifyToken");
 const { createToken } = require("../tokens/tokenService");
 
 const router = express.Router();
-// router.get("/search/email/:email", findProfileByEmail);
 
 router.route("/create").post(async (req, res) => {
   const { firstName, lastName, email, phone, password } = req.body;
@@ -54,7 +54,6 @@ router.route("/create").post(async (req, res) => {
 });
 
 router.route("/login").post(async (req, res) => {
-  console.log("route: login");
   const { email, password } = req.body;
   if (!email || email === " ") {
     res.status(400).json({ message: "email must be provided" });
@@ -87,13 +86,34 @@ router.route("/login").post(async (req, res) => {
   }
 });
 
-// where workorder route used to be
+router
+.route("/search/:searchValue")
+.get(async (req, res) => {
+  const { searchValue } = req.params;
+  if (!searchValue || searchValue === "") {
+    res.status(400).json({ message: "nothing to search" });
+    return;
+  } else {
+    try {
+      const match = await findProfileByAny(searchValue);
+      if (!match) {
+        res
+          .status(400)
+          .json({ message: `Search for "${searchValue}" returned no results` });
+        return;
+      }
+      res.status(200).json(match);
+    } catch (err) {
+      console.log(err);
+      res.status(500).json({ message: "Internal server error" });
+    }
+  }
+});
 
 router
   .use(verifyToken)
   .route("/this-profile")
   .get(async (req, res) => {
-    console.log(`/this-profile: ${req.profile.id}`);
     try {
       const profile = await findProfileById(req.profile.id);
       res.json({ data: profile });

api/routes/serviceRoutes.js

@@ -0,0 +1,52 @@
+const express = require("express");
+const router = express.Router();
+const Services = require("../models/serviceSchema");
+
+router.route("/").get(async (req, res) => {
+  try {
+    const services = await Services.find();
+    res.json(services);
+  } catch (err) {
+    res.json({ error: err });
+  }
+});
+
+router.route("/create").post(async (req, res) => {
+  const { serviceType, title, desc, price } = req.body;
+  if (!serviceType || serviceType === " ") {
+    res.status(400).json({ message: "service type must be provided" });
+    return;
+  }
+  if (!title || title === " ") {
+    res.status(400).json({ message: "title must be provided" });
+    return;
+  }
+  if (!desc || desc === " ") {
+    res.status(400).json({ message: "description must be provided" });
+    return;
+  }
+  if (!price || price === " ") {
+    res.status(400).json({ message: "price must be provided" });
+    return;
+  }
+  try {
+    const service = await findService(title);
+    if (service) {
+      res
+        .status(400)
+        .json({ message: `a service with this title already exists` });
+    }
+    const newService = await createService({
+      serviceType,
+      title,
+      desc,
+      price,
+    });
+    res.status(200).json({ data: { id: newService._id } });
+  } catch (err) {
+    console.log(err);
+    res.status(500).json({ message: "Internal server error" });
+  }
+});
+
+module.exports = router;

api/routes/workorderRoutes.js

@@ -2,9 +2,9 @@ const express = require("express");
 const router = express.Router();
 const Workorder = require("../models/workorderModel");
 const { verifyToken } = require("../middleware/verifyToken");
-const { createToken } = require("../tokens/tokenService");
-const { findProfileById } = require("../controllers/profileController");
 const { createWorkorder } = require("../controllers/workorderController");
+// const { createToken } = require("../tokens/tokenService");
+// const { findProfileById } = require("../controllers/profileController");
 
 // TODO
 // @route   GET/workorders
@@ -26,7 +26,7 @@ router.get("/", async (req, res) => {
 // router.post("/create/:userId", async (req, res) => {
 
 router
-  // .use(verifyToken)
+  .use(verifyToken)
   .route("/create/:userId")
   .post(async (req, res) => {
     const { brand, model, colour } = req.body;

package.json

@@ -21,10 +21,12 @@
     "object-path": "^0.11.5",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
+    "react-input-mask": "^2.0.4",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^4.0.1",
     "react-virtualized": "^9.22.3"
   },
+  "proxy": "http://localhost:5000",
   "scripts": {
     "start:client": "react-scripts start",
     "start:server": "nodemon server.js --ignore src",
@@ -35,7 +37,6 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://localhost:5000",
   "browserslist": {
     "production": [
       ">0.2%",