Flag agencies for review. #15.

app/models/BikeRentalSystem.java

@@ -26,6 +26,12 @@ public class BikeRentalSystem extends Model {
 	 */
 	public String name;
 
+    /**
+     * Machine readable problem type requiring human review - picked up in the admin interface.
+     */
+    @Enumerated(EnumType.STRING)
+    public ReviewType review;
+
 	/**
 	 * The type of this bike rental system.
 	 * One of KeolisRennes, Static, CityBik.es or Bixi

app/models/GtfsFeed.java

@@ -1,7 +1,9 @@
 package models;
 
 import javax.persistence.*;
+
 import java.util.*;
+import java.math.BigInteger;
 
 import play.Logger;
 import play.db.jpa.*;
@@ -40,6 +42,12 @@ public class GtfsFeed extends Model implements Cloneable {
     /** Is this feed disabled? */
     public boolean disabled;
 
+    /**
+     * Machine readable problem type requiring human review - picked up in the admin interface.
+     */
+    @Enumerated(EnumType.STRING)
+    public ReviewType review;
+
     /** 
      * The URL where this feed may be found. This may be the feed itself, or may be a
      * developer site (e.g. http://developer.metro.net).
@@ -209,4 +217,34 @@ public GtfsFeed clone () {
     	return ret;
 
     }
+
+    /**
+     * Attempt to automatically find and link this feed to agencies.
+     * @return true if matching was successful, false otherwise
+     */
+    public boolean findAgency() {
+        Query q = JPA.em().createNativeQuery("SELECT a.id FROM NtdAgency a WHERE regexp_replace(LOWER(?), " + 
+                                       // that regular expression strips the protocol, 
+                                       // strips pathinfo,
+                                       // and strips www. to get a hopefully LCD domain name
+                                       "'(?:\\W*)(?:https?://)?(?:www\\.)?([a-zA-Z0-9\\-_\\.]*)(?:/.*)?(?:\\W*)'," +
+                                       "'\\1') = " + 
+                                       "regexp_replace(LOWER(a.url)," + 
+                                       "'(?:\\W*)(?:https?://)?(?:www\\.)?([a-zA-Z0-9\\-_\\.]*)(?:/.*)?(?:\\W*)'," +
+                                       "'\\1');");
+        q.setParameter(1, this.agencyUrl);
+        List<Object> results = q.getResultList();
+
+        if (results.size() == 0)
+            return false;
+        else {
+            NtdAgency agency;
+            for (Object result : results) {
+                agency = NtdAgency.findById(((BigInteger) result).longValue());
+                agency.feeds.add(this);
+                agency.save();
+            }
+            return true;
+        }
+    }
 }

app/models/MetroArea.java

@@ -56,6 +56,12 @@ public class MetroArea extends Model {
      */
     public String note;
 
+    /**
+     * Machine readable problem type requiring human review - picked up in the admin interface.
+     */
+    @Enumerated(EnumType.STRING)
+    public ReviewType review;
+
     /**
      * The source of this metro area
      */

app/models/NtdAgency.java

@@ -44,6 +44,12 @@ public class NtdAgency extends Model {
     /** Where the data for this agency came from */
     @Enumerated(EnumType.STRING)
     public AgencySource source;
+
+    /**
+     * Machine readable problem type requiring human review - picked up in the admin interface.
+     */
+    @Enumerated(EnumType.STRING)
+    public ReviewType review;
 
     /** Does this agency provide GTFS to Google? */
     public boolean googleGtfs;

app/models/ReviewType.java

@@ -0,0 +1,20 @@
+package models;
+/**
+ * A ReviewType handles the options for when the action is ambiguous and must be reviewed by a human.
+ * @author matthewc
+ *
+ */
+public enum ReviewType {
+    NO_AGENCY ("Feed matches no agency"),
+    AGENCY_MULTIPLE_AREAS ("Agency matches multiple metro areas");
+
+    private String description;
+
+    private ReviewType (String options) {
+        this.description = options;
+    }
+
+    public String toString () {
+        return description;
+    }
+}

app/updaters/GtfsDataExchangeUpdater.java

@@ -20,6 +20,7 @@
 import models.GtfsFeed;
 import models.MetroArea;
 import models.NtdAgency;
+import models.ReviewType;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -97,12 +98,16 @@ public Set<MetroArea> update () {
 		        }
 
 		        GtfsFeed newFeed;
+		        boolean isNew;
 		        // copy over all the data.
-		        if (originalFeed != null)
+		        if (originalFeed != null) {
+		            isNew = false;
 		            newFeed = originalFeed.clone();
+		        }
 		        else {
 		            newFeed = new GtfsFeed();
 		            newFeed.note = "new feed";
+		            isNew = true;
 		        }
 
 		        // update all fields
@@ -137,6 +142,14 @@ public Set<MetroArea> update () {
 		        stats.apply(newFeed);
 		        newFeed.status = FeedParseStatus.SUCCESSFUL;
 		        newFeed.save();
+
+		        // if it's a new feed, find an agency.
+                if (isNew) {
+                    if (!newFeed.findAgency())
+                        newFeed.review = ReviewType.NO_AGENCY;
+
+                    newFeed.save();
+                }
 
 		        if (originalFeed != null) {
 		            originalFeed.supersededBy = newFeed;

app/utils/DbUtils.java

@@ -13,6 +13,7 @@
 import models.MetroArea;
 import models.MetroAreaSource;
 import models.NtdAgency;
+import models.ReviewType;
 import play.db.jpa.JPA;
 
 public class DbUtils {
@@ -98,6 +99,7 @@ else if (metros.size() > 1) {
                 else {
                     feed.disabled = true;
                     agency.note = "Too many metro areas";
+                    agency.review = ReviewType.AGENCY_MULTIPLE_AREAS;
                     feed.save();
                     agency.save();
                 }