Merge pull request #4 from arvind-balaji/refactor_modular

Modular Refactor

Author: arvind-balaji

.env.sample

@@ -0,0 +1,9 @@
+API_PREFIX=/v1
+
+SOLR_PORT=<MY_SOLR_PORT>
+SOLR_CORE=<MY_SOLR_CORE>
+SOLR_HOST=<MY_SOLR_HOST>
+
+MONGO_DEV_CONN_URL=mongodb://<MY_MONGO_INSTANCE>
+MONGO_LOCAL_CONN_URL=mongodb://<MY_MONGO_INSTANCE>
+MONGO_DB_NAME=<MY_DB_NAME>

.gitignore

@@ -3,6 +3,5 @@ node_modules
 build
 npm-debug.log
 yarn-error.log
-scrape
 .env
 .DS_Store

app.js

@@ -1,36 +1,10 @@
 require('dotenv').config();
+require('module-alias/register');
 
-const express = require('express');
-const app = express(); 
-const router = express.Router(); 
-const bodyParser = require('body-parser');
-const cors = require('cors')
+// init database
+const mongoose = require("mongoose");
+mongoose.connect(process.env.MONGO_CONN_URL, { useNewUrlParser: true })
 
-const fs = require('fs');
-const port = process.env.PORT || 8080; 
-
-app.use(bodyParser.urlencoded({extended: true}));
-app.use(bodyParser.json());
-app.set('json spaces', 2);
-app.use(cors())
-
-
-// test route to make sure everything is working 
-router.get('/', function(req, res) {
-	res.json({message: 'It Works! Welcome to the CardDB API!'});
-});
-
-// dynamically load our routes
-fs.readdirSync('./routes/').forEach(function(file) {
-	if(file.indexOf('.js') > 0){
-		var route="./routes/"+file;
-    	require(route)(router);
-	}
-});
-
-// all of our routes will be prefixed with /api
-app.use('/v1', router);
-
-// start the server
-app.listen(port);
-console.log('Magic happens on port ' + port);
+// load modules
+require('./workers/api');
+require('./workers/parser')

components/card/controller.js

@@ -0,0 +1,58 @@
+const mongoose = require('mongoose');
+const path = require('path');
+
+
+const Card = require('./model');
+
+
+module.exports = {
+  
+  // ctxt = {card}
+  add: async (ctxt) => {
+    try {
+      let card = new Card(ctxt);
+      card = await card.save();
+      return card
+    } catch (error) {
+      throw error;
+    }
+  },
+
+  // ctxt = {id}
+  get: async (ctxt) =>{
+    const {id} = ctxt
+    try {
+      const card = await Card.findOne({_id:id});
+      return card
+    } catch (error) {
+      throw error;
+    }
+  },
+
+  // ctxt = {skip, limit, query}
+  getAll: async (ctxt) => {
+    const {skip=0, limit=100} = ctxt;
+    try {
+      const cards = await Card
+      .find({})
+      .lean()
+      .skip(skip)
+      .limit(limit);
+      return cards
+    } catch (error) {
+      throw error;
+    }
+  },
+
+  // ctxt = {id}
+  delete: async (ctxt) => {
+    const {id} = ctxt
+    try {
+      const card = await Card.findOne({id});
+      await Card.deleteOne({id});
+      return card;
+    } catch (error) {
+      return error;
+    }
+  }
+};

components/card/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  controller: require('./controller')
+, model: require('./model')
+};

components/card/model.js

@@ -0,0 +1,54 @@
+const mongoose = require('mongoose');
+
+// schema maps to a collection
+const Schema = mongoose.Schema;
+
+const cardSchema = new Schema({
+  file: {
+    type:mongoose.Schema.Types.ObjectId,
+    ref:'File'
+  },
+  tag: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  cite: {
+    type: String,
+    trim: true,
+  },
+  text: {
+    type: String,
+    required: true,
+    minlength: 50
+  },
+  card: {
+    type: String,
+    required: true,
+  },
+  set: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  h1: {
+    type: String,
+    trim: true,
+  },
+  h2: {
+    type: String,
+    trim: true,
+  },
+  h3: {
+    type: String,
+    trim: true,
+  },
+  index: {
+    type: Number,
+  },
+  date: {
+    type: Date,
+  },
+});
+
+module.exports = mongoose.model('Card', cardSchema); // instance of schema

components/file/controller.js

@@ -0,0 +1,59 @@
+const events = require('events');
+const eventEmitter = new events.EventEmitter();
+
+
+
+
+const File = require('./model');
+
+
+module.exports = {
+
+  // ctxt = {file}
+  add: async (ctxt) => {
+    try {
+      let file = new File(ctxt);
+      file = await file.save()
+      return file;
+    } catch (error) {
+      return error;
+    }
+  },
+
+  // ctxt = {id}
+  get: async (ctxt) => {
+    const {id} = ctxt
+    try {
+      const file = await File.findOne({id});
+      return file;
+    } catch (error) {
+      throw error;
+    }
+  },
+
+  // ctxt = {skip, limit, query}
+  getAll: async (ctxt) => {
+    const {skip, limit}  = ctxt;
+    try {
+      const files = await File
+      .find({})
+      .skip(skip)
+      .limit(limit);
+      return files
+    } catch (error) {
+      throw error;
+    }
+  },
+
+  // ctxt = {id}
+  delete: async (ctxt) => {
+    const {id} = ctxt
+    try {
+      const file = await File.findOne({id});
+      await File.deleteOne({id});
+      return file;
+    } catch (error) {
+      return error;
+    }
+  }
+};

components/file/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  controller: require('./controller'), 
+  model: require('./model')
+};

components/file/model.js

@@ -0,0 +1,46 @@
+const mongoose = require('mongoose');
+// schema maps to a collection
+const Schema = mongoose.Schema;
+
+const fileSchema = new Schema({
+  name: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  file: {
+    type: String,
+  },
+  date: {
+    type: Date,
+  },
+  set: {
+    type: String,
+    required: true,
+    trim: true,
+  },
+  status: {
+    type: String,
+    enum: ['complete', 'incomplete', 'parsing'],
+    default: 'incomplete',
+    required: true,
+  },
+  author: {
+    type: String,
+  },
+
+  side: {
+    type: String,
+    enum: ['AFF', 'NEG'],
+  },
+  wikidata: {
+    school: {
+      type: String
+    },
+    code: {
+      type: String
+    }
+  }
+});
+
+module.exports = mongoose.model('File', fileSchema); // instance of schema