Merge pull request #1162 from transitland/feed-add-name

Feed: add name
transitland · Aug 11, 2017 · a856068 · a856068
2 parents b78066c + e6b2f4a
commit a856068
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 3 deletions.
diff --git a/app/controllers/api/v1/feeds_controller.rb b/app/controllers/api/v1/feeds_controller.rb
@@ -35,6 +35,7 @@ def download_latest_feed_version
 
   def index_query
     super
+    @collection = AllowFiltering.by_attribute_array(@collection, params, :name)
     @collection = AllowFiltering.by_attribute_array(@collection, params, :url, case_sensitive: true)
     @collection = AllowFiltering.by_attribute_since(@collection, params, :last_imported_since, :last_imported_at)
     if params[:latest_fetch_exception].present?
@@ -69,6 +70,11 @@ def index_includes
 
   def query_params
     super.merge({
+      name: {
+        desc: "Feed name",
+        type: "string",
+        array: true
+      },
       last_imported_since: {
         desc: "Last imported since",
         type: "datetime"

diff --git a/app/models/feed.rb b/app/models/feed.rb
@@ -22,6 +22,7 @@
 #  license_attribution_text           :text
 #  active_feed_version_id             :integer
 #  edited_attributes                  :string           default([]), is an Array
+#  name                               :string
 #
 # Indexes
 #

diff --git a/app/serializers/feed_serializer.rb b/app/serializers/feed_serializer.rb
@@ -22,6 +22,7 @@
 #  license_attribution_text           :text
 #  active_feed_version_id             :integer
 #  edited_attributes                  :string           default([]), is an Array
+#  name                               :string
 #
 # Indexes
 #
@@ -32,7 +33,8 @@
 #
 
 class FeedSerializer < CurrentEntitySerializer
-  attributes :url,
+  attributes :name,
+             :url,
              :feed_format,
              :license_name,
              :license_url,

diff --git a/db/migrate/20170811211047_add_name_to_feeds.rb b/db/migrate/20170811211047_add_name_to_feeds.rb
@@ -0,0 +1,9 @@
+class AddNameToFeeds < ActiveRecord::Migration
+  def change
+    [:current, :old].each do |version|
+      change_table "#{version}_feeds" do |t|
+        t.string :name,  index: true
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170725011839) do
+ActiveRecord::Schema.define(version: 20170811211047) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -62,6 +62,7 @@
     t.text      "license_attribution_text"
     t.integer   "active_feed_version_id"
     t.string    "edited_attributes",                                                                              default: [], array: true
+    t.string    "name"
   end
 
   add_index "current_feeds", ["active_feed_version_id"], name: "index_current_feeds_on_active_feed_version_id", using: :btree
@@ -242,7 +243,6 @@
   add_index "current_schedule_stop_pairs", ["trip"], name: "current_schedule_stop_pairs64_trip_idx", using: :btree
   add_index "current_schedule_stop_pairs", ["updated_at"], name: "current_schedule_stop_pairs64_updated_at_idx", using: :btree
 
-
   create_table "current_stop_transfers", force: :cascade do |t|
     t.string   "transfer_type"
     t.integer  "min_transfer_time"
@@ -408,6 +408,7 @@
     t.integer   "active_feed_version_id"
     t.string    "edited_attributes",                                                                              default: [], array: true
     t.string    "action"
+    t.string    "name"
   end
 
   add_index "old_feeds", ["active_feed_version_id"], name: "index_old_feeds_on_active_feed_version_id", using: :btree

diff --git a/spec/controllers/api/v1/feeds_controller_spec.rb b/spec/controllers/api/v1/feeds_controller_spec.rb
@@ -15,6 +15,19 @@
         })
       end
 
+      it '?name' do
+        feed1 = create(:feed, name: "test")
+        feed2 = create(:feed, name: "bar")
+        get :index, name: "bar"
+        expect_json_types({ feeds: :array })
+        expect_json({
+          feeds: -> (feeds) {
+            expect(feeds.size).to eq(1)
+            expect(feeds.first[:onestop_id]).to eq feed2.onestop_id
+          }
+        })
+      end
+
       it 'query: onestop_id' do
         create_list(:feed, 3)
         onestop_id = Feed.second.onestop_id

diff --git a/spec/factories/feed_factory.rb b/spec/factories/feed_factory.rb
@@ -22,6 +22,7 @@
 #  license_attribution_text           :text
 #  active_feed_version_id             :integer
 #  edited_attributes                  :string           default([]), is an Array
+#  name                               :string
 #
 # Indexes
 #

diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb
@@ -22,6 +22,7 @@
 #  license_attribution_text           :text
 #  active_feed_version_id             :integer
 #  edited_attributes                  :string           default([]), is an Array
+#  name                               :string
 #
 # Indexes
 #