refactor: newtyped ID and nice session parsing

Cargo.toml

@@ -35,7 +35,7 @@ aws-config = { version = "1.5.13", features = ["behavior-version-latest"] }
 aws-sdk-ec2 = "1.116.0"
 aws-sdk-s3 = { version = "1.68.0", features = ["behavior-version-latest"] }
 axum = "0.7"
-axum-extra = { version = "0.9", features = ["typed-header"] }
+axum-extra = { version = "0.9", features = ["cookie", "typed-header"] }
 base64 = "0.22.1"
 bcrypt = "0.15"
 bollard = "0.18.1"

app/backend_app/src/di.rs

@@ -117,15 +117,13 @@ type AuthSvc = AuthenticationService<
 type ProblemSvc = ProblemService<
     ProblemRepositoryImpl,
     UserRepositoryImpl,
-    SessionRepositoryImpl,
     TestcaseRepositoryImpl,
     ProcedureRepositoryImpl,
     RegistryServerImpl,
     DepNameRepositoryImpl,
 >;
 type UserSvc = UserService<
     UserRepositoryImpl,
-    SessionRepositoryImpl,
     AuthRepositoryImpl,
     IconRepositoryImpl,
     ProblemRepositoryImpl,
@@ -134,7 +132,6 @@ type UserSvc = UserService<
 >;
 type IconSvc = IconService<IconRepositoryImpl>;
 type SubmissionSvc = SubmissionService<
-    SessionRepositoryImpl,
     UserRepositoryImpl,
     SubmissionRepositoryImpl,
     ProblemRepositoryImpl,
@@ -148,7 +145,6 @@ type EditorialSvc =
     EditorialService<SessionRepositoryImpl, EditorialRepositoryImpl, ProblemRepositoryImpl>;
 type TestcaseSvc = TestcaseService<
     ProblemRepositoryImpl,
-    SessionRepositoryImpl,
     TestcaseRepositoryImpl,
     ProcedureRepositoryImpl,
     RegistryClientImpl,
@@ -176,6 +172,7 @@ pub struct DiContainer {
     google_oauth2_service: GoogleOAuth2Svc,
     github_oauth2_service: GitHubOAuth2Svc,
     traq_oauth2_service: TraqOAuth2Svc,
+    session_repository: SessionRepositoryImpl,
 }
 
 impl DiContainer {
@@ -213,15 +210,13 @@ impl DiContainer {
             problem_service: ProblemService::new(
                 provider.provide_problem_repository(),
                 provider.provide_user_repository(),
-                provider.provide_session_repository(),
                 provider.provide_testcase_repository(),
                 provider.provide_procedure_repository(),
                 pr_server.clone(),
                 provider.provide_dep_name_repository(),
             ),
             user_service: UserService::new(
                 provider.provide_user_repository(),
-                provider.provide_session_repository(),
                 provider.provide_auth_repository(),
                 provider.provide_icon_repository(),
                 provider.provide_problem_repository(),
@@ -230,7 +225,6 @@ impl DiContainer {
             ),
             icon_service: IconService::new(provider.provide_icon_repository()),
             submission_service: std::sync::Arc::new(SubmissionService::new(
-                provider.provide_session_repository(),
                 provider.provide_user_repository(),
                 provider.provide_submission_repository(),
                 provider.provide_problem_repository(),
@@ -247,7 +241,6 @@ impl DiContainer {
             ),
             testcase_service: TestcaseService::new(
                 provider.provide_problem_repository(),
-                provider.provide_session_repository(),
                 provider.provide_testcase_repository(),
                 provider.provide_procedure_repository(),
                 pr_client,
@@ -270,6 +263,7 @@ impl DiContainer {
                 provider.provide_session_repository(),
                 provider.provide_user_repository(),
             ),
+            session_repository: provider.provide_session_repository(),
         }
     }
 
@@ -316,4 +310,8 @@ impl DiContainer {
     pub fn traq_oauth2_service(&self) -> &TraqOAuth2Svc {
         &self.traq_oauth2_service
     }
+
+    pub fn session_repository(&self) -> &SessionRepositoryImpl {
+        &self.session_repository
+    }
 }

app/backend_app/src/extractor.rs

@@ -0,0 +1 @@
+pub mod session;

app/backend_app/src/extractor/session.rs

@@ -0,0 +1,35 @@
+use crate::di::DiContainer;
+use axum::{
+    async_trait,
+    extract::FromRequestParts,
+    http::{StatusCode, request::Parts},
+};
+use axum_extra::extract::cookie::CookieJar;
+use domain::{model::session::SessionUser, repository::session::SessionRepository};
+
+pub struct ExtractedSessionUser(pub Option<SessionUser>);
+
+#[async_trait]
+impl FromRequestParts<DiContainer> for ExtractedSessionUser {
+    type Rejection = (StatusCode, &'static str);
+
+    async fn from_request_parts(
+        parts: &mut Parts,
+        di_container: &DiContainer,
+    ) -> Result<Self, Self::Rejection> {
+        let jar = CookieJar::from_request_parts(parts, di_container)
+            .await
+            .map_err(|_| (StatusCode::BAD_REQUEST, "Invalid Cookie header"))?;
+
+        if let Some(session_id) = jar.get("session_id") {
+            let session_user = di_container
+                .session_repository()
+                .get_session_user(session_id.value())
+                .await
+                .map_err(|_| (StatusCode::INTERNAL_SERVER_ERROR, "Session retrieval error"))?;
+            Ok(ExtractedSessionUser(session_user))
+        } else {
+            Ok(ExtractedSessionUser(None))
+        }
+    }
+}

app/backend_app/src/handler/editorial.rs

@@ -1,3 +1,4 @@
+use crate::extractor::session::ExtractedSessionUser;
 use crate::model::editorials::{CreateEditorial, EditorialResponse, UpdateEditorial};
 use crate::model::error::AppError;
 use crate::{di::DiContainer, model::editorials::EditorialSummaryResponse};
@@ -7,18 +8,20 @@ use axum::{
     http::StatusCode,
     response::IntoResponse,
 };
-use axum_extra::{TypedHeader, headers::Cookie};
 
 pub async fn get_editorial(
     State(di_container): State<DiContainer>,
     Path(editorial_id): Path<String>,
-    TypedHeader(cookie): TypedHeader<Cookie>,
+    ExtractedSessionUser(session_user): ExtractedSessionUser,
 ) -> Result<impl IntoResponse, StatusCode> {
-    let session_id = cookie.get("session_id");
-
     match di_container
         .editorial_service()
-        .get_editorial(session_id, editorial_id)
+        .get_editorial(
+            session_user,
+            uuid::Uuid::parse_str(&editorial_id)
+                .map_err(|_| StatusCode::BAD_REQUEST)?
+                .into(),
+        )
         .await
     {
         Ok(editorial) => {
@@ -32,13 +35,17 @@ pub async fn get_editorial(
 pub async fn get_editorials(
     State(di_container): State<DiContainer>,
     Path(problem_id): Path<String>,
-    TypedHeader(cookie): TypedHeader<Cookie>,
+    ExtractedSessionUser(session_user): ExtractedSessionUser,
 ) -> Result<impl IntoResponse, StatusCode> {
-    let session_id = cookie.get("session_id");
-
     match di_container
         .editorial_service()
-        .get_editorials(session_id, problem_id)
+        .get_editorials(
+            session_user,
+            problem_id
+                .parse::<i64>()
+                .map_err(|_| StatusCode::BAD_REQUEST)?
+                .into(),
+        )
         .await
     {
         Ok(editorials) => {
@@ -52,15 +59,20 @@ pub async fn get_editorials(
 
 pub async fn post_editorial(
     State(di_container): State<DiContainer>,
-    TypedHeader(cookie): TypedHeader<Cookie>,
+    ExtractedSessionUser(session_user): ExtractedSessionUser,
     Path(problem_id): Path<String>,
     Json(query): Json<CreateEditorial>,
 ) -> Result<impl IntoResponse, StatusCode> {
-    let session_id = cookie.get("session_id");
-
     match di_container
         .editorial_service()
-        .post_editorial(session_id, problem_id, query.into())
+        .post_editorial(
+            session_user,
+            problem_id
+                .parse::<i64>()
+                .map_err(|_| StatusCode::BAD_REQUEST)?
+                .into(),
+            query.into(),
+        )
         .await
     {
         Ok(editorial) => {
@@ -74,14 +86,18 @@ pub async fn post_editorial(
 pub async fn put_editorial(
     State(di_container): State<DiContainer>,
     Path(editorial_id): Path<String>,
-    TypedHeader(cookie): TypedHeader<Cookie>,
+    ExtractedSessionUser(session_user): ExtractedSessionUser,
     Json(query): Json<UpdateEditorial>,
 ) -> Result<impl IntoResponse, StatusCode> {
-    let session_id = cookie.get("session_id");
-
     match di_container
         .editorial_service()
-        .put_editorial(session_id, editorial_id, query.into())
+        .put_editorial(
+            session_user,
+            uuid::Uuid::parse_str(&editorial_id)
+                .map_err(|_| StatusCode::BAD_REQUEST)?
+                .into(),
+            query.into(),
+        )
         .await
     {
         Ok(_) => Ok(StatusCode::NO_CONTENT),
@@ -92,13 +108,16 @@ pub async fn put_editorial(
 pub async fn delete_editorial(
     State(di_container): State<DiContainer>,
     Path(editorial_id): Path<String>,
-    TypedHeader(cookie): TypedHeader<Cookie>,
+    ExtractedSessionUser(session_user): ExtractedSessionUser,
 ) -> Result<impl IntoResponse, StatusCode> {
-    let session_id = cookie.get("session_id");
-
     match di_container
         .editorial_service()
-        .delete_editorial(session_id, editorial_id)
+        .delete_editorial(
+            session_user,
+            uuid::Uuid::parse_str(&editorial_id)
+                .map_err(|_| StatusCode::BAD_REQUEST)?
+                .into(),
+        )
         .await
     {
         Ok(_) => Ok(StatusCode::NO_CONTENT),

app/backend_app/src/handler/icon.rs

@@ -8,9 +8,14 @@ use crate::{di::DiContainer, model::error::AppError};
 
 pub async fn get_icon(
     State(di_container): State<DiContainer>,
-    Path(icon_uuid): Path<String>,
+    Path(icon_uuid_str): Path<String>,
 ) -> Result<impl IntoResponse, StatusCode> {
-    match di_container.icon_service().get_icon(icon_uuid).await {
+    let icon_uuid = match uuid::Uuid::parse_str(&icon_uuid_str) {
+        Ok(u) => u,
+        Err(_) => return Err(StatusCode::BAD_REQUEST),
+    };
+    let icon_id = icon_uuid.into();
+    match di_container.icon_service().get_icon(icon_id).await {
         Ok(icon) => {
             let mut headers = HeaderMap::new();
             headers.insert("Content-Type", icon.content_type.parse().unwrap());