feat: handle analytics data after expiry

lfglabs-dev · Mar 19, 2024 · 22b7dc1 · 22b7dc1
1 parent c293a20
commit 22b7dc1
Show file tree

Hide file tree

Showing 3 changed files with 144 additions and 20 deletions.
diff --git a/src/endpoints/analytics/get_quest_activity.rs b/src/endpoints/analytics/get_quest_activity.rs
@@ -17,9 +17,9 @@ pub struct GetQuestsQuery {
 }
 
 #[route(
-    get,
-    "/analytics/get_quest_activity",
-    crate::endpoints::analytics::get_quest_activity
+get,
+"/analytics/get_quest_activity",
+crate::endpoints::analytics::get_quest_activity
 )]
 pub async fn handler(
     State(state): State<Arc<AppState>>,
@@ -32,9 +32,29 @@ pub async fn handler(
                 "quest_id": quest_id
             }
         },
+        doc! {
+            "$lookup": doc! {
+                "from": "quests",
+                "localField": "quest_id",
+                "foreignField": "id",
+                "as": "questDetails"
+            }
+        },
+        doc! {
+            "$set": doc! {
+                "expiry": doc! {
+                    "$arrayElemAt": [
+                        "$questDetails.expiry",
+                        0
+                    ]
+                }
+            }
+        },
         doc! {
             "$group": doc! {
-                "_id": null,
+                "_id": doc! {
+                "expiry": "$expiry"
+            },
                 "ids": doc! {
                     "$push": "$id"
                 }
@@ -43,8 +63,39 @@ pub async fn handler(
         doc! {
             "$lookup": doc! {
                 "from": "completed_tasks",
-                "localField": "ids",
-                "foreignField": "task_id",
+                "let": doc! {
+                    "localIds": "$ids",
+                    "expiry": "$_id.expiry"
+                },
+                "pipeline": [
+                    doc! {
+                        "$addFields": doc! {
+                            "refactoredTimestamp": doc! {
+                                "$toDate": "$timestamp"
+                            }
+                        }
+                    },
+                    doc! {
+                        "$match": doc! {
+                            "$expr": doc! {
+                                "$and": [
+                                    doc! {
+                                        "$in": [
+                                            "$task_id",
+                                            "$$localIds"
+                                        ]
+                                    },
+                                    doc! {
+                                        "$lt": [
+                                            "$refactoredTimestamp",
+                                            "$$expiry"
+                                        ]
+                                    }
+                                ]
+                            }
+                        }
+                    }
+                ],
                 "as": "matching_documents"
             }
         },
@@ -138,7 +189,9 @@ pub async fn handler(
     {
         Ok(mut cursor) => {
             let mut day_wise_distribution = Vec::new();
+            println!("{:?}", cursor);
             while let Some(result) = cursor.next().await {
+                println!("{:?}", result);
                 match result {
                     Ok(document) => {
                         day_wise_distribution.push(document);

diff --git a/src/endpoints/analytics/get_quest_participation.rs b/src/endpoints/analytics/get_quest_participation.rs
@@ -32,9 +32,29 @@ pub async fn handler(
                 "quest_id": quest_id
             }
         },
+        doc! {
+            "$lookup": doc! {
+                "from": "quests",
+                "localField": "quest_id",
+                "foreignField": "id",
+                "as": "questDetails"
+            }
+        },
+        doc! {
+            "$set": doc! {
+                "expiry": doc! {
+                    "$arrayElemAt": [
+                        "$questDetails.expiry",
+                        0
+                    ]
+                }
+            }
+        },
         doc! {
             "$group": doc! {
-                "_id": null,
+                "_id": doc! {
+                    "expiry": "$expiry"
+                },
                 "ids": doc! {
                     "$push": "$id"
                 },
@@ -46,8 +66,39 @@ pub async fn handler(
         doc! {
             "$lookup": doc! {
                 "from": "completed_tasks",
-                "localField": "ids",
-                "foreignField": "task_id",
+                "let": doc! {
+                    "localIds": "$ids",
+                    "expiry": "$_id.expiry"
+                },
+                "pipeline": [
+                    doc! {
+                        "$addFields": doc! {
+                            "refactoredTimestamp": doc! {
+                                "$toDate": "$timestamp"
+                            }
+                        }
+                    },
+                    doc! {
+                        "$match": doc! {
+                            "$expr": doc! {
+                                "$and": [
+                                    doc! {
+                                        "$in": [
+                                            "$task_id",
+                                            "$$localIds"
+                                        ]
+                                    },
+                                    doc! {
+                                        "$lt": [
+                                            "$refactoredTimestamp",
+                                            "$$expiry"
+                                        ]
+                                    }
+                                ]
+                            }
+                        }
+                    }
+                ],
                 "as": "matching_documents"
             }
         },
@@ -93,7 +144,7 @@ pub async fn handler(
                         "$matching_documents",
                         "$otherDetails",
                         doc! {
-                            "participants": "$count"
+                            "count": "$count"
                         }
                     ]
                 }
@@ -102,17 +153,18 @@ pub async fn handler(
         doc! {
             "$project": doc! {
                 "otherDetails": 0,
-                    "_id":0,
-                    "verify_endpoint": 0,
-                    "verify_endpoint_type": 0,
-                    "verify_redirect":0,
+                "_id":0,
+                "verify_endpoint": 0,
+                "verify_endpoint_type": 0,
+                "verify_redirect":0,
                 "href": 0,
                 "cta": 0,
                 "id": 0,
                 "quest_id": 0,
-
-            }
-        },
+                "questDetails": 0,
+                "expiry":0
+              }
+          },
     ];
 
     match state

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