total_members

Author: epompeii

lib/api_run/src/run.rs

@@ -1,5 +1,5 @@
 use bencher_endpoint::{CorsResponse, Endpoint, Post, ResponseCreated};
-use bencher_json::{JsonNewRun, JsonReport, RunContext};
+use bencher_json::{JsonNewRun, JsonReport, ResourceName, RunContext, Slug};
 use bencher_rbac::project::Permission;
 use bencher_schema::{
     context::ApiContext,
@@ -50,21 +50,13 @@ async fn post_inner(
 ) -> Result<JsonReport, HttpError> {
     let query_project = match (auth_user.as_ref(), json_run.project.as_ref()) {
         (Some(auth_user), Some(project)) => {
-            QueryProject::get_or_create_from_project(log, context, auth_user, project)
+            QueryProject::get_or_create(log, context, auth_user, project)
                 .await
                 .map_err(|e| forbidden_error(e.to_string()))?
         },
         (Some(auth_user), None) => {
-            let Some(project_name) = json_run.context.as_ref().and_then(RunContext::name) else {
-                return Err(bad_request_error(
-                    "The `project` field was not specified nor was a run `context` provided for the name",
-                ));
-            };
-            let Some(project_slug) = json_run.context.as_ref().map(RunContext::slug) else {
-                return Err(bad_request_error(
-                    "The `project` field was not specified nor was a run `context` provided for the slug",
-                ));
-            };
+            let project_name = project_name(&json_run)?;
+            let project_slug = project_slug(&json_run)?;
             QueryProject::get_or_create_from_context(
                 log,
                 context,
@@ -100,3 +92,27 @@ async fn post_inner(
     )
     .await
 }
+
+fn project_name(json_run: &JsonNewRun) -> Result<ResourceName, HttpError> {
+    json_run
+        .context
+        .as_ref()
+        .and_then(RunContext::name)
+        .ok_or_else(|| {
+            bad_request_error(
+            "The `project` field was not specified nor was a run `context` provided for the name",
+        )
+        })
+}
+
+fn project_slug(json_run: &JsonNewRun) -> Result<Slug, HttpError> {
+    json_run
+        .context
+        .as_ref()
+        .map(RunContext::slug)
+        .ok_or_else(|| {
+            bad_request_error(
+            "The `project` field was not specified nor was a run `context` provided for the slug",
+        )
+        })
+}

lib/bencher_schema/src/model/organization/mod.rs

@@ -11,12 +11,12 @@ use bencher_json::{
 use bencher_rbac::Organization;
 use diesel::{ExpressionMethods, QueryDsl, Queryable, RunQueryDsl};
 use dropshot::HttpError;
-use organization_role::InsertOrganizationRole;
+use organization_role::{InsertOrganizationRole, QueryOrganizationRole};
 
 use crate::{
     conn_lock,
     context::{DbConnection, Rbac},
-    error::{forbidden_error, resource_not_found_error, BencherResource},
+    error::{forbidden_error, resource_not_found_error, unauthorized_error, BencherResource},
     macros::{
         fn_get::{fn_get, fn_get_id, fn_get_uuid},
         resource_id::{fn_eq_resource_id, fn_from_resource_id},
@@ -80,7 +80,19 @@ impl QueryOrganization {
         if let Ok(query_organization) =
             Self::from_resource_id(conn_lock!(context), &project_slug.clone().into())
         {
-            return Ok(query_organization);
+            // Get the total number of members for the organization
+            let total_members =
+                QueryOrganizationRole::count(conn_lock!(context), query_organization.id)?;
+            // If the project is part of an organization that has zero members,
+            // then the project can have anonymous reports.
+            // That is, the project has not yet been claimed.
+            return if total_members == 0 {
+                Ok(query_organization)
+            } else {
+                Err(unauthorized_error(format!(
+                    "This project ({project_slug}) has already been claimed."
+                )))
+            };
         }
 
         let json_organization = JsonNewOrganization {

lib/bencher_schema/src/model/organization/organization_role.rs

@@ -3,14 +3,16 @@ use bencher_json::{
     DateTime, Jwt,
 };
 use bencher_token::TokenKey;
+use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use dropshot::HttpError;
 
 use super::{OrganizationId, QueryOrganization};
 use crate::{
     context::DbConnection,
     error::unauthorized_error,
     model::user::{QueryUser, UserId},
-    schema::organization_role as organization_role_table,
+    resource_not_found_err,
+    schema::{self, organization_role as organization_role_table},
 };
 
 crate::macros::typed_id::typed_id!(OrganizationRoleId);
@@ -25,6 +27,19 @@ pub struct QueryOrganizationRole {
     pub modified: DateTime,
 }
 
+impl QueryOrganizationRole {
+    pub fn count(
+        conn: &mut DbConnection,
+        organization_id: OrganizationId,
+    ) -> Result<i64, HttpError> {
+        schema::organization_role::table
+            .filter(schema::organization_role::organization_id.eq(&organization_id))
+            .count()
+            .get_result(conn)
+            .map_err(resource_not_found_err!(OrganizationRole, organization_id))
+    }
+}
+
 #[derive(Debug, diesel::Insertable)]
 #[diesel(table_name = organization_role_table)]
 pub struct InsertOrganizationRole {

lib/bencher_schema/src/model/project/mod.rs

@@ -89,7 +89,7 @@ impl QueryProject {
             .map_err(resource_not_found_err!(Project, slug.clone()))
     }
 
-    pub async fn get_or_create_from_project(
+    pub async fn get_or_create(
         log: &Logger,
         context: &ApiContext,
         auth_user: &AuthUser,
@@ -141,6 +141,7 @@ impl QueryProject {
             url: None,
             visibility: None,
         };
+
         Self::create(log, context, auth_user, &query_organization, json_project).await
     }