holiday model refactored

index.js

+var dateArray = require('dateArray');
+var dateView = require('dateView');
+
+function getOHIndex(incl, excl, date, plz, cb) {
+  var epochSpan = [new Date(date.getFullYear(), date.getMonth(), date.getDay() - 7),
+    new Date(date.getFullYear(), date.getMonth(), date.getDay() + 2)];
+  dateArray(epochSpan).getData([incl, excl], plz, function(err, result) {
+    if(err) return cb(err);
+    var fResult = result.filter(function(elem) {
+      return elem[0].getTime >= date.getTime();
+    });
+
+    cb(null, fResult);
+  })
+}
+
+module.exports.getOHIndex = getOHIndex;
\ No newline at end of file

lib/dateArray.js

@@ -21,11 +21,18 @@ function wrapper(_epochSpan) {
   }
 
   function calculateOpeningHours(json, plz, cb) {
-    var includeString = "810a6deb-46f2-4fa8-b779-bb5c2a6b5577";
-    var excludeString = "bb74c170-b06f-4d2b-ab88-2f6bf9ce8068";
-
-    var jsonIncl = json[includeString];
-    var jsonExcl = json[excludeString];
+    var jsonIncl;
+    var jsonExcl;
+    if(Array.isArray(json)) {
+      jsonIncl = json[0];
+      jsonExcl = json[1];
+    }
+    else {
+      var includeString = "810a6deb-46f2-4fa8-b779-bb5c2a6b5577";
+      var excludeString = "bb74c170-b06f-4d2b-ab88-2f6bf9ce8068";
+      jsonIncl = json[includeString];
+      jsonExcl = json[excludeString];
+    }
 
     if (!jsonIncl) {
       return cb(new Error('no openinghours model found'));

lib/main.js

-var dateArray = require('dateArray');
-var dateView = require('dateView');
-

package.json

 {
   "name": "OpeningHours",
   "version": "0.0.0",
-  "main": "lib/main.js",
+  "main": "index.js",
   "dependencies": {
     "moment": "^2.7.0"
   },

serverTest/dataBaseQuery.js

 var mysql = require('mysql');
 var dateArray = require('../lib/dateArray');
 var dateView = require('../lib/dateView');
-var plz = 86150;
+var plz = 93047;
 
 var connection = mysql.createConnection({
   host: 'localhost',