claimed

Author: epompeii

lib/api_organizations/src/organizations.rs

@@ -100,10 +100,10 @@ async fn get_ls_inner(
         ))?;
 
     // Drop connection lock before iterating
-    let json_organizations = organizations
+    let json_organizations = conn_lock!(context, |conn| organizations
         .into_iter()
-        .map(QueryOrganization::into_json)
-        .collect();
+        .map(|org| org.into_json(conn))
+        .collect());
 
     let total_count = get_ls_query(context, auth_user, &pagination_params, &query_params)
         .count()
@@ -184,7 +184,7 @@ async fn post_inner(
         InsertOrganization::from_json(conn_lock!(context), json_organization)?;
     let query_organization =
         QueryOrganization::create(context, auth_user, insert_organization).await?;
-    Ok(query_organization.into_json())
+    Ok(query_organization.into_json(conn_lock!(context)))
 }
 
 #[derive(Deserialize, JsonSchema)]
@@ -230,14 +230,16 @@ async fn get_one_inner(
     path_params: OrganizationParams,
     auth_user: &AuthUser,
 ) -> Result<JsonOrganization, HttpError> {
-    Ok(QueryOrganization::is_allowed_resource_id(
-        conn_lock!(context),
-        &context.rbac,
-        &path_params.organization,
-        auth_user,
-        Permission::View,
-    )?
-    .into_json())
+    conn_lock!(context, |conn| {
+        Ok(QueryOrganization::is_allowed_resource_id(
+            conn,
+            &context.rbac,
+            &path_params.organization,
+            auth_user,
+            Permission::View,
+        )?
+        .into_json(conn))
+    })
 }
 
 /// Update an organization
@@ -319,7 +321,11 @@ async fn patch_inner(
         .execute(conn_lock!(context))
         .map_err(resource_conflict_err!(Organization, update_organization))?;
 
-    Ok(QueryOrganization::get(conn_lock!(context), query_organization.id)?.into_json())
+    conn_lock!(context, |conn| Ok(QueryOrganization::get(
+        conn,
+        query_organization.id
+    )?
+    .into_json(conn)))
 }
 
 /// Delete an organization

lib/api_organizations/src/projects.rs

@@ -128,10 +128,10 @@ async fn get_ls_inner(
         ))?;
 
     // Drop connection lock before iterating
-    let json_projects = projects
+    let json_projects = conn_lock!(context, |conn| projects
         .into_iter()
-        .map(|project| project.into_json_for_organization(&query_organization))
-        .collect();
+        .map(|project| project.into_json_for_organization(conn, &query_organization))
+        .collect());
 
     let total_count = get_ls_query(&query_organization, &pagination_params, &query_params)
         .count()

lib/bencher_json/src/organization/mod.rs

@@ -45,6 +45,7 @@ pub struct JsonOrganization {
     pub license: Option<bencher_valid::Jwt>,
     pub created: DateTime,
     pub modified: DateTime,
+    pub claimed: Option<DateTime>,
 }
 
 // Unfortunately, we have to use a complex, custom type and deserializer here.

lib/bencher_json/src/project/mod.rs

@@ -67,6 +67,7 @@ pub struct JsonProject {
     pub visibility: Visibility,
     pub created: DateTime,
     pub modified: DateTime,
+    pub claimed: Option<DateTime>,
 }
 
 impl Display for JsonProject {

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

@@ -230,7 +230,12 @@ impl QueryOrganization {
         Ok(total_members > 0)
     }
 
-    pub fn into_json(self) -> JsonOrganization {
+    pub fn claimed_at(&self, conn: &mut DbConnection) -> Result<DateTime, HttpError> {
+        QueryOrganizationRole::claimed_at(conn, self.id)
+    }
+
+    pub fn into_json(self, conn: &mut DbConnection) -> JsonOrganization {
+        let claimed = self.claimed_at(conn).ok();
         let Self {
             uuid,
             name,
@@ -249,6 +254,7 @@ impl QueryOrganization {
             license,
             created,
             modified,
+            claimed,
         }
     }
 }

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

@@ -38,6 +38,18 @@ impl QueryOrganizationRole {
             .get_result(conn)
             .map_err(resource_not_found_err!(OrganizationRole, organization_id))
     }
+
+    pub fn claimed_at(
+        conn: &mut DbConnection,
+        organization_id: OrganizationId,
+    ) -> Result<DateTime, HttpError> {
+        schema::organization_role::table
+            .filter(schema::organization_role::organization_id.eq(&organization_id))
+            .select(schema::organization_role::created)
+            .order(schema::organization_role::created.asc())
+            .first(conn)
+            .map_err(resource_not_found_err!(OrganizationRole, organization_id))
+    }
 }
 
 #[derive(Debug, diesel::Insertable)]

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

@@ -410,11 +410,16 @@ impl QueryProject {
     }
 
     pub fn into_json(self, conn: &mut DbConnection) -> Result<JsonProject, HttpError> {
-        let query_organization = QueryOrganization::get(conn, self.organization_id)?;
-        Ok(self.into_json_for_organization(&query_organization))
+        let query_organization: QueryOrganization =
+            QueryOrganization::get(conn, self.organization_id)?;
+        Ok(self.into_json_for_organization(conn, &query_organization))
     }
 
-    pub fn into_json_for_organization(self, organization: &QueryOrganization) -> JsonProject {
+    pub fn into_json_for_organization(
+        self,
+        conn: &mut DbConnection,
+        query_organization: &QueryOrganization,
+    ) -> JsonProject {
         let Self {
             uuid,
             organization_id,
@@ -428,19 +433,21 @@ impl QueryProject {
         } = self;
         assert_parentage(
             BencherResource::Organization,
-            organization.id,
+            query_organization.id,
             BencherResource::Project,
             organization_id,
         );
+        let claimed = query_organization.claimed_at(conn).ok();
         JsonProject {
             uuid,
-            organization: organization.uuid,
+            organization: query_organization.uuid,
             name,
             slug,
             url,
             visibility,
             created,
             modified,
+            claimed,
         }
     }
 }

lib/bencher_schema/src/model/server/stats.rs

@@ -42,7 +42,7 @@ pub fn get_stats(
                 .load::<QueryOrganization>(conn)
                 .map_err(resource_not_found_err!(Organization))?
                 .into_iter()
-                .map(QueryOrganization::into_json)
+                .map(|org| org.into_json(conn))
                 .collect(),
         )
     };