New grouping options (#26)

routes/src/consumption.rs

@@ -28,6 +28,8 @@ use types::{DispatchClassConsumption, ParaId, Timestamp, WeightConsumption};
 #[serde(crate = "rocket::serde")]
 pub enum Grouping {
 	BlockNumber,
+	Minute,
+	Hour,
 	Day,
 	Month,
 	Year,
@@ -37,6 +39,8 @@ pub enum Grouping {
 impl<'r> FromFormField<'r> for Grouping {
 	fn from_value(field: ValueField<'r>) -> form::Result<'r, Self> {
 		match field.value {
+			"minute" => Ok(Grouping::Minute),
+			"hour" => Ok(Grouping::Hour),
 			"day" => Ok(Grouping::Day),
 			"month" => Ok(Grouping::Month),
 			"year" => Ok(Grouping::Year),
@@ -117,6 +121,8 @@ fn get_aggregation_key(datum: WeightConsumption, grouping: Grouping) -> String {
 
 	match grouping {
 		Grouping::BlockNumber => datum.block_number.to_string(),
+		Grouping::Minute => datetime.format("%Y-%m-%dT%H:%M").to_string(),
+		Grouping::Hour => datetime.format("%Y-%m-%dT%H:00").to_string(),
 		Grouping::Day => datetime.format("%Y-%m-%d").to_string(),
 		Grouping::Month => datetime.format("%Y-%m").to_string(),
 		Grouping::Year => datetime.format("%Y").to_string(),

routes/tests/consumption.rs

@@ -253,6 +253,24 @@ fn grouping_works() {
 		);
 		assert_eq!(consumption_data, expected_consumption);
 
+		// Grouping by minute:
+		let response = client.get("/consumption/polkadot/2000?grouping=minute").dispatch();
+		assert_eq!(response.status(), Status::Ok);
+
+		let consumption_data = parse_ok_response(response);
+		let expected_consumption =
+			group_consumption(mock_consumption().get(&para).unwrap().clone(), Grouping::Minute);
+		assert_eq!(consumption_data, expected_consumption);
+
+		// Grouping by hour:
+		let response = client.get("/consumption/polkadot/2000?grouping=hour").dispatch();
+		assert_eq!(response.status(), Status::Ok);
+
+		let consumption_data = parse_ok_response(response);
+		let expected_consumption =
+			group_consumption(mock_consumption().get(&para).unwrap().clone(), Grouping::Hour);
+		assert_eq!(consumption_data, expected_consumption);
+
 		// Grouping by day:
 		let response = client.get("/consumption/polkadot/2000?grouping=day").dispatch();
 		assert_eq!(response.status(), Status::Ok);

routes/tests/extend_subscription.rs

@@ -25,7 +25,6 @@ use routes::{
 };
 use shared::{
 	chaindata::get_para,
-	current_timestamp,
 	payment::PaymentError,
 	registry::{registered_para, update_registry},
 };

scripts/reset_env.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+TRACKER="./target/release/tracker"
+WATCHDOG="scripts/watchdog.sh"
+
+PIDS=$(pgrep -f "$TRACKER|$WATCHDOG")
+
+if [ -z "$PIDS" ]; then
+    echo "Process not found."
+else
+    # Kill each process
+    for PID in $PIDS; do
+        kill -9 $PID
+    done
+fi