Merge remote-tracking branch 'origin/main'

Author: ljl

middleware/flow/src/api/ci/flow_ci_inst_api.rs

@@ -1,7 +1,6 @@
 use tardis::web::context_extractor::TardisContextExtractor;
-use tardis::web::poem::web::Query;
-use tardis::web::poem_openapi;
 use tardis::web::poem_openapi::payload::Json;
+use tardis::web::poem_openapi::{self, param::Query};
 use tardis::web::web_resp::{TardisApiResult, TardisResp, Void};
 use tardis::{log, tokio};
 
@@ -53,18 +52,16 @@ impl FlowCiInstApi {
 
     /// Get list of instance id by rel_business_obj_id / 通过业务ID获取实例信息
     #[oai(path = "/find_detail_by_obj_ids", method = "get")]
-    async fn find_detail_by_obj_ids(&self, rel_business_obj_ids: Query<String>, ctx: TardisContextExtractor) -> TardisApiResult<Vec<FlowInstDetailResp>> {
-        let mut funs = flow_constants::get_tardis_inst();
-        let rel_business_obj_ids: Vec<_> = rel_business_obj_ids.split(',').map(|id| id.to_string()).collect();
-        funs.begin().await?;
+    async fn find_detail_by_obj_ids(&self, obj_ids: Query<String>, ctx: TardisContextExtractor) -> TardisApiResult<Vec<FlowInstDetailResp>> {
+        let funs = flow_constants::get_tardis_inst();
+        let rel_business_obj_ids: Vec<_> = obj_ids.0.split(',').map(|id| id.to_string()).collect();
         let inst_ids = FlowInstServ::get_inst_ids_by_rel_business_obj_id(rel_business_obj_ids, &funs, &ctx.0).await?;
         let mut result = vec![];
         for inst_id in inst_ids {
-            if let Ok(inst_detail) = FlowInstServ::get(&inst_id, &funs, &ctx.0).await{
+            if let Ok(inst_detail) = FlowInstServ::get(&inst_id, &funs, &ctx.0).await {
                 result.push(inst_detail);
             }
         }
-        funs.commit().await?;
         TardisResp::ok(result)
     }
 

middleware/flow/tests/test_flow_scenes_fsm.rs

@@ -578,6 +578,7 @@ pub async fn test(flow_client: &mut TestHttpClient, _kv_client: &mut TestHttpCli
     let ticket_inst_rel_id = "mock-ticket-obj-id".to_string();
     let iter_inst_rel_id1 = "mock-iter-obj-id1".to_string();
     let iter_inst_rel_id2 = "mock-iter-obj-id2".to_string();
+    let req_inst_rel_id2 = "mock-req-obj-id2".to_string();
     let req_inst_id1: String = flow_client
         .post(
             "/cc/inst",
@@ -594,7 +595,7 @@ pub async fn test(flow_client: &mut TestHttpClient, _kv_client: &mut TestHttpCli
             &FlowInstStartReq {
                 tag: "REQ".to_string(),
                 create_vars: None,
-                rel_business_obj_id: TardisFuns::field.nanoid(),
+                rel_business_obj_id: req_inst_rel_id2.clone(),
             },
         )
         .await;
@@ -780,7 +781,7 @@ pub async fn test(flow_client: &mut TestHttpClient, _kv_client: &mut TestHttpCli
         )
         .await;
     let _: Void = flow_client.get("/ci/inst/trigger_front_action").await;
-    tokio::time::sleep(tokio::time::Duration::from_secs(10)).await;
+    tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;
     let state_and_next_transitions: Vec<FlowInstFindStateAndTransitionsResp> = flow_client
         .put(
             "/cc/inst/batch/state_transitions",
@@ -791,5 +792,8 @@ pub async fn test(flow_client: &mut TestHttpClient, _kv_client: &mut TestHttpCli
         )
         .await;
     assert_eq!(state_and_next_transitions[0].current_flow_state_name, "已完成");
+    let flow_inst_list: Vec<FlowInstDetailResp> = flow_client.get(&format!("/ci/inst/find_detail_by_obj_ids?obj_ids={}", req_inst_rel_id2)).await;
+    assert_eq!(flow_inst_list[0].id, req_inst_id2);
+
     Ok(())
 }