fix: client id should be optional (#324)

Author: sagoez

api/src/logic/connection_definition.rs

@@ -450,7 +450,10 @@ pub async fn get_available_connectors(
                 "ownership.buildableId": user_event_access.ownership.id.to_string(),
             })
             .await
-            .unwrap();
+            .map_err(|e| {
+                error!("Error reading from settings: {e}");
+                e
+            })?;
 
         if let Some(settings) = settings {
             // Get platforms that are active and match the user's environment

api/tests/http/unified.rs

@@ -369,160 +369,6 @@ async fn test_unified_api_create() {
     mock.assert_async().await;
 }
 
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn test_unified_metrics() {
-    let mut server = TestServer::new(None).await;
-    let (connection, _) = server.create_connection(Environment::Live).await;
-
-    let name = "Model".to_string();
-
-    let mock = create_connection_model_definition(
-        &mut server,
-        &connection,
-        CrudMapping {
-            action: CrudAction::Create,
-            common_model_name: name.clone(),
-            from_common_model: None,
-            to_common_model: None,
-        },
-    )
-    .await;
-
-    let payload: Value = Faker.fake();
-
-    let res = server
-        .send_request_with_headers::<Value, Value>(
-            &format!("v1/unified/{}", name.to_lowercase()),
-            Method::POST,
-            Some(&server.live_key),
-            Some(&payload),
-            Some(
-                vec![
-                    (CONTENT_TYPE.to_string(), "application/json".to_string()),
-                    (
-                        "x-pica-connection-key".to_string(),
-                        connection.key.to_string(),
-                    ),
-                ]
-                .into_iter()
-                .collect(),
-            ),
-        )
-        .await
-        .expect("Failed to send request");
-
-    assert_eq!(res.code, StatusCode::OK);
-    mock.assert_async().await;
-
-    tokio::time::sleep(Duration::from_millis(100)).await;
-
-    let res = server
-        .send_request::<(), MetricResponse>("v1/metrics", Method::GET, Some(&server.live_key), None)
-        .await
-        .unwrap();
-
-    assert_eq!(res.data.count, 1);
-
-    let res = server
-        .send_request_with_headers::<Value, Value>(
-            &format!("v1/unified/{}", name.to_lowercase()),
-            Method::POST,
-            Some(&server.live_key),
-            Some(&payload),
-            Some(
-                vec![
-                    (CONTENT_TYPE.to_string(), "application/json".to_string()),
-                    (
-                        "x-pica-connection-key".to_string(),
-                        connection.key.to_string(),
-                    ),
-                ]
-                .into_iter()
-                .collect(),
-            ),
-        )
-        .await
-        .unwrap();
-    assert_eq!(res.code, StatusCode::OK);
-
-    tokio::time::sleep(Duration::from_millis(100)).await;
-
-    let res = server
-        .send_request::<(), MetricResponse>(
-            format!("v1/metrics/{}", connection.ownership.client_id).as_str(),
-            Method::GET,
-            Some(&server.live_key),
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(res.data.count, 2);
-
-    let date = Utc::now();
-    let day = date.day();
-    let month = date.month();
-    let year = date.year();
-    let daily_key = format!("{year}-{month:02}-{day:02}");
-    let monthly_key = format!("{year}-{month:02}");
-
-    let res = server
-        .send_request::<(), MetricResponse>(
-            format!(
-                "v1/metrics/{}?day={daily_key}",
-                connection.ownership.client_id
-            )
-            .as_str(),
-            Method::GET,
-            Some(&server.live_key),
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(res.data.count, 2);
-
-    let res = server
-        .send_request::<(), MetricResponse>(
-            format!(
-                "v1/metrics/{}?month={monthly_key}&apiType=unified",
-                connection.ownership.client_id
-            )
-            .as_str(),
-            Method::GET,
-            Some(&server.live_key),
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(res.data.count, 2);
-
-    let res = server
-        .send_request::<(), MetricResponse>(
-            format!("v1/metrics?platform={}", connection.platform).as_str(),
-            Method::GET,
-            Some(&server.live_key),
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(res.data.count, 2);
-
-    let res = server
-        .send_request::<(), MetricResponse>(
-            "v1/metrics?apiType=passthrough",
-            Method::GET,
-            Some(&server.live_key),
-            None,
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(res.data.count, 0);
-}
-
 async fn create_connection_model_definition(
     server: &mut TestServer,
     connection: &SanitizedConnection,

api/tests/standard/mod.rs

@@ -201,7 +201,7 @@ fn test_json_connection() {
         error: None,
         ownership: Ownership {
             id: "owner-id".to_string().into(),
-            client_id: "client-id".to_string(),
+            client_id: Some("client-id".to_string()),
             organization_id: Some("organization-id".to_string()),
             project_id: Some("project-id".to_string()),
             user_id: Some("user-id".to_string()),

osentities/src/domain/event/mod.rs

@@ -115,7 +115,7 @@ impl Event {
         let buildable_id = access_key_data.id.to_owned();
         let ownership = Ownership {
             id: buildable_id.clone().into(),
-            client_id: buildable_id.to_owned(),
+            client_id: Some(buildable_id.to_owned()),
             organization_id: Some(buildable_id.to_owned()),
             project_id: Some(buildable_id.to_owned()),
             user_id: Some(buildable_id),
@@ -238,7 +238,7 @@ mod test {
             event.ownership,
             Ownership {
                 id: ACCESS_KEY.data.id.to_owned().into(),
-                client_id: ACCESS_KEY.data.id.to_owned(),
+                client_id: Some(ACCESS_KEY.data.id.to_owned()),
                 organization_id: Some(ACCESS_KEY.data.id.to_owned()),
                 project_id: Some(ACCESS_KEY.data.id.to_owned()),
                 user_id: Some(ACCESS_KEY.data.id.to_owned())

osentities/src/domain/shared/ownership.rs

@@ -9,7 +9,7 @@ pub struct Ownership {
     #[serde(rename = "buildableId")]
     #[cfg_attr(feature = "dummy", dummy(expr = "String::new().into()"))]
     pub id: Arc<str>,
-    pub client_id: String,
+    pub client_id: Option<String>,
     pub organization_id: Option<String>,
     pub project_id: Option<String>,
     pub user_id: Option<String>,
@@ -47,7 +47,7 @@ impl Ownership {
     pub fn new(id: String) -> Ownership {
         Self {
             id: id.clone().into(),
-            client_id: id.clone(),
+            client_id: Some(id.clone()),
             ..Default::default()
         }
     }