Merge pull request #6 from TECHOUS/dev

Code Style Changes

Author: GauravWalia19

.github/job.js

@@ -1,7 +1,9 @@
-const { default: axios } = require('axios');
-const codeRatingModel = require('../models/codeRatingModel');
-const mongoose = require('mongoose');
-const fs = require('fs');
+const {default: axios} = require('axios')
+const codeRatingModel = require('../models/codeRatingModel')
+const mongoose = require('mongoose')
+const fs = require('fs')
+
+require('dotenv').config()
 
 // function to read the code file and sends the username in callback function
 const getUserNameFromCodeBaseFile = (fileName) => {
@@ -10,78 +12,89 @@ const getUserNameFromCodeBaseFile = (fileName) => {
             if (err) {
                 reject(err)
             } else {
-                const lines = buf.toString().split("\n");
-                let username = "";
+                const lines = buf.toString().split('\n')
+                let username = ''
                 for (let i = 0; i < lines.length; i++) {
                     if (lines[i].search('AUTHOR:') != -1) {
                         username = lines[i].split('AUTHOR:')[1].trim()
-                        break;
+                        break
                     }
                 }
                 fileName = fileName.split('/')[2]
-                resolve({ username, fileName })
+                resolve({username, fileName})
             }
         })
     })
 }
 
 // function to connect to mongodb using mongoose
 const connectMongoDB = () => {
-    require('dotenv').config()
-    mongoose.connect(process.env.MONGODB_URI, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true });
-    const db = mongoose.connection;
-    db.on('error', console.error.bind(console, 'Connection error:'));
-    return db;
+    mongoose.connect(process.env.MONGODB_URI, {
+        useNewUrlParser: true,
+        useUnifiedTopology: true,
+        useCreateIndex: true,
+    })
+    const db = mongoose.connection
+    db.on('error', console.error.bind(console, 'Connection error:'))
+    return db
 }
 
 // uses single call to mongo db
 const insertDataInMongo = (records) => {
     const db = connectMongoDB()
 
-    codeRatingModel.insertMany(records,{ordered: false})
+    codeRatingModel
+        .insertMany(records, {ordered: false})
         .then(() => {
-            console.log("Data added successfully")
-            db.close();
+            console.log('Data added successfully')
+            db.close()
         })
         .catch((err) => {
-            console.log("Data is not added: " + err);
-            db.close();
+            console.log('Data is not added: ' + err)
+            db.close()
         })
 }
 
 // this function handles calling the API
 const callGithubCodeBaseAPI = () => {
-    axios.get('https://api.github.com/repos/TechOUs/HacktoberFest21Community/contents/CodeBase')
-        .then(res => {
-
+    axios
+        .get(
+            `https://api.github.com/repos/TECHOUS/${process.env.CODE_SRC}/contents/CodeBase`
+        )
+        .then((res) => {
             // get all the names from the files
             const filePromises = res.data.map((codeObject) => {
-                return getUserNameFromCodeBaseFile(`HacktoberFest21Community/${codeObject.path}`)
+                return getUserNameFromCodeBaseFile(
+                    `${process.env.CODE_SRC}/${codeObject.path}`
+                )
             })
 
             // resolve/reject all the file promises
-            Promise.allSettled(filePromises)
-                .then((fileObjects) => {
-
-                    // creating a map of filename to usernames
-                    const fileMap = new Map(fileObjects.map((fileObject) => {
-                        return [fileObject.value.fileName, fileObject.value.username];
-                    }))
-
-                    const dataToInsert = res.data.map((data) => {
-                        return {
-                            codeId: data.sha,
-                            codeRating: 0,
-                            codeUrl: data.url,
-                            codeName: data.name,
-                            userName: fileMap.get(data.name)
-                        }
+            Promise.allSettled(filePromises).then((fileObjects) => {
+                // creating a map of filename to usernames
+                const fileMap = new Map(
+                    fileObjects.map((fileObject) => {
+                        return [
+                            fileObject.value.fileName,
+                            fileObject.value.username,
+                        ]
                     })
+                )
 
-                    insertDataInMongo(dataToInsert);
+                const dataToInsert = res.data.map((data) => {
+                    return {
+                        codeId: data.sha,
+                        codeRating: 0,
+                        codeUrl: data.url,
+                        codeName: data.name,
+                        userName: fileMap.get(data.name),
+                    }
                 })
+
+                insertDataInMongo(dataToInsert)
+            })
         })
-        .catch(err => console.log(err))
+        .catch((err) => console.log(err))
 }
 
-callGithubCodeBaseAPI();
+callGithubCodeBaseAPI()

.github/job.sh

@@ -1,13 +1,14 @@
 # /bin/bash
 # this shell script it to read all the code from the community project and
 # upload to mongodb run this script locally only from root
-# bash .github/job.sh
 
-git clone "https://github.com/TechOUs/HacktoberFest21Community.git"
+git clone "https://github.com/TECHOUS/$CODE_SRC.git"
 
 node .github/job.js
 
 # cleanup
 echo "Cleanup..."
-rm -rf HacktoberFest21Community
+
+rm -rf $CODE_SRC
+
 echo "Cleanup...Done"

.github/workflows/Vercel Deployment.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '16.x'
       - run: yarn install
       - run: yarn run test
     env:

.github/workflows/codebase-engine.yml

@@ -9,11 +9,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
-      - run: npm install
+          node-version: '16.x'
+      - run: yarn install
       - run: bash .github/job.sh
     env:
       MONGODB_URI: ${{ secrets.MONGODB_URI }}
       RATE_LIMIT_MINUTES: ${{ secrets.RATE_LIMIT_MINUTES }}
       RATE_LIMIT_MAX_REQUEST: ${{ secrets.RATE_LIMIT_MAX_REQUEST }}
-      CACHE_STORAGE_SECONDS: ${{ secrets.CACHE_STORAGE_SECONDS }}
+      CACHE_STORAGE_SECONDS: ${{ secrets.CACHE_STORAGE_SECONDS }}
+      CODE_SRC: ${{secrets.CODE_SRC}}

.prettierignore

@@ -0,0 +1,11 @@
+# ignore files for prettier
+
+.github/workflows
+.vercel
+node_modules
+.env
+.gitignore
+.vercelignore
+README.md
+vercel.json
+yarn.lock

.prettierrc.json

@@ -0,0 +1,6 @@
+{
+    "singleQuote": true,
+    "semi": false,
+    "bracketSpacing": false,
+    "tabWidth": 4
+}

.vercelignore

@@ -5,5 +5,7 @@ node_modules
 test
 .env
 .gitignore
+.prettierignore
+.prettierrc.json
 README.md
-HacktoberFest21Community
+coderatefest

app.js

@@ -1,39 +1,39 @@
-const express = require('express');
-const cors = require('cors');
-const rateLimit = require("express-rate-limit");
+const express = require('express')
+const cors = require('cors')
+const rateLimit = require('express-rate-limit')
 
-const app = express();
+const app = express()
 
 // exclusing dotenv config from production
 if (process.env.NODE_ENV !== 'production') require('dotenv').config()
 
 // setting up the rate limiter
 const rateLimiter = rateLimit({
-    windowMs: process.env.RATE_LIMIT_MINUTES * 60 * 1000,    // 1 minute
+    windowMs: process.env.RATE_LIMIT_MINUTES * 60 * 1000, // 1 minute
     max: process.env.RATE_LIMIT_MAX_REQUEST,
     message: {
         status: 429,
-        error: "Too many requests, please try again later!!!"
-    }
-});
+        error: 'Too many requests, please try again later!!!',
+    },
+})
 
 // Enable if you're behind a reverse proxy (Heroku, Bluemix, AWS ELB, Nginx, etc)
 // see https://expressjs.com/en/guide/behind-proxies.html
-app.set('trust proxy', 1);
+app.set('trust proxy', 1)
 
 // rate limiting middleware
-app.use(rateLimiter);
+app.use(rateLimiter)
 
 // CORS Middleware
-app.use(cors());
+app.use(cors())
 
-// express middleware handling the body parsing 
-app.use(express.json());
+// express middleware handling the body parsing
+app.use(express.json())
 
 // express middleware handling the form parsing
-app.use(express.urlencoded({extended: false}));
+app.use(express.urlencoded({extended: false}))
 
 // middleware for handling sample api routes
-app.use('/api/v1', require('./routes/api/API'));
+app.use('/api/v1', require('./routes/api/v1/API'))
 
-module.exports = app;
+module.exports = app

bin/www

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-const app = require('../app');
+const app = require('../app')
 
 // use port from environment variables for production
-const PORT = process.env.PORT || 5000;
+const PORT = process.env.PORT || 5000
 
-app.listen(PORT,()=>{
-    console.log(`server running on port ${PORT}`);
-})
+app.listen(PORT, () => {
+    console.log(`server running on port ${PORT}`)
+})

models/accessToken.js

@@ -1,16 +1,16 @@
-const mongoose = require('mongoose');
+const mongoose = require('mongoose')
 
-const Schema = mongoose.Schema;
+const Schema = mongoose.Schema
 
 const accessTokenModel = new Schema({
     token: {
         type: String,
         unique: true,
-        required: true
+        required: true,
     },
     timestamp: {
-        type: Date
-    }
+        type: Date,
+    },
 })
 
-module.exports = mongoose.model('accessToken', accessTokenModel);
+module.exports = mongoose.model('accessToken', accessTokenModel)