fix(analytics): use feature name instead of feature id

Author: gagantrivedi

src/flagsmith/analytics.rs

@@ -10,8 +10,8 @@ static ANALYTICS_TIMER_IN_MILLI: u64 = 10 * 1000;
 
 #[derive(Clone, Debug)]
 pub struct AnalyticsProcessor {
-    pub tx: Sender<u32>,
-    _analytics_data: Arc<RwLock<HashMap<u32, u32>>>,
+    pub tx: Sender<String>,
+    _analytics_data: Arc<RwLock<HashMap<String, u32>>>,
 }
 
 impl AnalyticsProcessor {
@@ -21,7 +21,7 @@ impl AnalyticsProcessor {
         timeout: std::time::Duration,
         timer: Option<u64>,
     ) -> Self {
-        let (tx, rx) = mpsc::channel::<u32>();
+        let (tx, rx) = mpsc::channel::<String>();
         let client = reqwest::blocking::Client::builder()
             .default_headers(headers)
             .timeout(timeout)
@@ -30,7 +30,7 @@ impl AnalyticsProcessor {
         let analytics_endpoint = format!("{}analytics/flags/", api_url);
         let timer = timer.unwrap_or(ANALYTICS_TIMER_IN_MILLI);
 
-        let analytics_data_arc: Arc<RwLock<HashMap<u32, u32>>> =
+        let analytics_data_arc: Arc<RwLock<HashMap<String, u32>>> =
             Arc::new(RwLock::new(HashMap::new()));
 
         let analytics_data_locked = Arc::clone(&analytics_data_arc);
@@ -43,9 +43,9 @@ impl AnalyticsProcessor {
                     let mut analytics_data = analytics_data_locked.write().unwrap();
                     match data {
                         // Update the analytics data with feature_id received
-                        Ok(feature_id) => {
+                        Ok(feature_name) => {
                             analytics_data
-                                .entry(feature_id)
+                                .entry(feature_name)
                                 .and_modify(|e| *e += 1)
                                 .or_insert(1);
                         }
@@ -69,14 +69,14 @@ impl AnalyticsProcessor {
             _analytics_data: Arc::clone(&analytics_data_arc),
         };
     }
-    pub fn track_feature(&self, feature_id: u32) {
-        self.tx.send(feature_id).unwrap();
+    pub fn track_feature(&self, feature_name: &str) {
+        self.tx.send(feature_name.to_string()).unwrap();
     }
 }
 
 fn flush(
     client: &reqwest::blocking::Client,
-    analytics_data: &HashMap<u32, u32>,
+    analytics_data: &HashMap<String, u32>,
     analytics_endpoint: &str,
 ) {
     if analytics_data.len() == 0 {
@@ -98,7 +98,7 @@ mod tests {
     #[test]
     fn track_feature_updates_analytics_data() {
         // Given
-        let feature_1 = 1;
+        let feature_1 = "feature_1";
         let processor = AnalyticsProcessor::new(
             "http://localhost".to_string(),
             header::HeaderMap::new(),
@@ -112,20 +112,20 @@ mod tests {
         thread::sleep(std::time::Duration::from_millis(50));
         let analytics_data = processor._analytics_data.read().unwrap();
         // Then, verify that analytics_data was updated correctly
-        assert_eq!(analytics_data[&feature_1], 2);
+        assert_eq!(analytics_data[feature_1], 2);
     }
 
     #[test]
     fn test_analytics_processor() {
         // Given
-        let feature_1 = 1;
-        let feature_2 = 2;
+        let feature_1 = "feature_1";
+        let feature_2 = "feature_2";
         let server = MockServer::start();
         let first_invocation_mock = server.mock(|when, then| {
             when.method(POST)
                 .path("/api/v1/analytics/flags/")
                 .header("X-Environment-Key", "ser.UiYoRr6zUjiFBUXaRwo7b5")
-                .json_body(serde_json::json!({feature_1.to_string():10, feature_2.to_string():10}));
+                .json_body(serde_json::json!({feature_1:10, feature_2:10}));
             then.status(200).header("content-type", "application/json");
         });
         let mut headers = header::HeaderMap::new();
@@ -143,8 +143,8 @@ mod tests {
         );
         // Now, let's update the analytics data
         let mut analytics_data = processor._analytics_data.write().unwrap();
-        analytics_data.insert(1, 10);
-        analytics_data.insert(2, 10);
+        analytics_data.insert(feature_1.to_string(), 10);
+        analytics_data.insert(feature_2.to_string(), 10);
         // drop the analytics data to release the lock
         drop(analytics_data);
         // Next, let's sleep a little to let the processor flush the data

src/flagsmith/models.rs

@@ -141,7 +141,7 @@ impl Flags {
                         .as_ref()
                         .unwrap()
                         .tx
-                        .send(flag.feature_id);
+                        .send(flag.feature_name.clone());
                 };
                 return Ok(flag.clone());
             }