api_resource_id

Author: epompeii

lib/api_organizations/src/allowed.rs

@@ -1,5 +1,5 @@
 use bencher_endpoint::{CorsResponse, Endpoint, Get, ResponseOk};
-use bencher_json::{JsonAllowed, ResourceId, organization::OrganizationPermission};
+use bencher_json::{JsonAllowed, OrganizationResourceId, organization::OrganizationPermission};
 use bencher_schema::{
     conn_lock,
     context::ApiContext,
@@ -15,7 +15,7 @@ use serde::Deserialize;
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgAllowedParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
     /// The permission to check.
     pub permission: OrganizationPermission,
 }

lib/api_organizations/src/claim.rs

@@ -1,5 +1,5 @@
 use bencher_endpoint::{CorsResponse, Endpoint, Post, ResponseCreated};
-use bencher_json::{JsonNewClaim, JsonOrganization, ResourceId};
+use bencher_json::{JsonNewClaim, JsonOrganization, OrganizationResourceId};
 use bencher_schema::{
     conn_lock,
     context::ApiContext,
@@ -15,7 +15,7 @@ use serde::Deserialize;
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgClaimParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
 }
 
 #[endpoint {

lib/api_organizations/src/members.rs

@@ -3,8 +3,8 @@ use bencher_endpoint::{
     ResponseOk, TotalCount,
 };
 use bencher_json::{
-    JsonAuthAck, JsonDirection, JsonMember, JsonMembers, JsonPagination, ResourceId, Search,
-    UserName,
+    JsonAuthAck, JsonDirection, JsonMember, JsonMembers, JsonPagination, OrganizationResourceId,
+    Search, UserName, UserResourceId,
     organization::member::{JsonNewMember, JsonUpdateMember},
 };
 use bencher_rbac::organization::Permission;
@@ -33,7 +33,7 @@ use slog::Logger;
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgMembersParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
 }
 
 pub type OrgMembersPagination = JsonPagination<OrgMembersSort>;
@@ -325,9 +325,9 @@ async fn post_inner(
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgMemberParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
     /// The slug or UUID for an organization member.
-    pub user: ResourceId,
+    pub user: UserResourceId,
 }
 
 #[endpoint {

lib/api_organizations/src/organizations.rs

@@ -4,7 +4,7 @@ use bencher_endpoint::{
 };
 use bencher_json::{
     JsonDirection, JsonNewOrganization, JsonOrganization, JsonOrganizations, JsonPagination,
-    ResourceId, ResourceName, Search, organization::JsonUpdateOrganization,
+    OrganizationResourceId, ResourceName, Search, organization::JsonUpdateOrganization,
 };
 use bencher_rbac::organization::Permission;
 use bencher_schema::{
@@ -189,7 +189,7 @@ async fn post_inner(
 #[derive(Deserialize, JsonSchema)]
 pub struct OrganizationParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
 }
 
 #[endpoint {

lib/api_organizations/src/plan.rs

@@ -5,7 +5,7 @@ use bencher_endpoint::{
     CorsResponse, Delete, Endpoint, Get, Post, ResponseCreated, ResponseDeleted, ResponseOk,
 };
 use bencher_json::{
-    DateTime, ResourceId,
+    DateTime, OrganizationResourceId,
     organization::plan::{JsonNewPlan, JsonPlan},
 };
 use bencher_rbac::organization::Permission;
@@ -34,7 +34,7 @@ use serde::Deserialize;
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgPlanParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
 }
 
 #[endpoint {

lib/api_organizations/src/projects.rs

@@ -2,8 +2,8 @@ use bencher_endpoint::{
     CorsResponse, Endpoint, Get, Post, ResponseCreated, ResponseOk, TotalCount,
 };
 use bencher_json::{
-    JsonDirection, JsonNewProject, JsonPagination, JsonProject, JsonProjects, ResourceId,
-    ResourceName, Search,
+    JsonDirection, JsonNewProject, JsonPagination, JsonProject, JsonProjects,
+    OrganizationResourceId, ResourceName, Search,
     project::measure::built_in::default::{Latency, Throughput},
 };
 use bencher_rbac::organization::Permission;
@@ -38,7 +38,7 @@ use slog::Logger;
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgProjectsParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
 }
 
 pub type OrgProjectsPagination = JsonPagination<OrgProjectsSort>;

lib/api_organizations/src/usage.rs

@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use bencher_endpoint::{CorsResponse, Endpoint, Get, ResponseOk};
 use bencher_json::{
-    DateTime, ResourceId,
+    DateTime, OrganizationResourceId,
     organization::usage::{JsonUsage, UsageKind},
 };
 use bencher_rbac::organization::Permission;
@@ -29,7 +29,7 @@ const DEFAULT_USAGE_HISTORY: Duration = Duration::from_secs(30 * 24 * 60 * 60);
 #[derive(Deserialize, JsonSchema)]
 pub struct OrgUsageParams {
     /// The slug or UUID for an organization.
-    pub organization: ResourceId,
+    pub organization: OrganizationResourceId,
 }
 
 #[endpoint {

lib/api_projects/src/alerts.rs

@@ -1,6 +1,6 @@
 use bencher_endpoint::{CorsResponse, Endpoint, Get, Patch, ResponseOk, TotalCount};
 use bencher_json::{
-    AlertUuid, JsonAlert, JsonAlerts, JsonDirection, JsonPagination, ResourceId,
+    AlertUuid, JsonAlert, JsonAlerts, JsonDirection, JsonPagination, ProjectResourceId,
     project::alert::{AlertStatus, JsonUpdateAlert},
 };
 use bencher_rbac::project::Permission;
@@ -28,7 +28,7 @@ use serde::Deserialize;
 #[derive(Deserialize, JsonSchema)]
 pub struct ProjAlertsParams {
     /// The slug or UUID for a project.
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
 }
 
 pub type ProjAlertsPagination = JsonPagination<ProjAlertsSort>;
@@ -283,7 +283,7 @@ type BoxedQuery<'q> = diesel::internal::table_macro::BoxedSelectStatement<
 #[derive(Deserialize, JsonSchema)]
 pub struct ProjAlertParams {
     /// The slug or UUID for a project.
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
     /// The UUID for an alert.
     pub alert: AlertUuid,
 }

lib/api_projects/src/allowed.rs

@@ -1,5 +1,5 @@
 use bencher_endpoint::{CorsResponse, Endpoint, Get, ResponseOk};
-use bencher_json::{JsonAllowed, ResourceId, project::ProjectPermission};
+use bencher_json::{JsonAllowed, ProjectResourceId, project::ProjectPermission};
 use bencher_schema::{
     conn_lock,
     context::ApiContext,
@@ -15,7 +15,7 @@ use serde::Deserialize;
 #[derive(Deserialize, JsonSchema)]
 pub struct ProjAllowedParams {
     /// The slug or UUID for a project.
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
     /// The permission to check.
     pub permission: ProjectPermission,
 }

lib/api_projects/src/benchmarks.rs

@@ -3,8 +3,8 @@ use bencher_endpoint::{
     TotalCount,
 };
 use bencher_json::{
-    BenchmarkName, JsonBenchmark, JsonBenchmarks, JsonDirection, JsonPagination, ResourceId,
-    Search,
+    BenchmarkName, BenchmarkResourceId, JsonBenchmark, JsonBenchmarks, JsonDirection,
+    JsonPagination, ProjectResourceId, Search,
     project::benchmark::{JsonNewBenchmark, JsonUpdateBenchmark},
 };
 use bencher_rbac::project::Permission;
@@ -32,7 +32,7 @@ use serde::Deserialize;
 #[derive(Deserialize, JsonSchema)]
 pub struct ProjBenchmarksParams {
     /// The slug or UUID for a project.
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
 }
 
 pub type ProjBenchmarksPagination = JsonPagination<ProjBenchmarksSort>;
@@ -227,9 +227,9 @@ async fn post_inner(
 #[derive(Deserialize, JsonSchema)]
 pub struct ProjBenchmarkParams {
     /// The slug or UUID for a project.
-    pub project: ResourceId,
+    pub project: ProjectResourceId,
     /// The slug or UUID for a benchmark.
-    pub benchmark: ResourceId,
+    pub benchmark: BenchmarkResourceId,
 }
 
 #[endpoint {