Handle missing achievement detail rows

Author: Js41637

src/api/achievements/id/mod.rs

@@ -29,6 +29,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
     params(LanguageParams),
     responses(
         (status = 200, description = "Achievement", body = Achievement),
+        (status = 404, description = "Achievement not found"),
     )
 )]
 #[get("/api/achievements/{id}")]
@@ -37,8 +38,11 @@ async fn get_achievement(
     language_params: web::Query<LanguageParams>,
     pool: web::Data<PgPool>,
 ) -> ApiResult<impl Responder> {
-    let db_achievement =
-        database::achievements::get_one_by_id(*id, language_params.lang, &pool).await?;
+    let Some(db_achievement) =
+        database::achievements::get_one_by_id(*id, language_params.lang, &pool).await?
+    else {
+        return Ok(HttpResponse::NotFound().finish());
+    };
 
     let mut achievement = Achievement::from(db_achievement);
 

src/api/gi/achievements/id/mod.rs

@@ -27,6 +27,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
     params(LanguageParams),
     responses(
         (status = 200, description = "Achievement", body = Achievement),
+        (status = 404, description = "Achievement not found"),
     )
 )]
 #[get("/api/gi/achievements/{id}")]
@@ -42,8 +43,11 @@ async fn get_gi_achievement(
         false
     };
 
-    let db_achievement =
-        database::gi::achievements::get_one_by_id(*id, language_params.lang, &pool).await?;
+    let Some(db_achievement) =
+        database::gi::achievements::get_one_by_id(*id, language_params.lang, &pool).await?
+    else {
+        return Ok(HttpResponse::NotFound().finish());
+    };
 
     if (db_achievement.impossible && db_achievement.hidden) && !admin {
         return Ok(HttpResponse::NotFound().finish());

src/api/zzz/achievements/id/mod.rs

@@ -27,6 +27,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
     params(LanguageParams),
     responses(
         (status = 200, description = "Achievement", body = Achievement),
+        (status = 404, description = "Achievement not found"),
     )
 )]
 #[get("/api/zzz/achievements/{id}")]
@@ -42,8 +43,11 @@ async fn get_zzz_achievement(
         false
     };
 
-    let db_achievement =
-        database::zzz::achievements::get_one_by_id(*id, language_params.lang, &pool).await?;
+    let Some(db_achievement) =
+        database::zzz::achievements::get_one_by_id(*id, language_params.lang, &pool).await?
+    else {
+        return Ok(HttpResponse::NotFound().finish());
+    };
 
     if (db_achievement.impossible && db_achievement.hidden) && !admin {
         return Ok(HttpResponse::NotFound().finish());

src/database/achievements.rs

@@ -85,7 +85,11 @@ pub async fn get_all_related_ids(id: i32, set: i32, pool: &PgPool) -> Result<Vec
     )
 }
 
-pub async fn get_one_by_id(id: i32, language: Language, pool: &PgPool) -> Result<DbAchievement> {
+pub async fn get_one_by_id(
+    id: i32,
+    language: Language,
+    pool: &PgPool,
+) -> Result<Option<DbAchievement>> {
     let language = language.to_string();
 
     Ok(sqlx::query_file_as!(
@@ -94,7 +98,7 @@ pub async fn get_one_by_id(id: i32, language: Language, pool: &PgPool) -> Result
         id,
         language,
     )
-    .fetch_one(pool)
+    .fetch_optional(pool)
     .await?)
 }
 

src/database/gi/achievements.rs

@@ -57,7 +57,11 @@ pub async fn get_all(language: Language, pool: &PgPool) -> Result<Vec<DbAchievem
     )
 }
 
-pub async fn get_one_by_id(id: i32, language: Language, pool: &PgPool) -> Result<DbAchievement> {
+pub async fn get_one_by_id(
+    id: i32,
+    language: Language,
+    pool: &PgPool,
+) -> Result<Option<DbAchievement>> {
     let language = language.to_string();
 
     Ok(sqlx::query_file_as!(
@@ -66,7 +70,7 @@ pub async fn get_one_by_id(id: i32, language: Language, pool: &PgPool) -> Result
         id,
         language,
     )
-    .fetch_one(pool)
+    .fetch_optional(pool)
     .await?)
 }
 

src/database/zzz/achievements.rs

@@ -60,7 +60,11 @@ pub async fn get_all(language: Language, pool: &PgPool) -> Result<Vec<DbAchievem
     )
 }
 
-pub async fn get_one_by_id(id: i32, language: Language, pool: &PgPool) -> Result<DbAchievement> {
+pub async fn get_one_by_id(
+    id: i32,
+    language: Language,
+    pool: &PgPool,
+) -> Result<Option<DbAchievement>> {
     let language = language.to_string();
 
     Ok(sqlx::query_file_as!(
@@ -69,7 +73,7 @@ pub async fn get_one_by_id(id: i32, language: Language, pool: &PgPool) -> Result
         id,
         language,
     )
-    .fetch_one(pool)
+    .fetch_optional(pool)
     .await?)
 }