Switch Heatmaps to be for each side respectively

The analysis and storage now contain two different heatmaps for the CT and T sides respectively.

However on the frontend I currently just have them all listed out with the side as a prefix, which is
not very useful and we should more change the data structure to essentially send the two heatmaps for
a player as a single data structure and then in the view display them side by side. However I am not
100% how to best achieve this

backend/src/analysis/heatmap.rs

@@ -22,7 +22,7 @@ impl Analysis for HeatmapAnalysis {
     let result = analysis::heatmap::parse(&config, &mmap).unwrap();
 
     tracing::info!("Got {} Entity-Heatmaps", result.player_heatmaps.len());
-    let heatmap_result: Vec<_> = result.player_heatmaps.into_iter().filter_map(|(userid, heatmap)| {
+    let heatmap_result: Vec<_> = result.player_heatmaps.into_iter().filter_map(|((userid, team), heatmap)| {
         let player = match result.player_info.get(&userid) {
             Some(p) => p,
             None => {
@@ -31,15 +31,16 @@ impl Analysis for HeatmapAnalysis {
             }
         };
         
-        Some((player.xuid.to_string(), heatmap))
+        Some(((player.xuid.to_string(), team), heatmap))
     }).collect();
 
-        let player_heatmaps: Vec<_> = heatmap_result.into_iter().map(|(player, heatmap)| {
-            tracing::trace!("HeatMap for Player: {:?}", player);
+        let player_heatmaps: Vec<_> = heatmap_result.into_iter().map(|((player, team), heatmap)| {
+            tracing::trace!("HeatMap for Player: {:?} in Team {:?}", player, team);
 
             crate::models::DemoPlayerHeatmap {
                 demo_id: input.demoid.clone(),
                 steam_id: player,
+                team,
                 data: serde_json::to_string(&heatmap).unwrap(),
             }
         }).collect();
@@ -47,7 +48,7 @@ impl Analysis for HeatmapAnalysis {
         Ok(Box::new(move |connection| {
             let store_demo_player_heatmaps_query = diesel::dsl::insert_into(crate::schema::demo_heatmaps::dsl::demo_heatmaps)
             .values(player_heatmaps)
-            .on_conflict((crate::schema::demo_heatmaps::dsl::demo_id, crate::schema::demo_heatmaps::dsl::steam_id))
+            .on_conflict((crate::schema::demo_heatmaps::dsl::demo_id, crate::schema::demo_heatmaps::dsl::steam_id, crate::schema::demo_heatmaps::dsl::team))
             .do_update()
             .set(crate::schema::demo_heatmaps::dsl::data.eq(diesel::upsert::excluded(crate::schema::demo_heatmaps::dsl::data)));
 

backend/src/api/demos.rs

@@ -305,6 +305,7 @@ async fn heatmap(
     };
 
     let data: Vec<common::demo_analysis::PlayerHeatmap> = result.into_iter().map(|(player, heatmap)| {
+        let team = heatmap.team.clone();
         let mut heatmap: analysis::heatmap::HeatMap = serde_json::from_str(&heatmap.data).unwrap();
         heatmap.fit(minimap_coords.x_coord(0.0)..minimap_coords.x_coord(1024.0), minimap_coords.y_coord(1024.0)..minimap_coords.y_coord(0.0));
         let h_image = heatmap.as_image();
@@ -314,6 +315,7 @@ async fn heatmap(
 
         common::demo_analysis::PlayerHeatmap {
             name: player.name,
+            team,
             png_data: base64::prelude::BASE64_STANDARD.encode(buffer.into_inner()),
         }
     }).collect();

backend/src/models.rs

@@ -95,6 +95,7 @@ pub struct AnalysisTask {
 pub struct DemoPlayerHeatmap {
     pub demo_id: String,
     pub steam_id: String,
+    pub team: String,
     pub data: String,
 }
 

backend/src/schema.rs

@@ -9,9 +9,10 @@ diesel::table! {
 }
 
 diesel::table! {
-    demo_heatmaps (demo_id, steam_id) {
+    demo_heatmaps (demo_id, steam_id, team) {
         demo_id -> Text,
         steam_id -> Text,
+        team -> Text,
         data -> Text,
     }
 }