fix(FeedVersion, gtfsplus.yml): Add call to MTCValidator, change gtfsplus.yml to match MTC guideline

binh-dam-ibigroup · binh-dam-ibigroup · commit 3ba001c95669 · 2020-04-10T15:21:25.000-04:00
diff --git a/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java b/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java
@@ -10,6 +10,7 @@
 import com.conveyal.gtfs.GTFS;
 import com.conveyal.gtfs.loader.Feed;
 import com.conveyal.gtfs.loader.FeedLoadResult;
+import com.conveyal.gtfs.validator.MTCValidator;
 import com.conveyal.gtfs.validator.ValidationResult;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -226,7 +227,7 @@ public void load(MonitorableJob.Status status, boolean isNewVersion) {
         File gtfsFile;
         // STEP 1. LOAD GTFS feed into relational database
         try {
-            status.update(false,"Unpacking feed...", 15.0);
+            status.update("Unpacking feed...", 15.0);
             // Get SQL schema namespace for the feed version. This is needed for reconnecting with feeds
             // in the database.
             gtfsFile = retrieveGtfsFile();
@@ -241,19 +242,15 @@ public void load(MonitorableJob.Status status, boolean isNewVersion) {
             this.namespace = feedLoadResult.uniqueIdentifier;
             LOG.info("Loaded GTFS into SQL {}", feedLoadResult.uniqueIdentifier);
         } catch (Exception e) {
-            String errorString = String.format("Error loading GTFS feed for version: %s", this.id);
-            LOG.warn(errorString, e);
-            status.update(true, errorString, 0);
+            status.fail(String.format("Error loading GTFS feed for version: %s", this.id), e);
             // FIXME: Delete local copy of feed version after failed load?
             return;
         }
 
         // FIXME: is this the right approach?
         // if load was unsuccessful, update status and return
         if(this.feedLoadResult == null) {
-            String errorString = String.format("Could not load GTFS for FeedVersion %s", id);
-            LOG.error(errorString);
-            status.update(true, errorString, 0);
+            status.fail(String.format("Could not load GTFS for FeedVersion %s", id));
             // FIXME: Delete local copy of feed version after failed load?
             return;
         }
@@ -313,11 +310,9 @@ public void validate(MonitorableJob.Status status) {
             // run validation on feed version
             // FIXME: pass status to validate? Or somehow listen to events?
             status.update("Validating feed...", 33);
-            validationResult = GTFS.validate(feedLoadResult.uniqueIdentifier, DataManager.GTFS_DATA_SOURCE);
+            validationResult = GTFS.validate(feedLoadResult.uniqueIdentifier, DataManager.GTFS_DATA_SOURCE, MTCValidator::new);
         } catch (Exception e) {
-            String message = String.format("Unable to validate feed %s", this.id);
-            LOG.error(message, e);
-            status.update(true, message, 100, true);
+            status.fail(String.format("Unable to validate feed %s", this.id), e);
             // FIXME create validation result with new constructor?
             validationResult = new ValidationResult();
             validationResult.fatalException = "failure!";
diff --git a/src/main/resources/gtfs/gtfsplus.yml b/src/main/resources/gtfs/gtfsplus.yml
@@ -310,7 +310,7 @@
   - name: price
     required: true
     inputType: TEXT
-    maxLength: 8
+    maxLength: 6 # MTC: (5,2) number format from 0.00 to 999.99.
     columnWidth: 3
 
 - id: calendar_attributes
@@ -338,5 +338,5 @@
   - name: zone_name
     required: true
     inputType: TEXT
-    maxLength: 35
+    maxLength: 250
     helpContent: Public name of the fare zone, as it should appear on 511.org such as EastBay, WestBay, etc
