improved urlgen

src/models/db.js

@@ -5,7 +5,7 @@ const Sequelize = require('sequelize');
 
 // only used in the dev environment
 // require('../../.env');
-require('dotenv').config({ path: '../.env' });
+require('dotenv').config({ path: '.env' });
 
 // connect to the db
 const sequelize = new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PW, {

src/routes/index.js

@@ -5,7 +5,7 @@ module.exports = (express) => {
 // Route sources
 
   // create or retreave existing short link
-  router.use('/maumasi.fy/v1.1.1', require('./apiEndPoints/shortenUrl')(express));
+  router.use('/v1', require('./apiEndPoints/shortenUrl')(express));
 
   // redirect to URL address when short link comes in
   router.use('/maumasi.fy', require('./apiEndPoints/keyRedirect')(express));

src/server.js

@@ -7,7 +7,7 @@ const routes = require('./routes');
 
 
 // require('dotenv').config({ path: '.env' }); // <--------- for running unit tests with mocha
-require('dotenv').config({ path: '../.env' }); // <--- for running app
+require('dotenv').config({ path: '.env' }); // <--- for running app
 
 const app = express();
 const PORT = process.env.PORT || 3000;

src/services/serviceRepo/randomKeyMaker.js

@@ -1,45 +1,21 @@
 
 // const maumasiFyURL = require('../../models/db_crud').table('maumasiFyURL');
-
+// Fine, here's a commnet!
+const lengthOfGen = 6;
 // private func that produces a random index of the array arg
 var randomIndex = (array) => {
   return Math.floor(Math.random() * (array.length));
 };
 
 module.exports = () => {
   // will bemoce a string of random charSets 5 char long
-  var randomString = '';
-
-  // get today's 'day of the month' date
-  const today = new Date().getDate();
 
-  const charSets = {
-    upperCase: [],
-    lowerCase: ['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', 'a', 's', 'd',
-                'f', 'g', 'h', 'j', 'k', 'l', 'z', 'x', 'c', 'v', 'b', 'n', 'm'],
-    numbers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0],
-  };
+  const strAlphaNum = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 
-  // fill charSets.upperCase with uppercase letters
-  for (var letter of charSets.lowerCase) {
-    charSets.upperCase.push(letter.toUpperCase());
+  var outputString = "";
+  for(var i=0; i<lengthOfGen; i++){
+    outputString += strAlphaNum.charAt(Math.floor(Math.random() * strAlphaNum.length));
   }
 
-  // get a random index
-  const upperIndex1 = randomIndex(charSets.upperCase);
-  const lowerIndex1 = randomIndex(charSets.lowerCase);
-  const upperIndex2 = randomIndex(charSets.upperCase);
-  const lowerIndex2 = randomIndex(charSets.lowerCase);
-  const numIndex = randomIndex(charSets.numbers);
-
-  // build string
-  randomString += today;
-  randomString += charSets.upperCase[upperIndex1];
-  randomString += charSets.upperCase[upperIndex2];
-  randomString += charSets.lowerCase[lowerIndex1];
-  randomString += charSets.lowerCase[lowerIndex2];
-  randomString += charSets.numbers[numIndex];
-
-  // console.log(randomString);
-  return randomString;
+  return outputString;
 };