PolyUser est mis en cache correctement

Geoffrey PREUD'HOMME
1 parent c1e8332d
Showing 3 changed files with 21 additions and 58 deletions Show diff stats
app/models/PolyUserModl.js
app/services/PolyUserServ.js
package.json
@@ -1,16 +0,0 @@
-var mongoose = require('mongoose');
-
-module.exports = mongoose.model('PolyUser', {
-    login: {
-        type: String,
-        default: 'login'
-    },
-    nom: {
-        type: String,
-        default: 'Nom'
-    },
-    section: {
-        type: String,
-        default: ''
-    }
-});
-var PolyUserModl = require('../models/PolyUserModl');
 var LineTransform = require('node-line-reader').LineTransform;
 var fs = require('fs');
 var Client = require('ssh2').Client;
 var creds = require('../../config/sshAuth');
+var NodeCache = require("node-cache");
+
+var cache = new NodeCache();
  
 var PolyUserServ = {};
  
+function isEmpty(obj) {
+    for (var i in obj) {
+        return false;
+    }
+    return true;
+}
+
 PolyUserServ.readPasswd = function (login, cb) {
     passwdF = 'config/passwd';
     fs.exists(passwdF, function (exists) {
@@ -82,11 +91,6 @@ PolyUserServ.grabInfos = function (login, cb) {
                         nom: passwd.GECOS,
                         section: group.name.toUpperCase()
                     });
-                    PolyUserModl.create({
-                        login: login,
-                        nom: passwd.GECOS,
-                        section: group.name.toUpperCase()
-                    });
                 } else {
                     if (group === undefined) {
                         console.error("Impossible d'ouvrir le fichier des groupes.");
@@ -116,49 +120,23 @@ PolyUserServ.grabInfos = function (login, cb) {
     });
 };
  
-PolyUserServ.addData = function (polyuser, cb) {
-    cb(null, polyuser);
-};
-
-PolyUserServ.obtain = function (login, cb) {
-    PolyUserModl.findOne({
-        login: login
-    }, {
-        nom: 1,
-        section: 1,
-        _id: 0
-    }, function (err, polyuser) {
-        if (err) {
-            cb(err);
-        } else {
-            PolyUserServ.addData(polyuser, cb);
-        }
-    });
-};
-
 PolyUserServ.add = function (login, cb) {
     PolyUserServ.grabInfos(login, function (data) {
-        data.login = login;
-        PolyUserModl.create(data, function (err, polyuser) {
-            PolyUserServ.obtain(login, cb);
-        });
+        cb(null, data);
+        cache.set(login, data);
     });
 };
  
-// PolyUserServ.remove = function (login, cb) {
-//     PolyUserModl.remove({
-//         login: login
-//     }, cb);
-// };
-
 PolyUserServ.get = function (login, cb) {
-    PolyUserModl.findOne({
-        login: login
-    }, function (err, polyuser) {
-        if (polyuser && !err && polyuser.polyuser && polyuser.section) {
-            PolyUserServ.obtain(login, cb);
+    cache.get(login, function (err, data) {
+        if (err) {
+            cb(err);
         } else {
-            PolyUserServ.add(login, cb);
+            if (isEmpty(data)) {
+                PolyUserServ.add(login, cb);
+            } else {
+                cb(null, data[login]);
+            }
         }
     });
 };
@@ -9,6 +9,7 @@
     "express": "^4.12.3",
     "express-http-proxy": "^0.5.0",
     "mongoose": "^4.0.1",
+    "node-cache": "^1.1.0",
     "node-line-reader": "0.0.2",
     "ssh2": "^0.4.6",
     "ursa": "^0.8.4"