editoast: add ViewError to fonts view

editoast/src/views/fonts.rs

@@ -2,20 +2,19 @@ use axum::extract::Path;
 use axum::extract::Request;
 use axum::extract::State;
 use axum::response::IntoResponse;
-use editoast_derive::EditoastError;
+use editoast_derive::ViewError;
 use thiserror::Error;
 use tower::ServiceExt as _;
 use tower_http::services::ServeFile;
 
 use crate::AppState;
 use crate::error::Result;
 
-#[derive(Debug, Error, EditoastError)]
-#[editoast_error(base_id = "fonts")]
-enum FontErrors {
-    #[error("File '{file}' not found")]
-    #[editoast_error(status = 404)]
-    FileNotFound { file: String },
+#[derive(Debug, Error, ViewError)]
+#[error("File '{file}' not found")]
+#[view_error(status = NOT_FOUND, context, path = fonts::file_not_found)]
+pub(in crate::views) struct FileNotFound {
+    file: String,
 }
 
 /// This endpoint is used by map libre to retrieve the fonts. They are separated by font and unicode block
@@ -29,27 +28,27 @@ enum FontErrors {
     ),
     responses(
         (status = 200, description = "Glyphs in PBF format of the font at the requested unicode block"),
-        (status = 404, description = "Font not found"),
+        FileNotFound,
     ),
 )]
 pub(in crate::views) async fn fonts(
     Path((font, file_name)): Path<(String, String)>,
     State(AppState { config, .. }): State<AppState>,
     request: Request,
-) -> Result<impl IntoResponse> {
+) -> Result<impl IntoResponse, FileNotFound> {
     let path = config
         .dynamic_assets_path
         .join(format!("fonts/glyphs/{font}/{file_name}"));
 
     if !path.is_file() {
-        return Err(FontErrors::FileNotFound { file: file_name }.into());
+        return Err(FileNotFound { file: file_name });
     }
 
     // Avoid path traversal attack by ensuring the path is within the dynamic assets directory
     let canonical_path = path.canonicalize().unwrap();
     let canonical_assets_path = config.dynamic_assets_path.canonicalize().unwrap();
     if !canonical_path.starts_with(&canonical_assets_path) {
-        return Err(FontErrors::FileNotFound { file: file_name }.into());
+        return Err(FileNotFound { file: file_name });
     }
 
     Ok(ServeFile::new(&path).oneshot(request).await)

front/public/locales/en/errors.json

@@ -83,19 +83,21 @@
       "MqClientError": "Core: MQ client error",
       "UnparsableErrorOutput": "Core returned an error in an unknown format"
     },
+    "database": {
+      "internal": "Internal error (database)"
+    },
     "delimited_area": {
       "InvalidLocations": "Some locations are invalid"
     },
     "document": {
-      "Database": "Internal error (database)",
-      "NotFound": "Document '{{document_key}}' not found"
+      "not_found": "Document '{{document_key}}' not found"
     },
     "electrical_profiles": {
       "Database": "Internal error (database)",
       "NotFound": "Electrical Profile Set '{{electrical_profile_set_id}}', could not be found"
     },
     "fonts": {
-      "FileNotFound": "File for the requested font not found"
+      "file_not_found": "File for the requested font not found"
     },
     "geometry": {
       "UnexpectedGeometry": "Expected geometry {{expected}} but got {{actual}}"

front/public/locales/fr/errors.json

@@ -83,19 +83,21 @@
       "MqClientError": "Core : erreur du client MQ",
       "UnparsableErrorOutput": "Core : a renvoyé une erreur dans un format inconnu"
     },
+    "database": {
+      "internal": "Erreur interne (base de données)"
+    },
     "delimited_area": {
       "InvalidLocations": "Certaines localisations sont invalides"
     },
     "document": {
-      "Database": "Erreur interne (base de données)",
-      "NotFound": "Document '{{document_key}}' non trouvé"
+      "not_found": "Document '{{document_key}}' non trouvé"
     },
     "electrical_profiles": {
       "Database": "Erreur interne (base de données)",
       "NotFound": "Profil électrique '{{electrical_profile_set_id}}' non trouvé"
     },
     "fonts": {
-      "FileNotFound": "Fichier pour la police de charactère demandée non trouvé"
+      "file_not_found": "Fichier pour la police de caractères demandée non trouvé"
     },
     "geometry": {
       "UnexpectedGeometry": "Géometrie {{expected}} attendue mais {{actual}} reçue"

osrd_schemas/osrd_schemas/models.py

@@ -984,20 +984,6 @@ class EditoastErrorInvalidInput(BaseModel):
     )
 
 
-class EditoastFontErrorsFileNotFoundContext(BaseModel):
-    file: str
-
-
-class EditoastFontErrorsFileNotFound(BaseModel):
-    context: Annotated[
-        EditoastFontErrorsFileNotFoundContext | None,
-        Field(title="EditoastFontErrorsFileNotFoundContext"),
-    ] = None
-    message: str
-    status: Literal[404] = 404
-    type: Literal["editoast:fonts:FileNotFound"] = "editoast:fonts:FileNotFound"
-
-
 class EditoastGeometryErrorUnexpectedGeometryContext(BaseModel):
     actual: str
     expected: str
@@ -4994,7 +4980,6 @@ class EditoastError(
         | EditoastErrorDatabase
         | EditoastErrorInfraNotFound
         | EditoastErrorInvalidInput
-        | EditoastFontErrorsFileNotFound
         | EditoastGeometryErrorUnexpectedGeometry
         | EditoastGetObjectsErrorsDuplicateIdsProvided
         | EditoastGetObjectsErrorsObjectIdNotFound
@@ -5172,7 +5157,6 @@ class EditoastError(
         | EditoastErrorDatabase
         | EditoastErrorInfraNotFound
         | EditoastErrorInvalidInput
-        | EditoastFontErrorsFileNotFound
         | EditoastGeometryErrorUnexpectedGeometry
         | EditoastGetObjectsErrorsDuplicateIdsProvided
         | EditoastGetObjectsErrorsObjectIdNotFound