Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CurrentEntityController #1096

Merged
merged 59 commits into from
Jun 17, 2017
Merged

CurrentEntityController #1096

merged 59 commits into from
Jun 17, 2017

Conversation

irees
Copy link
Member

@irees irees commented May 20, 2017

Resolves #1064

irees added 28 commits June 2, 2017 15:28
@irees
Remove
4b36a19
@irees
Use super instead
3344c3d
@irees
Scope
b56f3fa
@irees
Typo
abc3928
@irees
Convert Feeds controller
3f72551
@irees
EIFF
70d47ff
@irees
CSV pluralize model name
785f090
@irees
Default includes
7c0fcfa
@irees
Fix includes
2de851b
@irees
Convert to EntityController
551b60c
@irees
Feed imported from Feed
e1a4687 
For controller ease
@irees
EntityController provides show method
0e1ec48
@irees
Use EntityController show
a604f58
@irees
RoutesController use EntityController
28d15e7
@irees
StopsController use EntityController
b14e799
@irees
RouteStopPatternController use EntityController
05a7e69
@irees
Merge branch 'master' into entity-controller-common
5c3f51c 
# Conflicts:
#	app/controllers/api/v1/route_stop_patterns_controller.rb
@irees
Tidy
0942f04
@irees
Tidy
704e09d
@irees
render_scope
29e10a2
@irees
index_query_geometry
948d15d
@irees
Tidy
3e9da6d
@irees
RoutesController use render_scope, index_query_geometry
faf5d71
@irees
Start of self-documenting query params
08ef13e
@irees
EntityController render_serializer
8835cb6
@irees
Method visibility
537d616
@irees
StopStationsController use EntityController
a6f7d14
@irees
EntityController include_geometry, exclude_geometry
d69f78e
@irees irees requested a review from drewda June 15, 2017 17:44
@irees irees changed the title [WIP] EntityController EntityController Jun 15, 2017
drewda
drewda approved these changes Jun 15, 2017
View reviewed changes
Copy link
Member

@drewda drewda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is looking good and my local testing is working, with one small exception I flagged.

app/controllers/api/v1/entity_controller.rb Outdated

# Imported From Feed
if params[:imported_from_feed].present?
@collection = @collection.where_imported_from_feed(Feed.find_by_onestop_id(params[:imported_from_feed]))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be find_by_onestop_id! with a bang?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That might explain why when I run a local request like http://localhost:3000/api/v1/stops?imported_from_feed=f-a-no (with a non-existent feed Onestop ID), I get back:

{"message":"[NoMethodError] undefined method `id' for nil:NilClass"}

@irees irees changed the title EntityController CurrentEntityController Jun 17, 2017
@irees irees merged commit 8eefdac into master Jun 17, 2017
@irees irees removed the in progress label Jun 17, 2017
@irees irees deleted the entity-controller-common branch June 19, 2017 17:13
This was referenced Jun 19, 2017
Merged
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drewda drewda drewda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@irees @drewda