diff --git a/models/mongodb/connector.js b/models/mongodb/connector.js index 620110c1..0e620650 100644 --- a/models/mongodb/connector.js +++ b/models/mongodb/connector.js @@ -47,15 +47,20 @@ module.exports = exports = function(config) { db.once('open', function() { console.log("we're connected!"); }); - - fs.readdirSync(__dirname + '/model') - .filter((file) => (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js')) - .forEach((file) => { - const moduleName = file.split('.')[0]; - console.log('moduleName :: ', moduleName); - console.log('path : ', __dirname + '/model') - collection[moduleName] = require(__dirname + '/model/' + moduleName)(mongoose); - }); + getCollections('/model', collection); + getCollections('/staticModel', collection); return collection; -}; \ No newline at end of file +}; + +function getCollections (dirname, collectionObj) { + let jsFilesInDir = fs.readdirSync(__dirname + dirname) + .filter((file) => (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js')) + for (let file of jsFilesInDir) { + const moduleName = file.split('.')[0]; + console.log('moduleName :: ', moduleName); + console.log('path : ', __dirname + dirname) + collectionObj[moduleName] = require(__dirname + dirname +'/' + moduleName)(mongoose); + } + +} \ No newline at end of file diff --git a/models/mongodb/model/FHIRStoredID.js b/models/mongodb/staticModel/FHIRStoredID.js similarity index 100% rename from models/mongodb/model/FHIRStoredID.js rename to models/mongodb/staticModel/FHIRStoredID.js diff --git a/models/mongodb/model/issuedToken.js b/models/mongodb/staticModel/issuedToken.js similarity index 100% rename from models/mongodb/model/issuedToken.js rename to models/mongodb/staticModel/issuedToken.js