admin/momentry_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add identity_uuid to /identities list + /file/:uuid/identities responses

Browse Source
This commit is contained in:
Accusys
2026-05-15 10:14:22 +08:00
parent fdcec82274
commit 37799fff4e
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/identities.rs
View File

@@ -174,9 +174,9 @@ async fn list_identities(
} }
}; };
let sql = "SELECT id, name, metadata FROM identities ORDER BY id DESC LIMIT $1 OFFSET $2"; let sql = "SELECT id, uuid, name, metadata FROM identities ORDER BY id DESC LIMIT $1 OFFSET $2";
let rows: Vec<(i32, String, Option<serde_json::Value>)> = match sqlx::query_as(sql) let rows: Vec<(i32, uuid::Uuid, String, Option<serde_json::Value>)> = match sqlx::query_as(sql)
.bind(page_size as i64) .bind(page_size as i64)
.bind(offset) .bind(offset)
.fetch_all(db.pool()) .fetch_all(db.pool())
@@ -195,8 +195,9 @@ async fn list_identities(
.into_iter() .into_iter()
.map(|r| IdentityResponse { .map(|r| IdentityResponse {
id: r.0, id: r.0,
name: r.1, identity_uuid: r.1.to_string(),
metadata: r.2, name: r.2,
metadata: r.3,
}) })
.collect(); .collect();
@@ -245,6 +246,7 @@ pub struct FaceCandidatesResponse {
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub struct IdentityResponse { pub struct IdentityResponse {
pub id: i32, pub id: i32,
pub identity_uuid: String,
pub name: String, pub name: String,
pub metadata: Option<serde_json::Value>, pub metadata: Option<serde_json::Value>,
} }

2
src/api/identity_api.rs
View File

@@ -180,6 +180,7 @@ pub struct FileIdentitiesResponse {
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
pub struct FileIdentityItem { pub struct FileIdentityItem {
pub identity_id: i32, pub identity_id: i32,
pub identity_uuid: Option<String>,
pub name: String, pub name: String,
pub metadata: serde_json::Value, pub metadata: serde_json::Value,
pub face_count: Option<i32>, pub face_count: Option<i32>,
@@ -211,6 +212,7 @@ async fn get_file_identities(
.into_iter() .into_iter()
.map(|r| FileIdentityItem { .map(|r| FileIdentityItem {
identity_id: r.identity_id, identity_id: r.identity_id,
identity_uuid: r.identity_uuid.map(|u| u.to_string()),
name: r.name, name: r.name,
metadata: r.metadata, metadata: r.metadata,
face_count: r.face_count, face_count: r.face_count,

5
src/core/db/postgres_db.rs
View File

@@ -58,6 +58,7 @@ pub struct CandidateRecord {
#[derive(Debug, Clone, Serialize, Deserialize, sqlx::FromRow)] #[derive(Debug, Clone, Serialize, Deserialize, sqlx::FromRow)]
pub struct FileIdentityRecord { pub struct FileIdentityRecord {
pub identity_id: i32, pub identity_id: i32,
pub identity_uuid: Option<uuid::Uuid>,
pub name: String, pub name: String,
pub metadata: serde_json::Value, pub metadata: serde_json::Value,
pub face_count: Option<i32>, pub face_count: Option<i32>,
@@ -2406,7 +2407,7 @@ impl PostgresDb {
let videos_table = schema::table_name("videos"); let videos_table = schema::table_name("videos");
let query = format!( let query = format!(
r#" r#"
SELECT fd.identity_id::int4, i.name, i.metadata, SELECT fd.identity_id::int4, i.uuid as identity_uuid, i.name, i.metadata,
COUNT(*)::int4 as face_count, COUNT(*)::int4 as face_count,
0::int4 as speaker_count, 0::int4 as speaker_count,
MIN(fd.frame_number) as start_frame, MIN(fd.frame_number) as start_frame,
@@ -2416,7 +2417,7 @@ impl PostgresDb {
FROM {} fd FROM {} fd
JOIN {} i ON fd.identity_id = i.id JOIN {} i ON fd.identity_id = i.id
WHERE fd.file_uuid = $1 AND fd.identity_id IS NOT NULL WHERE fd.file_uuid = $1 AND fd.identity_id IS NOT NULL
GROUP BY fd.identity_id, i.name, i.metadata GROUP BY fd.identity_id, i.name, i.metadata, i.uuid
ORDER BY confidence DESC ORDER BY confidence DESC
LIMIT $2 OFFSET $3 LIMIT $2 OFFSET $3
"#, "#,