feat: add updated db changes

lfglabs-dev · Apr 18, 2024 · 25bc1ed · 25bc1ed
1 parent 32d8bd8
commit 25bc1ed
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 36 deletions.
diff --git a/src/endpoints/get_quest.rs b/src/endpoints/get_quest.rs
@@ -25,11 +25,16 @@ pub async fn handler(
     Query(query): Query<GetQuestsQuery>,
 ) -> impl IntoResponse {
     let collection = state.db.collection::<QuestDocument>("quests");
+    let current_time = chrono::Utc::now().timestamp_millis();
+
     let pipeline = [
         doc! {
             "$match": {
                 "disabled": false,
-                "id": query.id
+                "id": query.id,
+                "start_time": doc! {
+                    "$lte": current_time
+                },
             }
         },
         doc! {
@@ -38,8 +43,18 @@ pub async fn handler(
                     "$cond": [
                         {
                             "$and": [
-                                { "$gte": ["$expiry", 0] },
-                                { "$lt": ["$expiry", "$$NOW"] },
+                               doc! {
+                                    "$gte": [
+                                        "$expiry",
+                                        0
+                                    ]
+                                },
+                                doc! {
+                                    "$lt": [
+                                        "$expiry",
+                                        "$$NOW"
+                                    ]
+                                }
                             ]
                         },
                         true,
@@ -57,8 +72,7 @@ pub async fn handler(
                     Ok(document) => {
                         if let Ok(mut quest) = from_document::<QuestDocument>(document) {
                             if let Some(expiry) = &quest.expiry {
-                                let timestamp = expiry.timestamp_millis().to_string();
-                                quest.expiry_timestamp = Some(timestamp);
+                                quest.expiry_timestamp = Some(expiry.to_string());
                             }
                             return (StatusCode::OK, Json(quest)).into_response();
                         }

diff --git a/src/endpoints/get_quest_participants.rs b/src/endpoints/get_quest_participants.rs
@@ -13,6 +13,7 @@ use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
 #[derive(Debug, Serialize, Deserialize)]
+
 pub struct GetQuestParticipantsQuery {
     quest_id: u32,
 }
@@ -48,30 +49,10 @@ pub async fn handler(
     let tasks_count = tasks_ids.len();
 
     let pipeline = vec![
-        doc! {
-            "$addFields": doc! {
-                "refactoredTimestamp": doc! {
-                    "$toDate": "$timestamp"
-                }
-            }
-        },
         doc! {
             "$match": {
-                "$expr": doc! {
-                    "$and": [
-                        doc! {
-                            "$in": [
-                                "$task_id",
-                                tasks_ids
-                            ]
-                        },
-                        doc! {
-                            "$lt": [
-                                "$refactoredTimestamp",
-                                "$$expiry"
-                            ]
-                        }
-                    ]
+                "task_id": {
+                    "$in": tasks_ids
                 }
             }
         },

diff --git a/src/endpoints/get_quests.rs b/src/endpoints/get_quests.rs
@@ -23,11 +23,15 @@ pub struct NFTItem {
 
 #[route(get, "/get_quests", crate::endpoints::get_quests)]
 pub async fn handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
+    let current_time = chrono::Utc::now().timestamp_millis();
+
     let pipeline = vec![
         doc! {
             "$match": {
                 "disabled": false,
-                "hidden": false,
+                 "start_time":  {
+                "$lte":current_time
+                }
             }
         },
         doc! {
@@ -36,8 +40,18 @@ pub async fn handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
                     "$cond": [
                         {
                             "$and": [
-                                { "$gte": ["$expiry", 0] },
-                                { "$lt": ["$expiry", "$$NOW"] },
+                                doc! {
+                                    "$gte": [
+                                        "$expiry",
+                                        0
+                                    ]
+                                },
+                                doc! {
+                                    "$lt": [
+                                        "$expiry",
+                                        "$$NOW"
+                                    ]
+                                }
                             ]
                         },
                         true,
@@ -57,8 +71,7 @@ pub async fn handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
                     Ok(document) => {
                         if let Ok(mut quest) = from_document::<QuestDocument>(document) {
                             if let Some(expiry) = &quest.expiry {
-                                let timestamp = expiry.timestamp_millis().to_string();
-                                quest.expiry_timestamp = Some(timestamp);
+                                quest.expiry_timestamp = Some(expiry.to_string());
                             }
                             quests.push(quest);
                         }

diff --git a/src/endpoints/get_trending_quests.rs b/src/endpoints/get_trending_quests.rs
@@ -30,12 +30,16 @@ pub async fn handler(
         Some(addr) => addr.to_string(),
         None => "".to_string(),
     };
+    let current_time = chrono::Utc::now().timestamp_millis();
+
     let mut pipeline = vec![
         doc! {
             "$match": {
                 "disabled": false,
-                "hidden": false,
                 "is_trending": true,
+                "start_time": doc! {
+                    "$lte": current_time
+                }
             }
         },
         doc! {

diff --git a/src/models.rs b/src/models.rs
@@ -1,4 +1,4 @@
-use mongodb::{bson, Database};
+use mongodb::{Database};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use starknet::{
@@ -34,13 +34,15 @@ pub_struct!(Debug, Serialize, Deserialize; QuestDocument {
     rewards_nfts: Vec<NFTItem>,
     img_card: String,
     title_card: String,
-    hidden: bool,
+    hidden: Option<bool>,
     disabled: bool,
-    expiry: Option<bson::DateTime>,
+        expiry: Option<i64>,
     expiry_timestamp: Option<String>,
     mandatory_domain: Option<String>,
     expired: Option<bool>,
     experience: i64,
+        start_time: i64,
+
 });
 
 pub_struct!(Deserialize; CompletedTasks {