Add --week flag to 'submit'

Author: mawkler

src/cli/arguments.rs

@@ -120,7 +120,15 @@ pub enum Command {
     },
 
     /// Submit time sheet for week
-    Submit,
+    Submit {
+        /// Week number (defaults to current week if omitted)
+        #[arg(long, short)]
+        week: Option<u8>,
+
+        /// Year (defaults to current year if omitted)
+        #[arg(long, short, requires = "week")]
+        year: Option<i32>,
+    },
 
     /// Log out
     Logout,

src/cli/commands.rs

@@ -59,7 +59,7 @@ impl<'a> CommandClient<'a> {
     }
 
     pub(crate) async fn get(&self, week: Option<u8>, year: Option<i32>, format: Format) {
-        let week = create_week_with_fallback(week, year);
+        let week = to_week_with_fallback(week, year);
 
         match format {
             Format::Json => self.get_json(week.as_ref()).await.context("JSON"),
@@ -84,7 +84,7 @@ impl<'a> CommandClient<'a> {
         }
 
         let day = get_days(days);
-        let week = create_week_with_fallback(week, year);
+        let week = to_week_with_fallback(week, year);
 
         self.time_sheet_service
             .lock()
@@ -112,7 +112,7 @@ impl<'a> CommandClient<'a> {
             exit_with_error!("`--day` is set but no day was provided");
         }
 
-        let week = create_week_with_fallback(week, year);
+        let week = to_week_with_fallback(week, year);
         self.time_sheet_service
             .lock()
             .await
@@ -139,7 +139,7 @@ impl<'a> CommandClient<'a> {
         week: Option<u8>,
         year: Option<i32>,
     ) {
-        let week = create_week_with_fallback(week, year);
+        let week = to_week_with_fallback(week, year);
 
         self.repository
             .lock()
@@ -152,11 +152,12 @@ impl<'a> CommandClient<'a> {
             });
     }
 
-    pub(crate) async fn submit(&mut self) {
+    pub(crate) async fn submit(&mut self, week: Option<u8>, year: Option<i32>) {
+        let week = to_week_with_fallback(week, year);
         self.repository
             .lock()
             .await
-            .submit()
+            .submit(week.as_ref())
             .await
             .unwrap_or_else(|err| {
                 exit_with_error!("Failed to submit: {}", error_stack_fmt(&err));
@@ -172,10 +173,8 @@ fn get_days(days: Option<Days>) -> Days {
     })
 }
 
-fn create_week_with_fallback(week: Option<u8>, year: Option<i32>) -> Option<WeekNumber> {
+fn to_week_with_fallback(week: Option<u8>, year: Option<i32>) -> Option<WeekNumber> {
     week.map(|week| {
-        // Fall back to today's year
-        let year = year.unwrap_or_else(|| year.unwrap_or_else(|| chrono::Utc::now().year()));
-        WeekNumber::new(week, year).unwrap_or_else(|err| exit_with_error!("{err}"))
+        WeekNumber::new_with_fallback(week, year).unwrap_or_else(|err| exit_with_error!("{err}"))
     })
 }

src/cli/mod.rs

@@ -2,3 +2,4 @@ pub(crate) mod arguments;
 pub(crate) mod commands;
 pub(crate) mod day_parser;
 pub(crate) mod rendering;
+pub(crate) mod week;

src/domain/models/week.rs

@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use chrono::{NaiveDate, Weekday};
+use chrono::{Datelike, NaiveDate, Weekday};
 use std::fmt::Display;
 
 #[derive(Debug, Clone)]
@@ -15,6 +15,12 @@ impl WeekNumber {
         Ok(Self { number: week, year })
     }
 
+    pub(crate) fn new_with_fallback(week: u8, year: Option<i32>) -> anyhow::Result<Self> {
+        // Fall back to today's year
+        let year = year.unwrap_or_else(|| year.unwrap_or_else(|| chrono::Utc::now().year()));
+        WeekNumber::new(week, year)
+    }
+
     pub(crate) fn first_day(&self) -> Option<NaiveDate> {
         first_day_of_week(self.number, self.year)
     }

src/infrastructure/repositories/time_sheet_repository.rs

@@ -105,6 +105,9 @@ impl TimeSheetRepository<'_> {
         }
 
         // Fall back to today's week
+        //
+        // This is a small optimization since we don't need to make an extra request if we want the
+        // current week (i.e. `week` is `None`)
         let time_registration = self.get_time_registration().await?;
         Ok(time_registration.into())
     }
@@ -306,8 +309,18 @@ impl TimeSheetRepository<'_> {
             .with_context(|| format!("Failed to get tasks for job '{job}'"))
     }
 
-    pub(crate) async fn submit(&mut self) -> Result<()> {
-        let container_instance = self.get_container_instance().await?;
+    pub(crate) async fn submit(&mut self, week: Option<&WeekNumber>) -> Result<()> {
+        // Set the week
+        let _ = self
+            .get_time_sheet(week)
+            .await
+            .context("Failed to get time sheet")?;
+
+        let container_instance = self
+            .get_container_instance()
+            .await
+            .context("Failed to get container instance")?;
+
         let concurrency_control = self
             .client
             .submit(&container_instance)

src/main.rs

@@ -66,7 +66,7 @@ async fn main() -> anyhow::Result<()> {
             year,
         } => command_client.clear(&job, &task, day, week, year).await,
         // TODO: haven't actually tested this yet (can only be tested once a week)
-        Command::Submit => command_client.submit().await,
+        Command::Submit { week, year } => command_client.submit(week, year).await,
         Command::Logout => command_client.logout().await,
         Command::Line(line) => match line {
             Line::Delete {