refactor: clean up run169 form name

Author: rustpls

src/application/town_service.rs

@@ -4,7 +4,7 @@ use crate::{
         Town, User,
         distance::{DistanceUnit, Kilometers, Miles},
         race::NewRace,
-        town::{SubmitTown, SubmitTownForGoogle, SubmitTownGoogleForm},
+        town::{Run169TownsSocietyGoogleForm, SubmitTown, SubmitTownForGoogle},
     },
     infrastructure::db::{RaceRepository, TownRepository},
 };
@@ -28,6 +28,7 @@ impl TownService {
 
     pub async fn submit_completed_town(&self, user: User, form: SubmitTown) -> Result<(), String> {
         let user_id = user.id;
+        let town_id = form.town_id;
         let town_name = self.town_repository.find_by_id(form.town_id).await?.name;
         let distance_val = match form.distance_unit {
             DistanceUnit::Miles => Miles::new(form.distance_val),
@@ -42,17 +43,14 @@ impl TownService {
             notes: form.notes.clone(),
         };
 
-        SubmitTownGoogleForm::new()
+        // Submit the town to Run169Towns Society
+        Run169TownsSocietyGoogleForm::new()
             .add_answers(user, google_form)
             .submit()
             .await?;
 
         // Mark the town as completed.
-        let _ = self
-            .town_repository
-            .mark_completed(user_id, form.town_id)
-            .await;
-
+        let _ = self.town_repository.mark_completed(user_id, town_id).await;
         // Always try to create a race, it will reject if there's one that exists.
         let _ = self.race_repository.create_race(NewRace::from(form)).await;
 

src/domain/town.rs

@@ -48,7 +48,7 @@ pub struct SubmitTownForGoogle {
     pub notes: String,
 }
 
-pub struct SubmitTownGoogleForm {
+pub struct Run169TownsSocietyGoogleForm {
     form_id: String,
     member_id: String,
     action: String,
@@ -66,7 +66,7 @@ pub struct SubmitTownGoogleForm {
     answers: HashMap<String, String>,
 }
 
-impl SubmitTownGoogleForm {
+impl Run169TownsSocietyGoogleForm {
     pub fn new() -> Self {
         Self {
             form_id: "1FAIpQLScHViJvQL0G_ZPuCZOIFNsBPthZwDSzbkgiFFeL93wp831diA".to_string(),
@@ -91,7 +91,7 @@ impl SubmitTownGoogleForm {
         mut self,
         user: User,
         form: SubmitTownForGoogle,
-    ) -> CompletedSubmitTownGoogleForm {
+    ) -> CompletedRun169TownsSocietyGoogleForm {
         self.answers.insert(
             format!("entry.{}", self.member_id),
             user.runner_id.unwrap().to_string(),
@@ -129,13 +129,13 @@ impl SubmitTownGoogleForm {
         self.answers
             .insert(format!("entry.{}", self.comment), form.notes);
 
-        CompletedSubmitTownGoogleForm(self)
+        CompletedRun169TownsSocietyGoogleForm(self)
     }
 }
 
-pub struct CompletedSubmitTownGoogleForm(SubmitTownGoogleForm);
+pub struct CompletedRun169TownsSocietyGoogleForm(Run169TownsSocietyGoogleForm);
 
-impl CompletedSubmitTownGoogleForm {
+impl CompletedRun169TownsSocietyGoogleForm {
     pub async fn submit(&self) -> Result<(), String> {
         let base_url = "https://docs.google.com/forms/d/e";
         let url = format!("{}/{}/formResponse", base_url, self.0.form_id);

src/routes/submit_town.rs

@@ -1,6 +1,7 @@
 use crate::domain::distance::DistanceUnit;
 use crate::domain::race::{RaceView, SubmitTownSearchParams};
 use crate::filters;
+use crate::util::htmx::HTMX;
 use crate::util::pagination::PaginatedResponse;
 use crate::{
     SharedState,
@@ -71,12 +72,7 @@ async fn submit_town(
     // TODO: We'll need to handle the error scenario and success scenario.
     //       We should celebrate the user's achievement!
     match state.town_service.submit_completed_town(*user, form).await {
-        Ok(_) => SubmitTownPage {
-            towns: state.town_service.find_all().await,
-            max_race_date: Utc::now().with_timezone(&New_York).date_naive(),
-            ..Default::default()
-        }
-        .into_response(),
+        Ok(_) => HTMX::refresh().into_response(),
         Err(_) => SubmitTownPage {
             towns: state.town_service.find_all().await,
             max_race_date: Utc::now().with_timezone(&New_York).date_naive(),