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

Schedule adherence report include vehicle id #16

Merged
merged 4 commits into from
May 19, 2024
Merged

Schedule adherence report include vehicle id #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c1da43
add vehicle_id to /reports/scheduleAdh report
TsimurSh May 16, 2024
5be7fee
add an alternative pattern for date in reports
TsimurSh May 17, 2024
2c9dc03
Merge remote-tracking branch 'origin/next' into goeuropa/features/sch…
TsimurSh May 19, 2024
c88d0c8
validate date format yyyy-mm-dd
TsimurSh May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/org/transitclock/api/resources/ReportsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ ResponseEntity<String> getTripsWithTravelTimes(
ResponseEntity<String> getAvlReport(
StandardParameters stdParameters,
@Parameter(description = "Vehicle id") @RequestParam(value = "v") String vehicleId,
@Parameter(description = "Begin date(MM-DD-YYYY.") @RequestParam(value = "beginDate") String beginDate,
@Parameter(description = "Num days.", required = false) @RequestParam(value = "numDays", required = false) int numDays,
@Parameter(description = "Begin date(MM-DD-YYYY or YYYY-MM-DD") @RequestParam(value = "beginDate") String beginDate,
@Parameter(description = "Num days.") @RequestParam(value = "numDays", defaultValue = "1", required = false) int numDays,
@Parameter(description = "Begin time(HH:MM)") @RequestParam(value = "beginTime", required = false) String beginTime,
@Parameter(description = "End time(HH:MM)") @RequestParam(value = "endTime", required = false) String endTime);

Expand Down Expand Up @@ -104,8 +104,8 @@ ResponseEntity<String> getTrips(
ResponseEntity<String> scheduleAdhReport(
StandardParameters stdParameters,
@Parameter(description = "Route id") @RequestParam(value = "r") String routeId,
@Parameter(description = "Begin date(MM-DD-YYYY.") @RequestParam(value = "beginDate") String beginDate,
@Parameter(description = "Num days.", required = false) @RequestParam(value = "numDays", required = false) int numDays,
@Parameter(description = "Begin date(MM-DD-YYYY or YYYY-MM-DD") @RequestParam(value = "beginDate") String beginDate,
@Parameter(description = "Num days.") @RequestParam(value = "numDays", defaultValue = "1", required = false) int numDays,
@Parameter(description = "Begin time(HH:MM)") @RequestParam(value = "beginTime") String beginTime,
@Parameter(description = "End time(HH:MM)") @RequestParam(value = "endTime") String endTime,
@Parameter(description = "Allowable early in mins(default 1.0)")
Expand Down
20 changes: 11 additions & 9 deletions app/src/main/java/org/transitclock/core/reports/Reports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ public static String getScheduleAdhByStops(
// + " abs(((ad.time / 1000) - (ad.scheduled_time / 1000))) AS
// difference_in_seconds, \n"
+ " s.id AS stop_id, \n"
+ " ad.stop_order AS stop_order \n"
+ " ad.stop_order AS stop_order, \n"
+ " ad.vehicle_id AS v_id \n"
+ " FROM arrivals_departures ad, stops s \n"
+ "WHERE "
// To get stop name
Expand All @@ -276,7 +277,8 @@ public static String getScheduleAdhByStops(
// + " ((ad.time / 1000) - (ad.scheduled_time / 1000)) AS
// difference_in_seconds, \n"
+ " s.id AS stop_id, \n"
+ " ad.stop_order AS stop_order \n"
+ " ad.stop_order AS stop_order, \n"
+ " ad.vehicle_id AS v_id \n"
+ " FROM arrivals_departures ad, Stops s \n"
+ "WHERE "
// To get stop name
Expand All @@ -294,18 +296,18 @@ public static String getScheduleAdhByStops(
+ " \n"
+ " ORDER BY direction_id, ad.stop_order, s.name \n"
+ "), \n"
+ "trips_late_query_v2 AS ( SELECT"
+ " array_to_string(array_agg(trips_late::text || ' (' ||"
+ " difference_in_seconds::text || ')' order by trips_late::text), '; ') AS"
+ " trips_late, \n"
+ "trips_late_query_v2 AS ( SELECT \n"
+ " array_to_string(array_agg('trip: ' || trips_late::text || ' (' ||"
+ " difference_in_seconds::text || '), vehicle: ' || v_id::text order by trips_late::text), '; ')"
+ " AS trips_late, \n"
+ " stop_id, \n"
+ " stop_order \n"
+ " FROM trips_late_query_with_time \n"
+ " GROUP BY stop_id, stop_order \n"
+ " ), \n"
+ " trips_early_query_v2 AS ( \n"
+ " SELECT array_to_string(array_agg(trips_early::text || ' (' ||"
+ " difference_in_seconds::text || ')' order by trips_early::text), '; ')"
+ " trips_early_query_v2 AS ( SELECT \n"
+ " array_to_string(array_agg('trip: ' || trips_early::text || ' (' ||"
+ " difference_in_seconds::text || '), vehicle: ' || v_id::text order by trips_early::text), '; ')"
+ " AS trips_early, \n"
+ " stop_id, \n"
+ " stop_order \n"
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/org/transitclock/core/reports/SqlUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,17 @@ public static String timeRangeClause(

SimpleDateFormat currentFormat = new SimpleDateFormat("MM-dd-yyyy");
SimpleDateFormat requiredFormat = new SimpleDateFormat("yyyy-MM-dd");

try {
beginDate = requiredFormat.format(currentFormat.parse(beginDate));
if (beginDate.charAt(4) != '-') { // for two patterns MM-dd-yyyy & yyyy-MM-dd
beginDate = requiredFormat.format(currentFormat.parse(beginDate));
} else {
requiredFormat.parse(beginDate);
}
} catch (ParseException e) {
logger.error("Exception happened while processing time-range clause", e);
}

return " AND %s BETWEEN '%s' AND TIMESTAMP '%s' + INTERVAL '%d day' %s "
.formatted(timeColumnName, beginDate, beginDate, numDays, timeSql);
}
Expand Down
Loading