after cb refactor

lib/dateArray.js

@@ -3,29 +3,24 @@ var Holidays = require('./holidays');
 var now = new Date();
 var holidaysGetter = {};
 
-var epochSpan = testEpochSpan();
-var startYear;
-var endYear;
 
-function setEpocheSpan(_epocheSpan) {
-  epochSpan = _epocheSpan;
+function wrapper(_epochSpan) {
+  var epochSpan;
+  var startYear;
+  var endYear;
+  setEpocheSpan(_epochSpan);
+
+  function setEpocheSpan(newEpochSpan) {
+    epochSpan = newEpochSpan;
     startYear = epochSpan[0].getFullYear();
     endYear = epochSpan[1].getFullYear();
     for(var year = startYear; year <= endYear; year++) {
       if(!holidaysGetter[year])
         holidaysGetter[year] = new Holidays(year);
     }
-}
-
-function testEpochSpan() {
-  var _epochStart = new Date();
-  _epochStart = new Date(_epochStart.getFullYear(), _epochStart.getMonth(), _epochStart.getDate());
-  _epochStart.setDate(_epochStart.getDate() - 30);
-  var _epochEnd = new Date(_epochStart.getTime() + 130 * 24 * 3600000);
-  return [_epochStart, _epochEnd];
-}
+  }
 
-function calculateOpeningHours(json) {
+  function calculateOpeningHours(json, plz, cb) {
     var includeString = "810a6deb-46f2-4fa8-b779-bb5c2a6b5577";
     var excludeString = "bb74c170-b06f-4d2b-ab88-2f6bf9ce8068";
 
@@ -33,7 +28,7 @@ function calculateOpeningHours(json) {
     var jsonExcl = json[excludeString];
 
     if (!jsonIncl) {
-    throw new Error('no openinghours model found');
+      return cb(new Error('no openinghours model found'));
     }
 
     var resultIncl = [];
@@ -41,6 +36,7 @@ function calculateOpeningHours(json) {
     var holidayIncl = [];
 
     var data, option, key;
+    try {
       for (key in jsonIncl) {
         data = jsonIncl[key];
         option = getOption(data);
@@ -61,8 +57,14 @@ function calculateOpeningHours(json) {
         }
         resultExcl = tmUtils.orOp(resultExcl);
       }
+    }
+    catch (err) {
+      return cb(err);
+    }
 
-  var allHolidays = getAllHolidays();
+    getAllHolidays(plz, function (err, allHolidays) {
+      if (err)
+        return cb(err);
 
       allHolidays = tmUtils.andOp(allHolidays, [epochSpan]);
       holidayIncl = tmUtils.andOp(holidayIncl, [epochSpan]);
@@ -75,10 +77,13 @@ function calculateOpeningHours(json) {
       if (jsonExcl)
         result = tmUtils.andNotOp(resultIncl, resultExcl);
 
-  return  result;
-}
+      cb(null, result);
+    });
+
+
+  }
 
-function getDaySpan(data) {
+  function getDaySpan(data) {
     var dayoption = parseInt(data["dayoption"]["0"]);
     if (dayoption < 7) return [dayoption, dayoption];
     switch (dayoption) {
@@ -93,18 +98,18 @@ function getDaySpan(data) {
       default:
         throw new Error("Invalid day option: " + dayoption);
     }
-}
+  }
 
-function parseTime(time) {
+  function parseTime(time) {
     var split = time.split(":");
     return {
       h: parseInt(split[0]) || 0,
       m: parseInt(split[1]) || 0
     }
-}
+  }
 
 
-function parseDate(date, year, addOneDay) {
+  function parseDate(date, year, addOneDay) {
     if (date.length == 0)
       return null;
 
@@ -112,16 +117,16 @@ function parseDate(date, year, addOneDay) {
     var split = date.split(".");
     var month = parseInt(split[1]) - 1;
     var day = parseInt(split[0]) + (addOneDay ? 1 : 0);
-  if(split.length === 3) {
+    if (split.length === 3) {
       _year = parseInt(split[2]);
     }
-  if(!_year)
+    if (!_year)
       _year = year;
 
     return new Date(_year, month, day);
-}
+  }
 
-function getHolidays(data) {
+  function getHolidays(data) {
     var option = data["option"]["0"];
     if (option != "holiday") {
       throw new Error('not holiday: ' + option);
@@ -131,7 +136,7 @@ function getHolidays(data) {
     var holidayId = data["holidayoption"][0];
 
     var days = [];
-  for(var year = startYear; year <= endYear; year++) {
+    for (var year = startYear; year <= endYear; year++) {
       days = days.concat(holidaysGetter[year].getHoliday(holidayId));
     }
 
@@ -140,42 +145,53 @@ function getHolidays(data) {
     });
     tmUtils.sort(intervals);
     return intervals;
-}
+  }
 
-function getAllHolidays() {
+  function getAllHolidays(plz, cb) {
     var days = [];
-  for(var year = startYear; year <= endYear; year++) {
-    days = days.concat(holidaysGetter[year].getAllHolidays());
-  }
+    var cnt = endYear - startYear + 1;
+
+    function _cb(err, result) {
+      if (err) return cb(err);
+
+      days = days.concat(result);
+      cnt--;
+      if (cnt === 0) {
         var intervals = days.map(function (date) {
           return tmUtils.singleDay(date);
         });
         tmUtils.sort(intervals);
-  return intervals;
-}
+        cb(null, intervals);
+      }
+    }
+
+    for (var year = startYear; year <= endYear; year++) {
+      holidaysGetter[year].getAllHolidays(plz, _cb);
+    }
+  }
 
-function getDateSpan(data) {
+  function getDateSpan(data) {
     var startDate = parseDate(data["opening_day_from"], now.getFullYear());
     var endDate = parseDate(data["opening_day_to"], now.getFullYear(), true);
 
-  if(!startDate)
+    if (!startDate)
       startDate = epochSpan[0];
-  if(!endDate)
+    if (!endDate)
       endDate = epochSpan[1];
 
     //TODO: jahreswechsel beruecksichtigen
     return [startDate, endDate];
-}
+  }
 
-function getTimeSpan(data) {
+  function getTimeSpan(data) {
     return [parseTime(data["opening_from"]), parseTime(data["opening_to"])];
-}
+  }
 
-function getOption(data) {
+  function getOption(data) {
     return data["option"][0];
-}
+  }
 
-function getOpeningHours(data, option) {
+  function getOpeningHours(data, option) {
     option = option || getOption(data);
 
     switch (option) {
@@ -193,27 +209,27 @@ function getOpeningHours(data, option) {
         throw new Error("option not supported: " + option);
         return [];
     }
-}
+  }
 
-function getOpeningHoursDefault(data) {
+  function getOpeningHoursDefault(data) {
     var daySpan = getDaySpan(data);
     var timeSpan = getTimeSpan(data);
     return tmUtils.standardFromTillDay(daySpan, timeSpan, epochSpan, epochSpan, 7);
-}
+  }
 
-function getOpeningHoursSeason(data) {
+  function getOpeningHoursSeason(data) {
     var daySpan = getDaySpan(data);
     var timeSpan = getTimeSpan(data);
     var dateSpan = getDateSpan(data);
     return tmUtils.standardFromTillDay(daySpan, timeSpan, dateSpan, epochSpan, 7);
-}
+  }
 
-function getOpeningHoursVacation(data) {
+  function getOpeningHoursVacation(data) {
     var dateSpan = getDateSpan(data);
     return tmUtils.dateSpan(dateSpan);
-}
+  }
 
-function getOpeningHoursRepeatable(data) {
+  function getOpeningHoursRepeatable(data) {
     var daySpan = getDaySpan(data);
     var timeSpan = getTimeSpan(data);
     var dateSpan = getDateSpan(data);
@@ -234,9 +250,13 @@ function getOpeningHoursRepeatable(data) {
           throw new Error("invalid repeatoption");
       }
     }
+  }
+  return {
+    getData: calculateOpeningHours,
+    setEpocheSpan: setEpocheSpan
+  };
 }
+module.exports = wrapper;
 
-module.exports.getData = calculateOpeningHours;
-module.exports.setEpocheSpan = setEpocheSpan;
 
 

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);
+  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)
+        if (elem)
           result.push(elem);
       }
-    return result;
+      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";
-
-var options = {
-  hostname: "127.0.0.1",
-  port: 3000,
+function request(path, cb) {
+  var options = {
+    hostname: hostname,
+    port: port,
     path: path,
     method: 'GET',
     headers: headers
-};
+  };
 
-var callback = function (response) {
+  var callback = function (response) {
     console.log('bla');
     var str = '';
     response.on('data', function (chunk) {
       str += chunk;
     });
     response.on('end', function () {
-    console.log(str);
+      cb(null, str);
     });
-};
+  };
+
+  var req = http.request(options, callback);
+  req.on("error", function (err) {
+    cb(err);
+  });
+
+  req.end();
+}
+
+
+
+
+function getBundesland(plz, cb) {
 
-var req = http.request(options, callback);
-req.on("error", function (error) {
-  console.error(error);
-});
+}
 
-req.end();
+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);
+      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);
+      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();
+      });
     })
   })
 });
\ 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);
+      (function() {
         var name = rows[i].name;
-      try {
-        var data = dateArray.getData(obj);
-        if (data.length > 0) {
+        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);
-        }
-      }
-      catch (err) {
-      }
+            result.push('<div class="name">' + name + "</div> " + view);
           }
+          if (--iters == 0) {
             console.log("Count: %d", cnt);
-
             cb(result.join('<br>'));
+          }
+        });
+      })();
+    }
   });
 };