fixes

Author: epompeii

lib/bencher_comment/src/lib.rs

@@ -8,7 +8,7 @@ use std::{
 
 use bencher_json::{
     AlertUuid, BenchmarkSlug, BranchSlug, JsonAlert, JsonBenchmark, JsonBoundary, JsonMeasure,
-    JsonPerfQuery, JsonReport, MeasureSlug, ReportUuid, ResourceName, Slug, TestbedSlug,
+    JsonPerfQuery, JsonReport, MeasureSlug, ProjectSlug, ReportUuid, ResourceName, TestbedSlug,
     ThresholdUuid, Units,
     project::{
         alert::AlertStatus,
@@ -27,7 +27,7 @@ const EMPTY_CELL: &str = "<td></td>";
 
 pub struct ReportComment {
     console_url: Url,
-    project_slug: Slug,
+    project_slug: ProjectSlug,
     public_links: bool,
     multiple_iterations: bool,
     benchmark_count: usize,

lib/bencher_json/src/organization/mod.rs

@@ -32,7 +32,7 @@ impl From<UserUuid> for OrganizationUuid {
 
 impl From<ProjectSlug> for OrganizationSlug {
     fn from(slug: ProjectSlug) -> Self {
-        Self(Slug::from(slug))
+        Self(slug.into())
     }
 }
 

lib/bencher_json/src/typed_slug.rs

@@ -44,6 +44,12 @@ macro_rules! typed_slug {
             }
         }
 
+        impl AsRef<str> for $slug {
+            fn as_ref(&self) -> &str {
+                self.0.as_ref()
+            }
+        }
+
         $crate::typed_db::typed_db!($slug);
     };
     ($slug:ident, $name:ident) => {

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

@@ -94,9 +94,10 @@ impl QueryOrganization {
         project_slug: &ProjectSlug,
     ) -> Result<Self, HttpError> {
         // The project organization should be created with the project's slug.
-        if let Ok(query_organization) =
-            Self::from_resource_id(conn_lock!(context), &project_slug.clone().into())
-        {
+        if let Ok(query_organization) = Self::from_resource_id(
+            conn_lock!(context),
+            &OrganizationSlug::from(project_slug.clone()).into(),
+        ) {
             // If the project is part of an organization that is claimed,
             // then the project can not have anonymous reports.
             return if query_organization.is_claimed(conn_lock!(context))? {

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

@@ -592,7 +592,7 @@ impl InsertProject {
             visibility,
         } = project;
         let slug = ok_slug!(conn, &name, slug.map(Into::into), project, QueryProject);
-        Self::new(organization.id, name, slug, url, visibility)
+        Self::new(organization.id, name, slug.into(), url, visibility)
     }
 
     fn from_organization(

lib/bencher_schema/src/model/user/token.rs

@@ -1,5 +1,5 @@
 use bencher_json::{
-    DateTime, JsonNewToken, JsonToken, Jwt, ResourceId, ResourceName, TokenUuid,
+    DateTime, JsonNewToken, JsonToken, Jwt, ResourceId, ResourceName, TokenUuid, UserResourceId,
     user::token::JsonUpdateToken,
 };
 use bencher_token::TokenKey;
@@ -134,7 +134,7 @@ impl InsertToken {
         conn: &mut DbConnection,
         rbac: &Rbac,
         token_key: &TokenKey,
-        user: &ResourceId,
+        user: &UserResourceId,
         token: JsonNewToken,
         auth_user: &AuthUser,
     ) -> Result<Self, HttpError> {

lib/bencher_valid/src/resource_id.rs

@@ -18,6 +18,12 @@ pub enum ResourceId<U, S> {
     Slug(S),
 }
 
+impl<U, S> From<S> for ResourceId<U, S> {
+    fn from(slug: S) -> Self {
+        Self::Slug(slug)
+    }
+}
+
 #[cfg(feature = "schema")]
 impl<U, S> JsonSchema for ResourceId<U, S>
 where