Add wrapper for get_report

Author: bubelov

src/command/area.rs

@@ -63,16 +63,6 @@ pub fn set_area_icon(args: &SetAreaIconArgs) -> Result<()> {
     .print()
 }
 
-#[derive(Args)]
-pub struct GenerateAreasElementsMappingArgs {
-    pub from_element_id: i64,
-    pub to_element_id: i64,
-}
-
-pub fn generate_areas_elements_mapping(args: &GenerateAreasElementsMappingArgs) -> Result<()> {
-    rpc::call(
-        "generate_areas_elements_mapping",
-        json!({"from_element_id": args.from_element_id,"to_element_id": args.to_element_id}),
-    )?
-    .print()
+pub fn generate_areas_elements_mapping() -> Result<()> {
+    rpc::call("generate_areas_elements_mapping", json!({}))?.print()
 }

src/command/common.rs

@@ -11,6 +11,18 @@ pub fn search(args: &SearchArgs) -> Result<()> {
     rpc::call("search", json!({"query": args.query}))?.print()
 }
 
+#[derive(Args)]
+pub struct GetReportArgs {
+    #[arg(long)]
+    pub start: String,
+    #[arg(long)]
+    pub end: String,
+}
+
+pub fn get_report(args: &GetReportArgs) -> Result<()> {
+    rpc::call("get_report", json!({"start": args.start, "end": args.end}))?.print()
+}
+
 #[derive(Args)]
 pub struct CustomArgs {
     pub method: String,

src/command/event.rs

@@ -8,12 +8,18 @@ use serde_json::{json, Map, Value};
 #[derive(Args)]
 pub struct CreateEventArgs {
     #[clap(allow_hyphen_values = true)]
+    #[arg(long)]
     pub lat: f64,
     #[clap(allow_hyphen_values = true)]
+    #[arg(long)]
     pub lon: f64,
+    #[arg(long)]
     pub name: String,
+    #[arg(long)]
     pub website: String,
+    #[arg(long = "starts-at")]
     pub starts_at: String,
+    #[arg(long = "ends-at")]
     pub ends_at: Option<String>,
 }
 

src/main.rs

@@ -87,7 +87,7 @@ enum Commands {
     /// Set icon to a certain area. You can use either numeric id or a string alias (th). Icon needs to be base64-encoded, and you also need to provide file extension
     SetAreaIcon(command::area::SetAreaIconArgs),
     /// Ensure that elements and areas are correctly mapped to each other. You need to provide element id range in order to operate on a specific slice of elements
-    GenerateAreasElementsMapping(command::area::GenerateAreasElementsMappingArgs),
+    GenerateAreasElementsMapping,
     /// Fetch the latest user actions. You need to provide OSM username and the number of latest entries you are interested in
     GetUserActivity(command::user::GetUserActivityArgs),
     /// Generate daily reports. It will skip report generation if current date is already covered
@@ -106,6 +106,9 @@ enum Commands {
     GetEvents,
     GetEvent(command::event::GetEventArgs),
     DeleteEvent(command::event::DeleteEventArgs),
+
+    /// Generate montly activity report. We use it as a data source in our monthly reports
+    GetReport(command::common::GetReportArgs),
 }
 
 type Result<T> = std::result::Result<T, Box<dyn Error>>;
@@ -187,7 +190,7 @@ fn main() -> Result<()> {
         Commands::SetAreaTag(args) => area::set_area_tag(args),
         Commands::RemoveAreaTag(args) => area::remove_area_tag(args),
         Commands::SetAreaIcon(args) => area::set_area_icon(args),
-        Commands::GenerateAreasElementsMapping(args) => area::generate_areas_elements_mapping(args),
+        Commands::GenerateAreasElementsMapping => area::generate_areas_elements_mapping(),
         // User
         Commands::GetUserActivity(args) => command::user::get_user_activity(args),
         // Report
@@ -203,6 +206,7 @@ fn main() -> Result<()> {
         Commands::GetEvents => command::event::get_events(),
         Commands::GetEvent(args) => command::event::get_event(args),
         Commands::DeleteEvent(args) => command::event::delete_event(args),
+        Commands::GetReport(args) => command::common::get_report(args),
     }
 }