iam:unbind res with api (#589)

Author: ZzIsGod1019

support/iam/src/basic/serv/iam_res_serv.rs

@@ -254,26 +254,21 @@ impl RbumItemCrudOperation<iam_res::ActiveModel, IamResAddReq, IamResModifyReq,
     }
 
     async fn before_delete_item(id: &str, funs: &TardisFunsInst, ctx: &TardisContext) -> TardisResult<Option<IamResDetailResp>> {
-        let deleted_item = Self::get_item(
-            id,
-            &IamResFilterReq {
-                basic: RbumBasicFilterReq {
-                    with_sub_own_paths: true,
+        Ok(Some(
+            Self::get_item(
+                id,
+                &IamResFilterReq {
+                    basic: RbumBasicFilterReq {
+                        with_sub_own_paths: true,
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
-                ..Default::default()
-            },
-            funs,
-            ctx,
-        )
-        .await?;
-        if deleted_item.kind == IamResKind::Ele || deleted_item.kind == IamResKind::Menu {
-            let delete_api_res = IamResServ::find_to_simple_rel_roles(&IamRelKind::IamResApi, id, None, None, funs, ctx).await?.into_iter().map(|rel| rel.rel_id).collect_vec();
-            for delete_api_id in delete_api_res {
-                IamRelServ::delete_simple_rel(&IamRelKind::IamResApi, &delete_api_id, id, funs, ctx).await?;
-            }
-        }
-        Ok(Some(deleted_item))
+                funs,
+                ctx,
+            )
+            .await?,
+        ))
     }
 
     async fn after_delete_item(_: &str, deleted_item: &Option<IamResDetailResp>, funs: &TardisFunsInst, ctx: &TardisContext) -> TardisResult<()> {
@@ -623,6 +618,29 @@ impl IamResServ {
         }
         Ok(result)
     }
+
+    pub async fn delete_res(id: &str, funs: &TardisFunsInst, ctx: &TardisContext) -> TardisResult<u64> {
+        let item_detail = Self::get_item(
+            id,
+            &IamResFilterReq {
+                basic: RbumBasicFilterReq {
+                    with_sub_own_paths: true,
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            funs,
+            ctx,
+        )
+        .await?;
+        if item_detail.kind == IamResKind::Ele || item_detail.kind == IamResKind::Menu {
+            let delete_api_res = IamResServ::find_to_simple_rel_roles(&IamRelKind::IamResApi, id, None, None, funs, ctx).await?.into_iter().map(|rel| rel.rel_id).collect_vec();
+            for delete_api_id in delete_api_res {
+                IamRelServ::delete_simple_rel(&IamRelKind::IamResApi, &delete_api_id, id, funs, ctx).await?;
+            }
+        }
+        Self::delete_item_with_all_rels(id, funs, ctx).await
+    }
 }
 
 impl IamMenuServ {

support/iam/src/console_system/api/iam_cs_res_api.rs

@@ -106,7 +106,7 @@ impl IamCsResApi {
         add_remote_ip(request, &ctx.0).await?;
         let mut funs = iam_constants::get_tardis_inst();
         funs.begin().await?;
-        IamResServ::delete_item_with_all_rels(&id.0, &funs, &ctx.0).await?;
+        IamResServ::delete_res(&id.0, &funs, &ctx.0).await?;
         funs.commit().await?;
         ctx.0.execute_task().await?;
         TardisResp::ok(Void {})