change: RPS ranking API response

Author: nebocco

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

@@ -1,12 +1,36 @@
 use super::{
-    LanguageRankingRequest, LanguageUserRankResponse, RankingRequestFormat, RankingResponse,
-    RankingSelector, UserRankRequest, UserRankSelector,
+    UserRankResponseFormat, RankingRequestFormat, RankingResponse, RankingSelector, UserRankRequest, UserRankSelector,
 };
 use crate::server::AppData;
 
 use actix_web::{error, web, Result};
 use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
 use sql_client::language_count::LanguageCountClient;
+use std::ops::Range;
+
+
+#[derive(Deserialize)]
+pub(crate) struct LanguageRankingRequest {
+    from: usize,
+    to: usize,
+    language: String,
+}
+
+impl RankingRequestFormat for LanguageRankingRequest {
+    fn range(&self) -> Range<usize> {
+        (self.from)..(self.to)
+    }
+}
+
+#[derive(Debug, Serialize)]
+pub(crate) struct LanguageUserRankResponse {
+    language: String,
+    count: i64,
+    rank: i64,
+}
+
+impl UserRankResponseFormat for LanguageUserRankResponse {}
 
 pub(crate) struct LanguageRanking;
 

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

@@ -3,7 +3,6 @@ use crate::server::AppData;
 use actix_web::{web, HttpRequest, HttpResponse, Result};
 use async_trait::async_trait;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use sql_client::models::UserSum;
 use std::ops::Range;
 
 pub(crate) mod ac_count;
@@ -77,7 +76,6 @@ pub(crate) trait UserRankSelector<A: Sync + Send + Clone + 'static> {
     }
 }
 
-// ranking requests
 #[derive(Deserialize)]
 pub(crate) struct RankingRequest {
     from: usize,
@@ -90,20 +88,6 @@ impl RankingRequestFormat for RankingRequest {
     }
 }
 
-#[derive(Deserialize)]
-pub(crate) struct LanguageRankingRequest {
-    from: usize,
-    to: usize,
-    language: String,
-}
-
-impl RankingRequestFormat for LanguageRankingRequest {
-    fn range(&self) -> Range<usize> {
-        (self.from)..(self.to)
-    }
-}
-
-// ranking responses
 #[derive(Serialize)]
 pub(crate) struct RankingResponse {
     user_id: String,
@@ -112,30 +96,17 @@ pub(crate) struct RankingResponse {
 
 impl RankingResponseFormat for RankingResponse {}
 
-impl RankingResponseFormat for UserSum {}
-
-// user rank requests
 #[derive(Deserialize)]
 pub(crate) struct UserRankRequest {
     user: String,
 }
 
 impl UserRankRequestFormat for UserRankRequest {}
 
-// user rank responses
 #[derive(Serialize)]
 pub(crate) struct UserRankResponse {
     count: i64,
     rank: i64,
 }
 
 impl UserRankResponseFormat for UserRankResponse {}
-
-#[derive(Debug, Serialize)]
-pub(crate) struct LanguageUserRankResponse {
-    language: String,
-    count: i64,
-    rank: i64,
-}
-
-impl UserRankResponseFormat for LanguageUserRankResponse {}

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

@@ -1,19 +1,29 @@
 use super::{
-    RankingRequest, RankingRequestFormat, RankingSelector, UserRankRequest, UserRankResponse,
-    UserRankSelector, UserSum,
+    RankingRequest, RankingRequestFormat, RankingSelector, UserRankRequest, UserRankResponse, UserRankSelector, RankingResponseFormat
 };
 use crate::server::AppData;
 
 use actix_web::{error, web, Result};
 use async_trait::async_trait;
 use sql_client::rated_point_sum::RatedPointSumClient;
+use serde::{Serialize};
+
+// will be deprecated and 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<A: Sync + Send + Clone + 'static> RankingSelector<A> for RatedPointSumRanking {
     type Request = RankingRequest;
-    type Response = UserSum;
+    type Response = RPSRankingResponse;
     async fn fetch(
         data: web::Data<AppData<A>>,
         query: Self::Request,
@@ -23,7 +33,14 @@ impl<A: Sync + Send + Clone + 'static> RankingSelector<A> for RatedPointSumRanki
             .load_rated_point_sum_in_range(query.range())
             .await
             .map_err(error::ErrorInternalServerError)?;
-        Ok(ranking)
+        Ok(ranking
+            .into_iter()
+            .map(|entry| RPSRankingResponse {
+                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

@@ -61,9 +61,9 @@ async fn test_rated_point_sum_ranking() {
     assert_eq!(
         response,
         json!([
-            {"user_id":"u2","point_sum":2},
-            {"user_id":"u1","point_sum":1},
-            {"user_id":"u3","point_sum":1}
+            {"user_id":"u2","point_sum":2,"count":2},
+            {"user_id":"u1","point_sum":1,"count":1},
+            {"user_id":"u3","point_sum":1,"count":1}
         ])
     );
 
@@ -79,8 +79,8 @@ async fn test_rated_point_sum_ranking() {
     assert_eq!(
         response,
         json!([
-            {"user_id":"u1","point_sum":1},
-            {"user_id":"u3","point_sum":1}
+            {"user_id":"u1","point_sum":1,"count":1},
+            {"user_id":"u3","point_sum":1,"count":1}
         ])
     );
     let response = reqwest::get(url(
@@ -95,7 +95,7 @@ async fn test_rated_point_sum_ranking() {
     assert_eq!(
         response,
         json!([
-            {"user_id":"u2","point_sum":2}
+            {"user_id":"u2","point_sum":2,"count":2}
         ])
     );
 

atcoder-problems-frontend/src/api/APIClient.ts

@@ -99,18 +99,8 @@ export const useUserStreakRank = (user: string) => {
 };
 
 export const useSumRanking = (from: number, to: number) => {
-  const fetcher = async (url: string) => {
-    const ranking = await fetchTypedArray<SumRankingEntry>(
-      url,
-      isSumRankingEntry
-    );
-    return ranking.map((entry) => ({
-      count: entry.point_sum,
-      user_id: entry.user_id,
-    }));
-  };
   const url = `${ATCODER_API_URL}/v3/rated_point_sum_ranking?from=${from}&to=${to}`;
-  return useSWRData(url, fetcher);
+  return useRankingV3(url);
 };
 
 export const useUserSumRank = (user: string) => {