update date format tests

package.json

@@ -1,6 +1,6 @@
 {
   "name": "transxchange2gtfs",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Converts transxchange data to GTFS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,14 +36,14 @@
     "@types/csv-parse": "^1.1.11",
     "@types/glob": "^7.1.1",
     "@types/mocha": "^5.2.5",
-    "@types/node": "^10.11.6",
+    "@types/node": "^10.12.0",
     "@types/rimraf": "^2.0.2",
     "@types/xml2js": "^0.4.3",
     "chai": "^4.2.0",
     "mocha": "^5.2.0",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
-    "typescript": "^3.1.1"
+    "typescript": "^3.1.3"
   },
   "dependencies": {
     "autobind-decorator": "^2.1.0",

src/gtfs/CalendarDatesStream.ts

@@ -6,8 +6,8 @@ import {LocalDate, DateTimeFormatter} from "js-joda";
  * Extract the calendars dates from the TransXChange journeys
  */
 export class CalendarDatesStream extends GTFSFileStream<TransXChangeJourney> {
-  private datesSeen: Record<string, boolean> = {};
-  private dateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+  private readonly datesSeen: Record<string, boolean> = {};
+  private readonly dateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
 
   protected header = "service_id,date,exception_type";
 

src/gtfs/CalendarStream.ts

@@ -6,15 +6,18 @@ import {DateTimeFormatter} from "js-joda";
  * Extract the calendars from the TransXChange journeys
  */
 export class CalendarStream extends GTFSFileStream<TransXChangeJourney> {
-  private datesSeen: Record<string, boolean> = {};
-  private dateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+  private readonly datesSeen: Record<string, boolean> = {};
+  private readonly dateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
 
   protected header = "service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date";
 
   protected transform(journey: TransXChangeJourney): void {
     if (!this.datesSeen[journey.calendar.id]) {
+      const from = journey.calendar.startDate.format(this.dateFormatter);
+      const to = journey.calendar.endDate.format(this.dateFormatter);
+
+      this.pushLine(`${journey.calendar.id},${journey.calendar.days},${from},${to}`);
       this.datesSeen[journey.calendar.id] = true;
-      this.pushLine(`${journey.calendar.id},${journey.calendar.days},${journey.calendar.startDate.format(this.dateFormatter)},${journey.calendar.endDate.format(this.dateFormatter)}`);
     }
   }
 

test/gtfs/CalendarDatesStream.spec.ts

@@ -29,10 +29,10 @@ describe("CalendarDatesStream", () => {
       const include = splitCSV(rows[2]);
 
       chai.expect(exclude[0]).to.equal("1");
-      chai.expect(exclude[1]).to.equal("2018-12-25");
+      chai.expect(exclude[1]).to.equal("20181225");
       chai.expect(exclude[2]).to.equal("2");
       chai.expect(include[0]).to.equal("1");
-      chai.expect(include[1]).to.equal("2018-06-01");
+      chai.expect(include[1]).to.equal("20180601");
       chai.expect(include[2]).to.equal("1");
     });
   });

test/gtfs/CalendarStream.spec.ts

@@ -34,8 +34,8 @@ describe("CalendarStream", () => {
       chai.expect(friday).to.equal("1");
       chai.expect(saturday).to.equal("1");
       chai.expect(sunday).to.equal("1");
-      chai.expect(start_date).to.equal("2018-06-24");
-      chai.expect(end_date).to.equal("2099-12-31");
+      chai.expect(start_date).to.equal("20180624");
+      chai.expect(end_date).to.equal("20991231");
     });
   });