Merge pull request #109 from Shimork04/master

updates in validators/index.js

Author: sazamansari

common/validators/index.js

@@ -1,7 +1,9 @@
-// import moment from "moment";
+import moment from "moment";
+
 const moment = require("moment");
+const mongoose = require("mongoose");
 
-const Valiadtors = {
+const Validators = {
   isValidEmail: (email) => {
     var pattern = /(([a-zA-Z0-9\-?\.?]+)@(([a-zA-Z0-9\-_]+\.)+)([a-z]{2,3}))+$/;
     return new RegExp(pattern).test(email);
@@ -44,22 +46,16 @@ const Valiadtors = {
   },
 
   getWeekOfYear: (params) => {
-    params.currDate = Date.now();
-    var year = new Date(parseInt(params.currDate)).getFullYear();
-    var month = new Date(parseInt(params.currDate)).getMonth() + 1;
-    var date = new Date(parseInt(params.currDate)).getDate();
-    return moment(month + "-" + date + "-" + "-" + year, "MM-DD-YYYY").week();
+    return moment().week();
   },
 
   getMonthOfYear: (params) => {
-    params.currDate = Date.now();
-    var month = new Date(parseInt(params.currDate)).getMonth() + 1;
-    return month;
+    return moment().month() + 1;
   },
 
   validatePincode: (pin) => {
     return /^(\d{4}|\d{6})$/.test(pin);
   },
 };
 
-module.exports = Valiadtors;
+module.exports = Validators;

config/db.js

@@ -1,4 +1,5 @@
-// import mongoose from "mongoose";
+import mongoose from "mongoose";
+
 const mongoose = require("mongoose");
 
 const connectDB = async () => {

middleware/morgan/index.js

@@ -1,7 +1,7 @@
-// import morgan from "morgan";
+import morgan from "morgan";
 const morgan = require("morgan");
 
-// import logger from "../../common/logger";
+import logger from "../../common/logger";
 const logger = require("../../common/logger");
 
 logger.stream = {

package-lock.json

@@ -30,6 +30,7 @@
     "request": "^2.88.2",
     "strategy": "^1.1.1",
     "twilio": "^3.82.1",
+    "user-auth-microservice": "^3.1.0",
     "uuid": "^7.0.3",
     "winston": "^3.8.2"
   },