Merge branch 'master' into codex/puzzle-clear-template-runtime-fixes

server-rs/crates/api-server/src/app.rs

@@ -878,6 +878,46 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn readyz_reports_readiness_and_draining_state() {
+        let state = AppState::new(AppConfig::default()).expect("state should build");
+        let app = build_router(state.clone());
+
+        let ready_response = app
+            .clone()
+            .oneshot(
+                Request::builder()
+                    .uri("/readyz")
+                    .header("x-request-id", "req-ready")
+                    .body(Body::empty())
+                    .expect("readyz request should build"),
+            )
+            .await
+            .expect("readyz request should succeed");
+        assert_eq!(ready_response.status(), StatusCode::OK);
+        let ready_body = read_json_response(ready_response).await;
+        assert_eq!(ready_body["ok"], Value::Bool(true));
+        assert_eq!(ready_body["ready"], Value::Bool(true));
+
+        state.mark_not_ready();
+        let draining_response = app
+            .oneshot(
+                Request::builder()
+                    .uri("/readyz")
+                    .header("x-request-id", "req-draining")
+                    .body(Body::empty())
+                    .expect("readyz request should build"),
+            )
+            .await
+            .expect("readyz request should succeed");
+        assert_eq!(draining_response.status(), StatusCode::SERVICE_UNAVAILABLE);
+        let draining_body = read_json_response(draining_response).await;
+        assert_eq!(
+            draining_body["error"]["details"]["reason"],
+            "api_server_draining"
+        );
+    }
+
     #[tokio::test]
     async fn creative_agent_draft_edit_rejects_unconfirmed_template_session() {
         let app = build_internal_creative_agent_app();
@@ -2658,6 +2698,18 @@ mod tests {
             bind_payload["user"]["phoneNumberMasked"],
             Value::String("138****8000".to_string())
         );
+        assert_eq!(
+            bind_payload["user"]["phoneNumber"],
+            Value::String("+8613800138000".to_string())
+        );
+        assert_eq!(
+            bind_payload["user"]["wechatAccount"],
+            Value::String("wx-mini-code-bind-001".to_string())
+        );
+        assert_eq!(
+            bind_payload["user"]["wechatDisplayName"],
+            Value::String("微信旅人".to_string())
+        );
         assert!(
             bind_payload["token"]
                 .as_str()
@@ -3345,6 +3397,10 @@ mod tests {
             serde_json::from_slice(&body).expect("response body should be valid json");
 
         assert_eq!(payload["user"]["id"], Value::String(seed_user.id));
+        assert_eq!(
+            payload["user"]["phoneNumber"],
+            Value::String("+8613800138016".to_string())
+        );
         assert_eq!(
             payload["availableLoginMethods"],
             serde_json::json!(["phone", "password", "wechat"])