adds /vehiclestatuses endpoint to fms-server #32
Conversation
eriksven
force-pushed
the
feature/vehiclestatuses-endpoint
branch
2 times, most recently
from
585607f to
03a0660
Compare
eriksven
force-pushed
the
feature/vehiclestatuses-endpoint
branch
from
03a0660 to
447f399
Compare
components/fms-server/Cargo.toml
Outdated
| @@ -30,7 +30,7 @@ readme.workspace = true | |||
|
|
|||
| [dependencies] | |||
| async-trait = "0.1" | |||
| axum = "0.6" | |||
| axum = "0.7.2" | |||
There was a problem hiding this comment.
FMPOV we should not pin the version to a patch level but instead to the minor version only. That will make it easier for cargo to find a version that suits multiple components.
components/fms-server/src/main.rs
Outdated
| let start_parameter = params.get("starttime"); | ||
| let stop_parameter = params.get("stoptime"); | ||
|
|
||
|
|
||
| let latest_only = match parse_latest_only(¶ms) { | ||
| Ok(value) => value, | ||
| Err(status) => return Err(status), | ||
| }; | ||
|
|
||
| if start_parameter.is_none() && latest_only.is_none() { | ||
| // rFMS makes it mandatory to either supply the starttime or latestOnly | ||
| return Err(StatusCode::BAD_REQUEST); | ||
| } | ||
|
|
||
| if latest_only.is_some() && (start_parameter.is_some() || stop_parameter.is_some()) { | ||
| // rFMS does not allow to set latestOnly and and time at the same time | ||
| return Err(StatusCode::BAD_REQUEST); | ||
| } | ||
|
|
||
| let start_time = start_parameter.map_or(0, |text| { | ||
| DateTime::<Utc>::from_str(text).map_or(0, |time| time.timestamp()) | ||
| }); | ||
|
|
||
| let stop_time = stop_parameter | ||
| .map_or_else(|| Utc::now().timestamp(), |text| { | ||
| DateTime::<Utc>::from_str(text).map_or_else(|_| Utc::now().timestamp(), |time| time.timestamp()) | ||
| }); | ||
|
|
||
| let vin = params.get("vin"); | ||
| let trigger_filter = params.get("triggerFilter"); |
There was a problem hiding this comment.
Is this query parameter checking/parsing something that is needed for the other endpoints as well? If so, can we reuse/share this code?
There was a problem hiding this comment.
Yes, that it is something that can be shared. My idea was to add this sharing in a later PR and limit the scope of this PR to the initial addition of the /vehiclestatuses endpoint.
Should I add the sharing to this PR instead?
components/fms-server/src/models.rs
Outdated
| @@ -515,4 +515,765 @@ pub struct ErrorObject { | |||
|
|
|||
| } | |||
|
|
|||
| #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)] | |||
There was a problem hiding this comment.
this module seems to be quite large. Can we distribute the type to multiple modules?
There was a problem hiding this comment.
Yes, we could distribute it. However, I was not sure where to split because this is basically the domain model used within rFMS. I will try to split this along the lines of the different endpoints using parts of the model.
There was a problem hiding this comment.
Yes, I guess that makes sense. Putting common types into one module and then have the endpoint specific types refer to these ...
components/fms-server/src/main.rs
Outdated
| let query_parameters = match parse_query_parameters(¶ms) { | ||
| Ok(value) => value, | ||
| Err(status) => return Err(status), | ||
| }; |
There was a problem hiding this comment.
you should be able to write this as just
let query_parameters = parse_query_parameters(¶ms)?;
components/fms-server/src/main.rs
Outdated
|
|
||
| influx_server | ||
| .get_vehicleposition(start_time, stop_time, vin, trigger_filter, latest_only) | ||
| .get_vehicleposition(query_parameters.start_time, query_parameters.stop_time, query_parameters.vin, query_parameters.trigger_filter, query_parameters.latest_only) |
There was a problem hiding this comment.
wouldn't it make more sense to simply pass in &query_parameters?
components/fms-server/src/main.rs
Outdated
|
|
||
|
|
||
| let latest_only = match parse_latest_only(¶ms) { | ||
| let query_parameters = match parse_query_parameters(¶ms) { |
components/fms-server/src/main.rs
Outdated
| influx_server | ||
| .get_vehiclesstatuses(start_time, stop_time, vin, trigger_filter, latest_only) | ||
| .get_vehiclesstatuses(query_parameters.start_time, query_parameters.stop_time, query_parameters.vin, query_parameters.trigger_filter, query_parameters.latest_only) |
refactors model into separate files too
eriksven
force-pushed
the
feature/vehiclestatuses-endpoint
branch
from
71660c8 to
2ff2497
Compare
|
@sophokles73 I changed your findings |
Updated Cargo.lock and transitive dependencies legal docs.
Updated Cargo.lock and transitive dependencies legal docs.
Updated Cargo.lock and transitive dependencies legal docs.
Updated Cargo.lock and transitive dependencies legal docs.
This is an initial implementation of the '/vehiclestatuses' endpoint in the fms-server.