make competition overrideable by command line

aqora-io · Feb 21, 2024 · 948be81 · 948be81
1 parent 177d0d6
commit 948be81
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/config/src/lib.rs b/config/src/lib.rs
@@ -84,7 +84,7 @@ impl AqoraConfig {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct AqoraUseCaseConfig {
-    pub competition: String,
+    pub competition: Option<String>,
     pub data: PathBuf,
     pub template: Option<PathBuf>,
     pub generator: PathStr<'static>,
@@ -103,7 +103,7 @@ pub struct LayerConfig {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct AqoraSubmissionConfig {
-    pub competition: String,
+    pub competition: Option<String>,
     pub entity: Option<String>,
     pub refs: HashMap<String, PathStr<'static>>,
 }

diff --git a/src/commands/install.rs b/src/commands/install.rs
@@ -36,6 +36,7 @@ pub struct Install {
     pub uv: Option<PathBuf>,
     #[arg(long)]
     pub upgrade: bool,
+    pub competition: Option<String>,
 }
 
 pub async fn install_submission(args: Install, project: PyProject) -> Result<()> {
@@ -67,15 +68,23 @@ pub async fn install_submission(args: Install, project: PyProject) -> Result<()>
         )
     })?;
 
+    let slug = args
+        .competition
+        .as_ref()
+        .or(config.competition.as_ref())
+        .ok_or_else(|| {
+            error::user(
+                "No competition provided",
+                "Please specify a competition in either the pyproject.toml or the command line",
+            )
+        })?;
     let competition = client
-        .send::<GetCompetitionUseCase>(get_competition_use_case::Variables {
-            slug: config.competition.clone(),
-        })
+        .send::<GetCompetitionUseCase>(get_competition_use_case::Variables { slug: slug.clone() })
         .await?
         .competition_by_slug
         .ok_or_else(|| {
             error::user(
-                &format!("Competition '{}' not found", config.competition),
+                &format!("Competition '{slug}' not found"),
                 "Please make sure the competition exists",
             )
         })?;

diff --git a/src/commands/upload.rs b/src/commands/upload.rs
@@ -27,6 +27,7 @@ pub struct Upload {
     pub project: PathBuf,
     #[arg(long)]
     pub uv: Option<PathBuf>,
+    pub competition: Option<String>,
 }
 
 #[derive(GraphQLQuery)]
@@ -201,7 +202,17 @@ pub async fn upload_use_case(args: Upload, project: PyProject) -> Result<()> {
             )
         })?;
 
-    let competition_id = get_competition_id_by_slug(&client, &config.competition).await?;
+    let slug = args
+        .competition
+        .as_ref()
+        .or(config.competition.as_ref())
+        .ok_or_else(|| {
+            error::user(
+                "No competition provided",
+                "Please specify a competition in either the pyproject.toml or the command line",
+            )
+        })?;
+    let competition_id = get_competition_id_by_slug(&client, slug).await?;
 
     let version = project.version().ok_or_else(|| {
         error::user(
@@ -446,7 +457,17 @@ pub async fn upload_submission(args: Upload, project: PyProject) -> Result<()> {
             )
         })?;
 
-    let competition_id = get_competition_id_by_slug(&client, &config.competition).await?;
+    let slug = args
+        .competition
+        .as_ref()
+        .or(config.competition.as_ref())
+        .ok_or_else(|| {
+            error::user(
+                "No competition provided",
+                "Please specify a competition in either the pyproject.toml or the command line",
+            )
+        })?;
+    let competition_id = get_competition_id_by_slug(&client, slug).await?;
     let entity_id = if let Some(username) = &config.entity {
         get_entity_id_by_username(&client, username).await?
     } else {