modify: Format change in RPS ranking API

Author: nebocco

atcoder-problems-backend/src/server/ranking/rated_point_sum.rs

@@ -1,42 +1,28 @@
 use super::{
-    RankingRequest, RankingRequestFormat, RankingResponseFormat, RankingSelector, UserRankRequest,
+    RankingRequest, RankingRequestFormat, RankingResponse, RankingSelector, UserRankRequest,
     UserRankResponse, UserRankSelector,
 };
 
 use actix_web::{error, web, Result};
 use async_trait::async_trait;
-use serde::Serialize;
 use sql_client::{rated_point_sum::RatedPointSumClient, PgPool};
 
-#[deprecated(
-    note = "this special Response type is deprecated and will be replaced with super::RankingResponse"
-)]
-#[derive(Debug, Serialize)]
-pub(crate) struct RPSRankingResponse {
-    user_id: String,
-    count: i64,
-    point_sum: i64,
-}
-
-impl RankingResponseFormat for RPSRankingResponse {}
-
 pub(crate) struct RatedPointSumRanking;
 
 #[async_trait(?Send)]
 impl RankingSelector for RatedPointSumRanking {
     type Request = RankingRequest;
-    type Response = RPSRankingResponse;
+    type Response = RankingResponse;
     async fn fetch(pool: web::Data<PgPool>, query: Self::Request) -> Result<Vec<Self::Response>> {
         let ranking = pool
             .load_rated_point_sum_in_range(query.range())
             .await
             .map_err(error::ErrorInternalServerError)?;
         Ok(ranking
             .into_iter()
-            .map(|entry| RPSRankingResponse {
+            .map(|entry| RankingResponse {
                 user_id: entry.user_id,
                 count: entry.point_sum,
-                point_sum: entry.point_sum,
             })
             .collect())
     }

atcoder-problems-backend/tests/test_server_e2e_rated_point_sum_ranking.rs

@@ -34,9 +34,9 @@ async fn test_rated_point_sum_ranking() {
     assert_eq!(
         response,
         json!([
-            {"user_id":"u2","point_sum":2,"count":2},
-            {"user_id":"u1","point_sum":1,"count":1},
-            {"user_id":"u3","point_sum":1,"count":1}
+            {"user_id":"u2","count":2},
+            {"user_id":"u1","count":1},
+            {"user_id":"u3","count":1}
         ])
     );
 
@@ -48,8 +48,8 @@ async fn test_rated_point_sum_ranking() {
     assert_eq!(
         response,
         json!([
-            {"user_id":"u1","point_sum":1,"count":1},
-            {"user_id":"u3","point_sum":1,"count":1}
+            {"user_id":"u1","count":1},
+            {"user_id":"u3","count":1}
         ])
     );
 
@@ -61,7 +61,7 @@ async fn test_rated_point_sum_ranking() {
     assert_eq!(
         response,
         json!([
-            {"user_id":"u2","point_sum":2,"count":2}
+            {"user_id":"u2","count":2}
         ])
     );