Project Analytics Refactor

app/Cargo.toml

@@ -27,7 +27,8 @@ async-graphql = { version = "5.0.4", features = [
   "apollo_tracing",
 ] }
 async-graphql-poem = "5.0.3"
-serde = { version = "1.0.152", features = ["derive"] }
+serde = { version = "1.0.188", features = ["derive"] }
+serde_derive = { version = "1.0.188" }
 serde_json = { version = "1.0.91" }
 prost = "0.11.6"
 cube-client = { version = "0.1.2", git = "https://github.com/holaplex/cube-client", branch = "dev" }

app/src/cube_client.rs

@@ -9,6 +9,7 @@ use hub_core::{
     clap, thiserror,
     url::Url,
 };
+use serde::de::DeserializeOwned;
 
 /// Arguments for establishing a database connection
 #[derive(Clone, Debug, clap::Args)]
@@ -49,13 +50,22 @@ impl Client {
     ///
     /// # Errors
     /// This function fails if query parameters are invalid or Cube is not responding
-    pub async fn query(&self, query: Query) -> Result<String, CubeClientError> {
+    pub async fn query<T: DeserializeOwned>(
+        &self,
+        query: Query,
+    ) -> Result<Vec<T>, CubeClientError> {
         let request = V1LoadRequest {
             query: Some(query.build()),
             query_type: Some("multi".to_string()),
         };
 
         let response = cube_api::load_v1(&self.0, Some(request)).await?;
-        Ok(serde_json::to_string(&response)?)
+
+        response.results[0]
+            .data
+            .iter()
+            .map(|value| serde_json::from_value(value.clone()))
+            .collect::<Result<Vec<T>, serde_json::Error>>()
+            .map_err(Into::into)
     }
 }

app/src/entities/customers.rs

@@ -1,7 +1,22 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1
 
+use async_graphql::Enum;
 use sea_orm::entity::prelude::*;
 
+#[derive(Clone, Copy, Enum, Debug, PartialEq, Eq)]
+#[graphql(name = "CustomerDimension")]
+pub enum Dimension {
+    ProjectId,
+}
+
+impl ToString for Dimension {
+    fn to_string(&self) -> String {
+        match self {
+            Self::ProjectId => String::from("mints.project_id"),
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "customers")]
 pub struct Model {

app/src/entities/mints.rs

@@ -1,7 +1,24 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.1
 
+use async_graphql::Enum;
 use sea_orm::entity::prelude::*;
 
+#[derive(Clone, Copy, Enum, Debug, PartialEq, Eq)]
+#[graphql(name = "MintDimension")]
+pub enum Dimension {
+    ProjectId,
+    CollectionId,
+}
+
+impl ToString for Dimension {
+    fn to_string(&self) -> String {
+        match self {
+            Self::ProjectId => String::from("mints.project_id"),
+            Self::CollectionId => String::from("mints.collection_id"),
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "mints")]
 pub struct Model {

app/src/graphql/objects/collection.rs

@@ -1,10 +1,7 @@
 use async_graphql::{ComplexObject, Context, Result, SimpleObject};
 use hub_core::uuid::Uuid;
 
-use crate::graphql::{
-    objects::{DataPoint, Interval, Order},
-    queries::analytics::Query,
-};
+use crate::graphql::objects::{Interval, Order};
 
 #[derive(Debug, Clone, SimpleObject)]
 #[graphql(complex)]
@@ -15,24 +12,13 @@
 
 #[ComplexObject]
 impl Collection {
-    #[allow(clippy::too_many_arguments)]
     async fn analytics(
         &self,
-        ctx: &Context<'_>,
-        interval: Option<Interval>,
-        order: Option<Order>,
-        limit: Option<i32>,
-    ) -> Result<Vec<DataPoint>> {
-        Query::analytics(
-            &Query,
-            ctx,
-            None,
-            None,
-            Some(self.id),
-            interval,
-            order,
-            limit,
-        )
-        .await
+        _ctx: &Context<'_>,
+        _interval: Option<Interval>,
+        _order: Option<Order>,
+        _limit: Option<i32>,
+    ) -> Result<String> {
+        Ok(String::new())
     }
 }