This commit is contained in:
2026-05-11 16:15:48 +08:00
parent 0c9254502c
commit e30b733b17
87 changed files with 3527 additions and 1261 deletions

View File

@@ -751,7 +751,6 @@ pub fn build_runtime_profile_invite_code_record(
user_id: snapshot.user_id,
invite_code: snapshot.invite_code,
metadata_json: snapshot.metadata_json,
granted_user_tags: snapshot.granted_user_tags,
starts_at: snapshot.starts_at_micros.map(format_utc_micros),
starts_at_micros: snapshot.starts_at_micros,
expires_at: snapshot.expires_at_micros.map(format_utc_micros),

View File

@@ -428,7 +428,6 @@ pub fn build_runtime_profile_invite_code_admin_upsert_input(
admin_user_id: String,
invite_code: String,
metadata_json: String,
granted_user_tags: Vec<String>,
starts_at_micros: Option<i64>,
expires_at_micros: Option<i64>,
updated_at_micros: i64,
@@ -437,7 +436,6 @@ pub fn build_runtime_profile_invite_code_admin_upsert_input(
let invite_code =
normalize_invite_code(invite_code).ok_or(RuntimeProfileFieldError::MissingInviteCode)?;
let metadata_json = normalize_invite_code_metadata_json(metadata_json)?;
let granted_user_tags = normalize_profile_user_tags(granted_user_tags)?;
crate::commands::validate_runtime_profile_invite_code_validity_window(
starts_at_micros,
expires_at_micros,
@@ -447,7 +445,6 @@ pub fn build_runtime_profile_invite_code_admin_upsert_input(
admin_user_id,
invite_code,
metadata_json,
granted_user_tags,
starts_at_micros,
expires_at_micros,
updated_at_micros,
@@ -767,13 +764,54 @@ pub fn normalize_invite_code_metadata_json(
return Err(RuntimeProfileFieldError::InvalidInviteCodeMetadata);
}
let parsed = serde_json::from_str::<Value>(trimmed)
let mut parsed = serde_json::from_str::<Value>(trimmed)
.map_err(|_| RuntimeProfileFieldError::InvalidInviteCodeMetadata)?;
if !parsed.is_object() {
return Err(RuntimeProfileFieldError::InvalidInviteCodeMetadata);
}
serde_json::to_string(&parsed).map_err(|_| RuntimeProfileFieldError::InvalidInviteCodeMetadata)
normalize_invite_code_metadata_user_tags(&mut parsed)?;
let normalized = serde_json::to_string(&parsed)
.map_err(|_| RuntimeProfileFieldError::InvalidInviteCodeMetadata)?;
if normalized.len() > PROFILE_INVITE_CODE_METADATA_MAX_BYTES {
return Err(RuntimeProfileFieldError::InvalidInviteCodeMetadata);
}
Ok(normalized)
}
fn normalize_invite_code_metadata_user_tags(
metadata: &mut Value,
) -> Result<(), RuntimeProfileFieldError> {
let Some(object) = metadata.as_object_mut() else {
return Err(RuntimeProfileFieldError::InvalidInviteCodeMetadata);
};
// 中文注释:邀请码授予标签复用 metadata保存时统一收敛成 camelCase 字段。
let raw = object
.remove("userTags")
.or_else(|| object.remove("user_tags"));
object.remove("user_tags");
let Some(raw) = raw else {
return Ok(());
};
let Value::Array(items) = raw else {
return Err(RuntimeProfileFieldError::InvalidUserTag);
};
let mut raw_tags = Vec::new();
for item in items {
let Value::String(value) = item else {
return Err(RuntimeProfileFieldError::InvalidUserTag);
};
raw_tags.push(value);
}
let tags = normalize_profile_user_tags(raw_tags)?;
if !tags.is_empty() {
object.insert(
"userTags".to_string(),
Value::Array(tags.into_iter().map(Value::String).collect()),
);
}
Ok(())
}
pub fn normalize_profile_user_tags(
@@ -801,7 +839,7 @@ pub fn validate_runtime_profile_invite_code_validity_window(
starts_at_micros: Option<i64>,
expires_at_micros: Option<i64>,
) -> Result<(), RuntimeProfileFieldError> {
if matches!((starts_at_micros, expires_at_micros), (Some(starts_at), Some(expires_at)) if starts_at > expires_at)
if matches!((starts_at_micros, expires_at_micros), (Some(starts_at), Some(expires_at)) if starts_at >= expires_at)
{
return Err(RuntimeProfileFieldError::InvalidInviteCodeValidityWindow);
}

View File

@@ -1190,7 +1190,6 @@ pub struct RuntimeProfileInviteCodeAdminUpsertInput {
pub admin_user_id: String,
pub invite_code: String,
pub metadata_json: String,
pub granted_user_tags: Vec<String>,
pub starts_at_micros: Option<i64>,
pub expires_at_micros: Option<i64>,
pub updated_at_micros: i64,
@@ -1208,7 +1207,6 @@ pub struct RuntimeProfileInviteCodeSnapshot {
pub user_id: String,
pub invite_code: String,
pub metadata_json: String,
pub granted_user_tags: Vec<String>,
pub starts_at_micros: Option<i64>,
pub expires_at_micros: Option<i64>,
pub created_at_micros: i64,
@@ -1581,7 +1579,6 @@ pub struct RuntimeProfileInviteCodeRecord {
pub user_id: String,
pub invite_code: String,
pub metadata_json: String,
pub granted_user_tags: Vec<String>,
pub starts_at: Option<String>,
pub starts_at_micros: Option<i64>,
pub expires_at: Option<String>,

View File

@@ -1,6 +1,7 @@
use module_runtime::{
RuntimeProfileFieldError, RuntimeProfileInviteCodeSnapshot, RuntimeProfileInviteCodeStatus,
build_runtime_profile_invite_code_record, resolve_runtime_profile_invite_code_status,
build_runtime_profile_invite_code_record, normalize_invite_code_metadata_json,
resolve_runtime_profile_invite_code_status,
validate_runtime_profile_invite_code_validity_window,
};
@@ -15,11 +16,14 @@ fn invite_code_validity_window_rejects_start_after_expire() {
}
#[test]
fn invite_code_validity_window_allows_open_ended_or_equal_boundary() {
fn invite_code_validity_window_allows_open_ended_and_rejects_equal_boundary() {
assert!(validate_runtime_profile_invite_code_validity_window(None, None).is_ok());
assert!(validate_runtime_profile_invite_code_validity_window(Some(10), None).is_ok());
assert!(validate_runtime_profile_invite_code_validity_window(None, Some(10)).is_ok());
assert!(validate_runtime_profile_invite_code_validity_window(Some(10), Some(10)).is_ok());
assert_eq!(
validate_runtime_profile_invite_code_validity_window(Some(10), Some(10)),
Err(RuntimeProfileFieldError::InvalidInviteCodeValidityWindow)
);
}
#[test]
@@ -48,7 +52,6 @@ fn invite_code_record_formats_window_and_status() {
user_id: "user-1".to_string(),
invite_code: "SY00000001".to_string(),
metadata_json: "{}".to_string(),
granted_user_tags: Vec::new(),
starts_at_micros: Some(0),
expires_at_micros: Some(1_000_000),
created_at_micros: 0,
@@ -59,3 +62,33 @@ fn invite_code_record_formats_window_and_status() {
assert_eq!(record.expires_at.as_deref(), Some("1970-01-01T00:00:01Z"));
assert_eq!(record.status, RuntimeProfileInviteCodeStatus::Expired);
}
#[test]
fn invite_code_metadata_normalizes_user_tags() {
let normalized = normalize_invite_code_metadata_json(
r#"{"source":"admin","user_tags":[" 北科 ","北科",""]}"#.to_string(),
)
.expect("metadata should normalize");
assert_eq!(normalized, r#"{"source":"admin","userTags":["北科"]}"#);
}
#[test]
fn invite_code_metadata_removes_empty_user_tags() {
let normalized = normalize_invite_code_metadata_json(r#"{"userTags":[]}"#.to_string())
.expect("empty tags should be valid");
assert_eq!(normalized, "{}");
}
#[test]
fn invite_code_metadata_rejects_invalid_user_tags_shape() {
assert_eq!(
normalize_invite_code_metadata_json(r#"{"userTags":"北科"}"#.to_string()),
Err(RuntimeProfileFieldError::InvalidUserTag)
);
assert_eq!(
normalize_invite_code_metadata_json(r#"{"userTags":["北科",1]}"#.to_string()),
Err(RuntimeProfileFieldError::InvalidUserTag)
);
}