Remove API /results

Author: nebocco

atcoder-problems-backend/src/server/services.rs

@@ -11,8 +11,7 @@ use crate::server::{
     user_info::get_user_info,
     user_submissions::get_user_submission_count,
     user_submissions::{
-        get_recent_submissions, get_user_submissions, get_user_submissions_from_time,
-        get_users_time_submissions,
+        get_recent_submissions, get_user_submissions_from_time, get_users_time_submissions,
     },
 };
 
@@ -43,7 +42,6 @@ pub fn config_services(cfg: &mut web::ServiceConfig) {
         .service(endpoint::internal_api::progress_reset::delete_progress_reset_item)
         .service(
             web::scope("/atcoder-api")
-                .service(web::resource("/results").route(web::get().to(get_user_submissions)))
                 .service(
                     web::scope("/v2")
                         .service(web::resource("/user_info").route(web::get().to(get_user_info))),

atcoder-problems-backend/src/server/user_submissions.rs

@@ -1,5 +1,4 @@
 use crate::server::MakeCors;
-use actix_web::http::header::CACHE_CONTROL;
 use actix_web::{error, web, HttpRequest, HttpResponse, Result};
 use serde::{Deserialize, Serialize};
 use sql_client::submission_client::{SubmissionClient, SubmissionRequest};
@@ -14,23 +13,6 @@ pub(crate) struct GetUserSubmissionQuery {
     to_second: Option<i64>,
 }
 
-pub(crate) async fn get_user_submissions(
-    _request: HttpRequest,
-    pool: web::Data<PgPool>,
-    query: web::Query<GetUserSubmissionQuery>,
-) -> Result<HttpResponse> {
-    let user_id = &query.user;
-    let submissions = pool
-        .get_submissions(SubmissionRequest::UserAll { user_id })
-        .await
-        .map_err(error::ErrorInternalServerError)?;
-    let response = HttpResponse::Ok()
-        .make_cors()
-        .insert_header((CACHE_CONTROL, "max-age=300"))
-        .json(&submissions);
-    Ok(response)
-}
-
 pub(crate) async fn get_user_submissions_from_time(
     _request: HttpRequest,
     pool: web::Data<PgPool>,

atcoder-problems-backend/tests/test_server_e2e_submissions.rs

@@ -1,5 +1,4 @@
 use actix_web::{http::StatusCode, test, App};
-use atcoder_problems_backend::server::config_services;
 use serde_json::Value;
 use sql_client::models::Submission;
 use sql_client::PgPool;
@@ -36,35 +35,6 @@ async fn prepare_data_set(conn: &PgPool) {
     .unwrap();
 }
 
-#[actix_web::test]
-async fn test_user_submissions() {
-    let pg_pool = utils::initialize_and_connect_to_test_sql().await;
-    prepare_data_set(&pg_pool).await;
-
-    let app = test::init_service(
-        App::new()
-            .app_data(actix_web::web::Data::new(pg_pool))
-            .configure(config_services),
-    )
-    .await;
-
-    let request = test::TestRequest::get()
-        .uri("/atcoder-api/results?user=u1")
-        .to_request();
-    let submissions: Vec<Submission> = test::call_and_read_body_json(&app, request).await;
-
-    assert_eq!(submissions.len(), 5);
-    assert!(submissions.iter().all(|s| s.user_id == "u1"));
-
-    let response = test::TestRequest::get()
-        .uri("/atcoder-api/results?user=u2")
-        .to_request();
-    let submissions: Vec<Submission> = test::call_and_read_body_json(&app, response).await;
-
-    assert_eq!(submissions.len(), 5);
-    assert!(submissions.iter().all(|s| s.user_id == "u2"));
-}
-
 #[actix_web::test]
 async fn test_user_submissions_fromtime() {
     let pg_pool = utils::initialize_and_connect_to_test_sql().await;
@@ -186,7 +156,7 @@ async fn test_invalid_path() {
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
 
     let response = test::TestRequest::get()
-        .uri("/atcoder-api/results")
+        .uri("/atcoder-api/v3/user/submissions")
         .send_request(&app)
         .await;
 
@@ -256,7 +226,7 @@ async fn test_cors() {
     );
 
     let response = test::TestRequest::get()
-        .uri("/atcoder-api/results?user=u1")
+        .uri("/atcoder-api/v3/user/submissions?user=u1&from_second=0")
         .send_request(&app)
         .await;