Skip to content

Gmap pending fixes#303

Draft
binh-dam-ibigroup wants to merge 155 commits intodevfrom
gmap-pending-fixes
Draft

Gmap pending fixes#303
binh-dam-ibigroup wants to merge 155 commits intodevfrom
gmap-pending-fixes

Conversation

@binh-dam-ibigroup
Copy link
Collaborator

Checklist

  • Appropriate branch selected (all PRs must first be merged to dev before they can be merged to master)
  • Any modified or new methods or classes have helpful JavaDoc and code is thoroughly commented
  • The description lists all applicable issues this PR seeks to resolve
  • The description lists any configuration setting(s) that differ from the default settings
  • All tests and CI builds passing
  • The description lists all relevant PRs included in this release (remove this if not merging to master)

Description

Please explain the changes you made here and, if not immediately obvious from the code, how they resolve any referenced issues. Be sure to include all issues being resolved and any special configuration settings that are need for the software to run properly with these changes. If merging to master, please also list the PRs that are to be included.

* using the trip start time and the monitored days.
* (Itinerary existence is not being checked, assuming that clients prevent monitoring days when a trip doesn't exist.)
*/
public static ZonedDateTime findEarliestTargetDate(MonitoredTrip trip, ZonedDateTime fromDateTime) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This method conflicts with the one in MonitoredTrip. I think the one in MonitoredTrip should be used instead because it was recently fixed by #362.

/**
* Advance the target date/time until a day is found when the trip is active.
*/
private static ZonedDateTime findNextMonitoredDay(MonitoredTrip trip, ZonedDateTime startingDay) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Use the method from MonitoredTrip and remove this one.

/**
* Whether to advance to the next monitored day.
*/
public boolean shouldAdvanceToNextDay() {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

shouldAdvanceToNextDay appears to be only used in tests, so this method and relevant tests can be removed.

computeTargetZonedDateTime();
resetJourneyState();

// reset journey state departure/arrival times
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Remove duplicate statement.

if (
isBusLeg(busLeg) && routeId != null &&
hasNotCanceledNotificationForRoute(travelerPosition.trackedJourney, routeId)
hasNotCanceled
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fix tabs.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Revert the changes that introduce garbled characters.

Comment on lines +1383 to +1386
Arguments.of(TUESDAY_20200609.withHour(8), TUESDAY_20200609.withHour(9), false),
// Trip snoozed at 8:00am on Tuesday, June 9, 2020, should unsnooze at 12:00am (midnight) on
// Wednesday, June 10, 2020, but it is too early for the trip to be analyzed again.
Arguments.of(TUESDAY_20200609.withHour(8), wednesday, true),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Remove, these are duplicate.

Comment on lines +84 to +85
UsRideGwinnettNotifyBusOperator.IS_TEST = true;

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Remove duplicate statement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants