fix(backend)!: fix API, see #94

Author: Eason0729

backend/src/endpoint/announcement.rs

@@ -17,6 +17,7 @@ impl<'a> From<WithAuth<'a, Model>> for AnnouncementFullInfo {
                 id: model.id,
                 title: model.title,
                 update_date: into_prost(model.update_at),
+                create_date: into_prost(model.create_at),
             },
             author_id: model.user_id,
             content: model.content,
@@ -34,6 +35,7 @@ impl From<Model> for AnnouncementInfo {
             id: value.id,
             title: value.title,
             update_date: into_prost(value.update_at),
+            create_date: into_prost(value.create_at),
         }
     }
 }
@@ -44,6 +46,7 @@ impl From<PartialModel> for AnnouncementInfo {
             id: value.id,
             title: value.title,
             update_date: into_prost(value.update_at),
+            create_date: into_prost(value.create_at),
         }
     }
 }

backend/src/endpoint/contest.rs

@@ -24,15 +24,6 @@ impl<'a> From<WithAuth<'a, Model>> for ContestFullInfo {
 
 impl WithAuthTrait for Model {}
 
-impl From<user_contest::Model> for UserRank {
-    fn from(value: user_contest::Model) -> Self {
-        UserRank {
-            user_id: value.user_id,
-            score: value.score,
-        }
-    }
-}
-
 impl From<Model> for ContestInfo {
     fn from(value: Model) -> Self {
         ContestInfo {
@@ -41,6 +32,7 @@ impl From<Model> for ContestInfo {
             begin: value.begin.map(into_prost),
             end: value.end.map(into_prost),
             need_password: value.password.is_some(),
+            public: value.public,
         }
     }
 }
@@ -53,6 +45,7 @@ impl From<PartialModel> for ContestInfo {
             begin: value.begin.map(into_prost),
             end: value.end.map(into_prost),
             need_password: value.password.is_some(),
+            public: value.public,
         }
     }
 }

backend/src/endpoint/problem.rs

@@ -21,6 +21,9 @@ impl<'a> From<WithAuth<'a, Model>> for ProblemFullInfo {
                 submit_count: model.submit_count,
                 ac_rate: model.ac_rate,
                 difficulty: model.difficulty,
+                create_at: into_prost(model.create_at),
+                update_at: into_prost(model.update_at),
+                public: model.public,
             },
             author: model.user_id,
             writable,
@@ -38,6 +41,9 @@ impl From<PartialModel> for ProblemInfo {
             submit_count: value.submit_count,
             ac_rate: value.ac_rate,
             difficulty: value.difficulty,
+            create_at: into_prost(value.create_at),
+            update_at: into_prost(value.update_at),
+            public: value.public,
         }
     }
 }

backend/src/endpoint/user.rs

@@ -19,19 +19,19 @@ impl<'a> From<WithAuth<'a, Model>> for UserFullInfo {
     }
 }
 
-impl WithAuthTrait for Model {}
-
 impl From<Model> for UserInfo {
     fn from(value: Model) -> Self {
-        UserInfo {
+        Self {
             username: value.username,
-            // FIXME: capture Error(database corruption?) instead!
-            score: value.score.try_into().unwrap_or_default(),
+            score: value.score as u64,
             id: value.id,
+            create_at: into_prost(value.create_at),
         }
     }
 }
 
+impl WithAuthTrait for Model {}
+
 #[async_trait]
 impl User for ArcServer {
     #[instrument(

backend/src/entity/announcement.rs

@@ -211,7 +211,6 @@ impl SortSource<PartialModel> for ColPagerTrait {
         match data.0 {
             Sort::UpdateDate => Column::UpdateAt,
             Sort::CreateDate => Column::CreateAt,
-            Sort::Public => Column::Public,
         }
     }
     fn get_val(data: &Self::Data) -> impl Into<Value> + Clone + Send {
@@ -221,7 +220,6 @@ impl SortSource<PartialModel> for ColPagerTrait {
         data.1 = match data.0 {
             Sort::UpdateDate => model.update_at.to_string(),
             Sort::CreateDate => model.create_at.to_string(),
-            Sort::Public => model.public.to_string(),
         }
     }
 }

backend/src/entity/contest.rs

@@ -252,23 +252,17 @@ impl Source for ColPagerTrait {
 impl SortSource<PartialModel> for ColPagerTrait {
     fn sort_col(data: &Self::Data) -> impl ColumnTrait {
         match data.0 {
-            Sort::UpdateDate => Column::UpdateAt,
-            Sort::CreateDate => Column::CreateAt,
             Sort::Begin => Column::Begin,
             Sort::End => Column::End,
-            Sort::Public => Column::Public,
         }
     }
     fn get_val(data: &Self::Data) -> impl Into<sea_orm::Value> + Clone + Send {
         &data.1
     }
     fn save_val(data: &mut Self::Data, model: &PartialModel) {
         data.1 = match data.0 {
-            Sort::UpdateDate => model.update_at.to_string(),
-            Sort::CreateDate => model.create_at.to_string(),
             Sort::Begin => model.begin.unwrap().to_string(),
             Sort::End => model.end.unwrap().to_string(),
-            Sort::Public => model.public.to_string(),
         }
     }
 }
@@ -294,7 +288,7 @@ impl Paginator {
         ))
     }
     pub fn new(start_from_end: bool) -> Self {
-        Self::new_sort(Sort::CreateDate, start_from_end)
+        Self::new_sort(Sort::Begin, start_from_end)
     }
 }
 

backend/src/entity/problem.rs

@@ -403,7 +403,6 @@ impl SortSource<PartialModel> for ColPagerTrait {
             Sort::SubmitCount => Column::SubmitCount,
             Sort::Difficulty => Column::Difficulty,
             Sort::Order => Column::Order,
-            Sort::Public => Column::Public,
         }
     }
     fn get_val(data: &Self::Data) -> impl Into<sea_orm::Value> + Clone + Send {
@@ -417,7 +416,6 @@ impl SortSource<PartialModel> for ColPagerTrait {
             Sort::SubmitCount => model.submit_count.to_string(),
             Sort::Difficulty => model.difficulty.to_string(),
             Sort::Order => model.order.to_string(),
-            Sort::Public => model.public.to_string(),
         }
     }
 }

grpc/proto/backend.proto

@@ -147,6 +147,9 @@ message ProblemInfo {
   // 3000 - inf  geek
   required uint32 difficulty = 5;
   required float ac_rate = 4;
+  required google.protobuf.Timestamp update_at = 6;
+  required google.protobuf.Timestamp create_at = 7;
+  required bool public = 8;
 }
 
 message ProblemFullInfo {
@@ -177,7 +180,7 @@ message ListProblemRequest {
     SORT_SUBMIT_COUNT = 3;
     SORT_DIFFICULTY = 4;
     SORT_ORDER = 5;
-    SORT_PUBLIC = 6;
+    // 6 is used
   }
   message Query {
     optional int32 contest_id = 1;
@@ -299,6 +302,7 @@ message AnnouncementInfo {
   required int32 id = 1;
   required string title = 2;
   required google.protobuf.Timestamp update_date = 3;
+  required google.protobuf.Timestamp create_date = 4;
 }
 
 message AnnouncementFullInfo {
@@ -358,7 +362,6 @@ message ListAnnouncementRequest {
   enum Sort {
     SORT_UPDATE_DATE = 0;
     SORT_CREATE_DATE = 1;
-    SORT_PUBLIC = 2;
   }
   message Query {
     optional Sort sort_by = 1;
@@ -591,6 +594,7 @@ message ContestInfo {
   optional google.protobuf.Timestamp begin = 4;
   optional google.protobuf.Timestamp end = 5;
   required bool need_password = 6;
+  required bool public = 7;
 }
 
 message ContestFullInfo {
@@ -645,17 +649,6 @@ message UpdateContestRequest {
   optional string request_id = 3;
 }
 
-message UserRank {
-  required int32 user_id = 1;
-  required uint32 score = 2;
-}
-
-message ListRankResponse {
-  repeated UserRank list = 1;
-  required string paginator = 2;
-  required uint64 remain = 3;
-}
-
 message JoinContestRequest {
   required int32 id = 1;
   optional string password = 2;
@@ -667,11 +660,9 @@ message JoinContestRequest {
 
 message ListContestRequest {
   enum Sort {
-    SORT_CREATE_DATE = 0;
-    SORT_UPDATE_DATE = 1;
     SORT_BEGIN = 2;
     SORT_END = 3;
-    SORT_PUBLIC = 4;
+    // leave 4, it's used 
   }
   message Query {
     optional Sort sort_by = 1;
@@ -720,6 +711,7 @@ message UserInfo {
   required string username = 1;
   required uint64 score = 4;
   required int32 id = 3;
+  required google.protobuf.Timestamp create_at = 5;
 }
 
 message UserFullInfo {