after cb refactor

lib/holidays.js

@@ -60,46 +60,55 @@ function Holidays(year) {
   var holidays = getFixedHolidays(fixedHolidays);
   holidays = getVariableHolidaysMap(variableOffsets, holidays);
 
-  function plzToBlnd(plz) {
+  function plzToBlnd(plz, cb) {
 
   }
 
-  function isAugsburg(plz) {
+  function isAugsburg(plz, cb) {
 
   }
 
-  function getHolidayKeys(plz, kath, cb) {
+  function isKath(plz, cb) {
 
-    //remove
+  }
+
+  function getHolidayKeys(plz, cb) {
+
+    //TODO: remove
     var keys = Object.keys(holidays);
-    return keys;
+    return cb(null, keys);
     //\remove
 
     var blnd = plzToBlnd(plz);
     var isAugsburg = isAugsburg(plz);
+    var isKath = isKath(plz);
     var keys = holidayMapping['sureHolidays'];
-    assert(isAugsburg && blnd == 'BY');
+    assert(isAugsburg == (blnd == 'BY'));
     var blndMap = holidayMapping['region'][blnd];
     if (blndMap) {
       keys.concat(blndMap['default']);
-      if (kath && blndMap['kath'])
+      if (blndMap['kath'] && isKath)
         keys.concat(blndMap['kath']);
-      if (isAugsburg && blndMap['augsburg'])
+      if (blndMap['augsburg'] && isAugsburg)
         keys.concat(blndMap['augsburg']);
     }
     cb(null, keys);
   }
 
-  this.getAllHolidays = function (plz, kath) {
-    var keys = getHolidayKeys(plz, kath);
-    var result = [];
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      var elem = holidays[key];
-      if(elem)
-        result.push(elem);
-    }
-    return result;
+  this.getAllHolidays = function (plz, cb) {
+    getHolidayKeys(plz, function (err, keys) {
+
+      if(err)
+        return cb(err);
+      var result = [];
+      for (var i = 0; i < keys.length; i++) {
+        var key = keys[i];
+        var elem = holidays[key];
+        if (elem)
+          result.push(elem);
+      }
+      cb(err, result);
+    });
   };
 
   this.getHoliday = function (id) {

lib/restRequests.js

 var http = require('http');
 
+var hostname= "127.0.0.1";
+var port= 3001;
+var headers = {
+  "Content-Type": "application/json"
+};
 var path = '/api/postleitzahlen/findone/?filter[where][plz]=93047';
 
-var headers = {};
-headers["Content-Type"] = "application/json";
+function request(path, cb) {
+  var options = {
+    hostname: hostname,
+    port: port,
+    path: path,
+    method: 'GET',
+    headers: headers
+  };
+
+  var callback = function (response) {
+    console.log('bla');
+    var str = '';
+    response.on('data', function (chunk) {
+      str += chunk;
+    });
+    response.on('end', function () {
+      cb(null, str);
+    });
+  };
+
+  var req = http.request(options, callback);
+  req.on("error", function (err) {
+    cb(err);
+  });
 
-var options = {
-  hostname: "127.0.0.1",
-  port: 3000,
-  path: path,
-  method: 'GET',
-  headers: headers
-};
+  req.end();
+}
 
-var callback = function (response) {
-  console.log('bla');
-  var str = '';
-  response.on('data', function (chunk) {
-    str += chunk;
-  });
-  response.on('end', function () {
-    console.log(str);
-  });
-};
 
-var req = http.request(options, callback);
-req.on("error", function (error) {
-  console.error(error);
-});
 
-req.end();
 
+function getBundesland(plz, cb) {
+
+}
+
+function getKatholisch(plz, cb) {
+
+}
 

mochaTests/dataArrayTest.js

@@ -3,13 +3,14 @@ var dateArray = require('../lib/dateArray');
 
 describe("dateArray" ,function() {
   describe("calculateOpeningHours", function() {
-    it("should equal", function() {
+    it("should equal", function(done) {
       var data = require('./testData/testHof.json');
       var epocheSpan = [new Date(2014,0,1), new Date(2015,0,1)];
-      dateArray.setEpocheSpan(epocheSpan);
-      var oHours =dateArray.getData(data);
-      var result = JSON.stringify(oHours);
-      expect(result).to.equal(require('./testData/testHofResult.json')['data']);
+      dateArray(epocheSpan).getData(data, 93047, function(err, oHours) {
+        var result = JSON.stringify(oHours);
+        expect(result).to.equal(require('./testData/testHofResult.json')['data']);
+        done();
+      });
     })
   })
 });
\ No newline at end of file

mochaTests/dateViewTest.js

@@ -5,19 +5,20 @@ var dateView = require('../lib/dateView');
 
 describe("dateView" ,function() {
   describe("calculateOpeningHours", function() {
-    it("should equal", function() {
+    it("should equal", function(done) {
       var data = require('./testData/testHof.json');
       var now = new Date(2014, 4, 1);
       var epocheSpan = dateView.getPropperEpochSpan(now);
 
-      dateArray.setEpocheSpan(epocheSpan);
-      var oHours =dateArray.getData(data);
-      var view = dateView.getView(oHours, now);
-      console.log(view);
-      var viewRef = fs.readFileSync(__dirname + '/testData/testHofView.html', {
-        encoding: "utf8"
+      dateArray(epocheSpan).getData(data, 93047, function(err, oHours) {
+        var view = dateView.getView(oHours, now);
+        console.log(view);
+        var viewRef = fs.readFileSync(__dirname + '/testData/testHofView.html', {
+          encoding: "utf8"
+        });
+        expect(view).to.equal(viewRef);
+        done();
       });
-      expect(view).to.equal(viewRef);
     })
   })
 });
\ No newline at end of file

serverTest/dataBaseQuery.js

 var mysql = require('mysql');
 var dateArray = require('../lib/dateArray');
 var dateView = require('../lib/dateView');
+var plz = 93047;
 
 var connection = mysql.createConnection({
   host: 'localhost',
@@ -11,32 +12,37 @@ var connection = mysql.createConnection({
 
 connection.connect();
 
-module.exports.getData = function(now, cb) {
+module.exports.getData = function (now, cb) {
   var epocheSpan = dateView.getPropperEpochSpan(now);
 //  console.log(now);
 //  console.log(epocheSpan);
-  dateArray.setEpocheSpan(epocheSpan);
+//  dateArray.setEpocheSpan(epocheSpan);
 
-  connection.query('SELECT name, elements FROM cms_zoo_item WHERE type = "company"', function(err, rows) {
+  connection.query('SELECT name, elements FROM cms_zoo_item WHERE type = "company"', function (err, rows) {
     var result = [];
     var cnt = 0;
+    var iters = rows.length;
     for (var i = 0; i < rows.length; i++) {
       var obj = JSON.parse(rows[i].elements);
-      var name = rows[i].name;
-      try {
-        var data = dateArray.getData(obj);
-        if (data.length > 0) {
-          cnt++;
-          var view = dateView.getView(data, now);
-          result.push('<div class="name">'+name+"</div> "+view);
-        }
-      }
-      catch (err) {
-      }
+      (function() {
+        var name = rows[i].name;
+        dateArray(epocheSpan).getData(obj, plz, function (err, data) {
+          if(err) {
+            console.log(name, err);
+          }
+
+          else if (data.length > 0) {
+            cnt++;
+            var view = dateView.getView(data, now);
+            result.push('<div class="name">' + name + "</div> " + view);
+          }
+          if (--iters == 0) {
+            console.log("Count: %d", cnt);
+            cb(result.join('<br>'));
+          }
+        });
+      })();
     }
-    console.log("Count: %d", cnt);
-
-    cb(result.join('<br>'));
   });
 };