Merge pull request #43 from wednesday-solutions/feat/camelcased-models

alichherawalla · web-flow · commit d3a7224e9105 · 2022-05-30T13:05:57.000+05:30
feat: camelcased mongo-models
diff --git a/.env.example b/.env.example
@@ -18,4 +18,5 @@ API_AUDIENCE=https://node-express-demo
 REDIS_PORT=6379
 REDIS_DOMAIN=localhost
 MONGO_PORT=27017
-MONGO_BASE_URI=localhost
+MONGO_BASE_URI=localhost
+MONGO_DB_NAME=ecommerce
diff --git a/.env.test b/.env.test
@@ -20,4 +20,5 @@ NODE_ENV=test
 REDIS_PORT=6379
 REDIS_DOMAIN=localhost
 MONGO_PORT=27017
-MONGO_BASE_URI=localhost
+MONGO_BASE_URI=localhost
+MONGO_DB_NAME=ecommerce
diff --git a/models/referencedOrders.js b/models/referencedOrders.js
@@ -7,6 +7,6 @@ const schema = new mongoose.Schema({
     }
 });
 
-const ReferencedOrders = mongoose.model('referenced_orders', schema);
+const ReferencedOrders = mongoose.model('referencedOrders', schema);
 
 module.exports = { model: ReferencedOrders, ReferencedOrders, schema };
diff --git a/models/storeProducts.js b/models/storeProducts.js
@@ -18,5 +18,5 @@ const schema = new mongoose.Schema({
     }
 });
 
-const StoreProducts = mongoose.model('store_products', schema);
+const StoreProducts = mongoose.model('storeProducts', schema);
 module.exports = { model: StoreProducts, StoreProducts, schema };
diff --git a/models/supplierProducts.js b/models/supplierProducts.js
@@ -18,5 +18,5 @@ const schema = new mongoose.Schema({
     }
 });
 
-const SupplierProducts = mongoose.model('supplier_products', schema);
+const SupplierProducts = mongoose.model('supplierProducts', schema);
 module.exports = { model: SupplierProducts, SupplierProducts, schema };
diff --git a/models/unshardedOrders.js b/models/unshardedOrders.js
@@ -8,6 +8,6 @@ const schema = new mongoose.Schema({
     }
 });
 
-const UnshardedOrders = mongoose.model('unsharded_orders', schema);
+const UnshardedOrders = mongoose.model('unshardedOrders', schema);
 
 module.exports = { model: UnshardedOrders, UnshardedOrders, schema };
diff --git a/models/unshardedReferencedOrders.js b/models/unshardedReferencedOrders.js
@@ -8,7 +8,7 @@ const schema = new mongoose.Schema({
 });
 
 const UnshardedReferencedOrders = mongoose.model(
-    'unsharded_referenced_orders',
+    'unshardedReferencedOrders',
     schema
 );
 
diff --git a/nodemon.json b/nodemon.json
@@ -0,0 +1,10 @@
+{
+    "exec": "export ENVIRONMENT_NAME=local && yarn start",
+    "watch": ["server/*"],
+    "ignore": ["**/__tests__/**", "*.test.js"],
+    "events": {
+        "restart": "kill-port 9000",
+        "crash": "kill-port 9000 && npm run local"
+    },
+    "delay": "250"
+}
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
         "start": "export ENVIRONMENT_NAME=local && nodemon --exec babel-node app.js | bunyan -o short",
         "start:sharded": "export MONGO_PORT=60000 && yarn start",
         "postinstall": "link-module-alias",
-        "preinstall": "command -v link-module-alias && link-module-alias clean || true",
+        "preinstall": "source /usr/local/opt/nvm/nvm.sh; nvm use; command -v link-module-alias && link-module-alias clean || true",
         "format": "prettier-standard './**/**/*.js'",
         "lint": "npm run lint:js",
         "lint:eslint": "eslint --ignore-path .gitignore --ignore-pattern server/bin",
@@ -47,16 +47,15 @@
         "body-parser": "^1.19.1",
         "bull": "^4.8.1",
         "bunyan": "^1.8.15",
-        "core-js": "^3.20.2",
         "cors": "^2.8.5",
         "dotenv": "^16.0.0",
         "express": "^4.17.2",
         "express-jwt": "^6.1.1",
-        "express-jwt-authz": "^2.4.1",
         "express-rate-limit": "^6.3.0",
         "express-validator": "^6.14.0",
         "helmet": "^5.0.1",
         "husky": "^7.0.4",
+        "ioredis": "^5.0.5",
         "jwks-rsa": "^2.0.5",
         "kill-port": "^1.6.1",
         "lodash": "^4.17.21",
@@ -68,35 +67,25 @@
         "opossum": "^6.3.0",
         "pluralize": "^8.0.0",
         "response-time": "^2.3.2",
-        "save": "^2.4.0",
         "slack-notify": "^2.0.2",
-        "swagger-ui-express": "^4.3.0"
+        "swagger-ui-express": "^4.3.0",
+        "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@babel/cli": "^7.16.7",
         "@babel/core": "^7.16.7",
-        "@babel/eslint-parser": "^7.5.4",
+        "@babel/eslint-parser": "^7.18.2",
         "@babel/node": "^7.16.7",
-        "@babel/preset-env": "^7.16.7",
+        "@babel/preset-env": "^7.18.2",
         "@faker-js/faker": "^6.0.0-alpha.5",
-        "@types/jest": "^27.4.1",
-        "babel-eslint": "^10.1.0",
         "eslint": "^8.6.0",
-        "eslint-config-prettier": "^4.1.0",
-        "eslint-config-prettier-standard": "^3.0.1",
-        "eslint-config-standard": "^14.1.0",
-        "eslint-plugin-import": "^2.17.2",
-        "eslint-plugin-node": "^10.0.0",
+        "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-prettier": "^4.0.0",
-        "eslint-plugin-promise": "^4.2.1",
-        "eslint-plugin-standard": "^4.0.1",
-        "git-commit-msg-linter": "^4.1.2",
         "jest": "^27.4.7",
         "jest-coverage-badges": "^1.1.2",
         "link-module-alias": "^1.2.0",
         "mockingoose": "^2.15.2",
-        "pre-commit": "1.2.2",
-        "prettier": "^2.5.1",
+        "pre-commit": "^1.2.2",
+        "prettier": "^2.6.2",
         "prettier-standard": "^16.4.1",
         "supertest": "^6.2.2"
     },
diff --git a/server/api/referencedOrders/tests/index.test.js b/server/api/referencedOrders/tests/index.test.js
@@ -11,7 +11,7 @@ describe('fetchAllReferencedOrders tests', () => {
     let mockingoose;
 
     beforeAll(() => {
-        MODEL_NAME = 'referenced_orders';
+        MODEL_NAME = 'referencedOrders';
         ENDPOINT = `/${kebabCase(MODEL_NAME)}`;
     });
 
diff --git a/server/api/unshardedReferencedOrders/tests/index.test.js b/server/api/unshardedReferencedOrders/tests/index.test.js
@@ -12,7 +12,7 @@ describe('fetchAllUnshardedReferencedOrders tests', () => {
     let mockingoose;
 
     beforeAll(() => {
-        MODEL_NAME = 'unsharded_referenced_orders';
+        MODEL_NAME = 'unshardedReferencedOrders';
         ENDPOINT = `/${kebabCase(MODEL_NAME)}`;
     });
 
diff --git a/server/index.js b/server/index.js
@@ -10,11 +10,6 @@ import { isTestEnv } from 'utils';
 import { initQueues } from 'utils/queue';
 import injectRequestId from 'middlewares/injectRequestId';
 
-/**
- * Connect to database
- */
-// let db = mongoConnector();
-
 /**
  * Create express server
  */
diff --git a/server/middlewares/mongo.js b/server/middlewares/mongo.js
@@ -11,7 +11,9 @@ export const mongoConnector = () => {
     } else {
         mongoose.connect(getMongoUri());
         db = mongoose.connection;
-        db.on('error', err => log.error('error'));
+        db.on('error', err => {
+            log.error('error', err);
+        });
         db.once('open', () =>
             log.info(
                 'mongo connection successfully connected to ',
diff --git a/server/utils/mongoConstants.js b/server/utils/mongoConstants.js
@@ -1,4 +1,9 @@
+function getMongoOptions() {
+    return '?readPreference=secondary';
+}
 function getMongoUri() {
-    return `mongodb://${process.env.MONGO_BASE_URI}:${process.env.MONGO_PORT}/ecommerce?readPreference=secondary`;
+    return `mongodb://${process.env.MONGO_BASE_URI}:${process.env.MONGO_PORT}/${
+        process.env.MONGO_DB_NAME
+    }${getMongoOptions()}`;
 }
 module.exports = { getMongoUri };
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ const schema = new mongoose.Schema({`
`7`	`7`	`}`
`8`	`8`	`});`
`9`	`9`
`10`		`-const ReferencedOrders = mongoose.model('referenced_orders', schema);`
	`10`	`+const ReferencedOrders = mongoose.model('referencedOrders', schema);`
`11`	`11`
`12`	`12`	`module.exports = { model: ReferencedOrders, ReferencedOrders, schema };`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ const schema = new mongoose.Schema({`
`18`	`18`	`}`
`19`	`19`	`});`
`20`	`20`
`21`		`-const StoreProducts = mongoose.model('store_products', schema);`
	`21`	`+const StoreProducts = mongoose.model('storeProducts', schema);`
`22`	`22`	`module.exports = { model: StoreProducts, StoreProducts, schema };`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ const schema = new mongoose.Schema({`
`8`	`8`	`}`
`9`	`9`	`});`
`10`	`10`
`11`		`-const UnshardedOrders = mongoose.model('unsharded_orders', schema);`
	`11`	`+const UnshardedOrders = mongoose.model('unshardedOrders', schema);`
`12`	`12`
`13`	`13`	`module.exports = { model: UnshardedOrders, UnshardedOrders, schema };`