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

Fix Nederlandse Spoorwegen to ignore trains in the past #138331

Merged
merged 6 commits into from
Mar 2, 2025
Merged

Fix Nederlandse Spoorwegen to ignore trains in the past #138331

merged 6 commits into from
Mar 2, 2025

Conversation

Martreides
Copy link
Contributor

@Martreides Martreides commented Feb 11, 2025 •
edited
Loading

Breaking change

No

Proposed change

The Nederlandse Spoorwegen (NS) integration is supposed to provide information on when the next train leaves. However, it often does not provide the correct information because the integration takes the first train in the API response, due to one of two reasons the first train is usually not the one we need:

  1. The API of NS does not provide information of just future trains. It also provides trains that have left recently (approx up 30 minutes ago).
  2. Trains can get delayed which is not taken into account.

This is resolved by 1) determining per train which time to use (planned or actual/delayed), 2) ignoring all trains that left already.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes nederlandse_spoorwegen Not usable #104754
  • This PR is related to issue:
  • Link to documentation pull request:
  • Link to developer documentation pull request:
  • Link to frontend pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • I have followed the perfect PR recommendations
  • The code has been formatted using Ruff (ruff format homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

Not applicable since no changes made in intended functionality.

If the code communicates with devices, web services, or third-party tools:

Not applicable since no changes in communication with devices, web services, or third-party tools.

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

Hey there @YarmoM, mind taking a look at this pull request as it has been labeled with an integration (nederlandse_spoorwegen) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of nederlandse_spoorwegen can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign nederlandse_spoorwegen Removes the current integration label and assignees on the pull request, add the integration domain after the command.
  • @home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@Martreides Martreides mentioned this pull request Feb 11, 2025
Closed
@Martreides
Copy link
Contributor Author

I am not sure how it works, but I am okay with taking code ownership for this integration and work on getting it to at least bronze quality.

@Martreides
Copy link
Contributor Author

@CloCkWeRX, do you have any tips on how to get this PR moving? It seems that the code owner is unresponsive, I have even emailed him, but no response.

@MartinHjelmare MartinHjelmare changed the title Bugfix Nederlandse Spoorwegen integration - Ignore trains in the past Fix Nederlandse Spoorwegen to ignore trains in the past Feb 22, 2025
@frenck frenck added this to the 2025.3.0 milestone Feb 28, 2025
@frenck
Copy link
Member

frenck commented Mar 1, 2025

@CloCkWeRX, do you have any tips on how to get this PR moving? It seems that the code owner is unresponsive, I have even emailed him, but no response.

Patience is the key here. See also: https://developers.home-assistant.io/docs/review-process

@home-assistant
Copy link

home-assistant bot commented Mar 1, 2025

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant bot marked this pull request as draft March 1, 2025 19:51
@Martreides Martreides force-pushed the dev-ns-integration branch from 7f3043c to 50c156e Compare March 1, 2025 21:25
@Martreides Martreides force-pushed the dev-ns-integration branch from 50c156e to 2316fec Compare March 1, 2025 21:26
@Martreides Martreides marked this pull request as ready for review March 2, 2025 10:19
@home-assistant home-assistant bot requested a review from frenck March 2, 2025 10:19
frenck
frenck approved these changes Mar 2, 2025
View reviewed changes
Copy link
Member

@frenck frenck left a comment

Choose a reason for hiding this comment

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

Thanks, @Martreides 👍

../Frenck

@frenck frenck merged commit b7bedd4 into home-assistant:dev Mar 2, 2025
28 checks passed
bramkragten pushed a commit that referenced this pull request Mar 2, 2025
@Martreides @bramkragten
Fix Nederlandse Spoorwegen to ignore trains in the past (#138331)
2636a47 
* Update NS integration to show first next train instead of just the first.

* Handle no first or next trip.

* Remove debug statement.

* Remove seconds and revert back to minutes.

* Make use of dt_util.now().

* Fix issue with next train if no first train.
@github-actions github-actions bot locked and limited conversation to collaborators Mar 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@frenck frenck frenck approved these changes

@CloCkWeRX CloCkWeRX CloCkWeRX approved these changes

@benbridts benbridts benbridts approved these changes

Assignees
No one assigned
Labels
bugfix cherry-picked cla-signed integration: nederlandse_spoorwegen Quality Scale: legacy
Projects
None yet
Milestone
2025.3.0
Development

Successfully merging this pull request may close these issues.

nederlandse_spoorwegen Not usable
5 participants
@Martreides @frenck @CloCkWeRX @benbridts @bramkragten