Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/apis/list_admins.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::DbConn;
use crate::apis::invite_code_admin_to_response;
use crate::apis::invite_code_admin_to_summary;
use crate::error::AppError;
use crate::user::{InviteCodeAdmin, InviteCodeAdminData};
use crate::user::{InviteCodeAdmin, InviteCodeAdminSummary};
use axum::extract::State;
use axum::{Json, response::IntoResponse};
use diesel::{QueryDsl, RunQueryDsl, SelectableHelper};
Expand All @@ -11,7 +11,7 @@ use utoipa::ToSchema;
#[derive(Serialize, Deserialize, ToSchema)]
pub struct ListAdminsResponse {
pub status: String,
pub admins: Vec<InviteCodeAdminData>,
pub admins: Vec<InviteCodeAdminSummary>,
}

#[tracing::instrument(skip(db_pool, _user))]
Expand Down Expand Up @@ -50,8 +50,8 @@ pub async fn list_admins_handler(
.map_err(|e| AppError::DatabaseError(e.to_string()))?
.map_err(|e| AppError::DatabaseError(e.to_string()))?;

let admins_data: Vec<InviteCodeAdminData> =
results.iter().map(invite_code_admin_to_response).collect();
let admins_data: Vec<InviteCodeAdminSummary> =
results.iter().map(invite_code_admin_to_summary).collect();

let response = ListAdminsResponse {
status: "success".to_string(),
Expand Down
10 changes: 9 additions & 1 deletion src/apis/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::user::{InviteCodeAdmin, InviteCodeAdminData};
use crate::user::{InviteCodeAdmin, InviteCodeAdminData, InviteCodeAdminSummary};
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;

Expand Down Expand Up @@ -78,3 +78,11 @@ pub fn invite_code_admin_to_response(user: &InviteCodeAdmin) -> InviteCodeAdminD
otp_verified: user.otp_verified.eq(&1),
}
}

pub fn invite_code_admin_to_summary(user: &InviteCodeAdmin) -> InviteCodeAdminSummary {
InviteCodeAdminSummary {
username: user.username.to_owned(),
otp_enabled: user.otp_enabled.eq(&1),
otp_verified: user.otp_verified.eq(&1),
}
}
1 change: 1 addition & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ use utoipa_swagger_ui::SwaggerUi;
schemas(
invite_code_manager::LoginUser,
invite_code_manager::user::InviteCodeAdminData,
invite_code_manager::user::InviteCodeAdminSummary,
invite_code_manager::user::VerifyOTPSchema,
invite_code_manager::user::CreateInviteCodeSchema,
invite_code_manager::user::IssueInviteCodeSchema,
Expand Down
7 changes: 7 additions & 0 deletions src/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ pub struct InviteCodeAdminData {
pub otp_auth_url: Option<String>,
}

#[derive(Serialize, Deserialize, Debug, ToSchema)]
pub struct InviteCodeAdminSummary {
pub username: String,
pub otp_enabled: bool,
pub otp_verified: bool,
}

#[derive(Serialize, Deserialize, ToSchema)]
pub struct CreateInviteCodeSchema {
#[serde(rename = "codeCount")]
Expand Down
Loading