fix:roll back change resource & member_id in GraphQL mutations/delete_resources function

src/api/graphql/operations/assets.rs

@@ -109,15 +109,15 @@ impl AssetsGraphQLMutation {
     }
 
     async fn delete_asset(&self, ctx: &Context<'_>, id: Uuid) -> Result<Asset> {
-        let (core, _member_id) = extract_context(ctx)?;
+        let (core, member_id) = extract_context(ctx)?;
 
         let asset = core.engine.delete_asset(id).await?;
         let saved_asset = asset.clone();
 
         tokio::spawn(async move {
             create_change(
                 &core,
-                asset.owner_id,
+                member_id,
                 asset.id,
                 ChangeOperation::Delete,
                 ChangeResourceType::Assets,

src/api/graphql/operations/changes.rs

@@ -1,16 +1,7 @@
-use crate::api::graphql::{
-    commons::{create_change, extract_context},
-    resources::changes::Change,
-};
+use crate::api::graphql::{commons::extract_context, resources::changes::Change};
 use async_graphql::{Context, Object, Result};
 
-use plexo_sdk::resources::changes::{
-    change::{ChangeOperation, ChangeResourceType},
-    operations::{ChangeCrudOperations, CreateChangeInput, GetChangesInput, UpdateChangeInput},
-};
-use serde_json::json;
-use tokio::task;
-// use tokio_stream::{Stream, StreamExt};
+use plexo_sdk::resources::changes::operations::{ChangeCrudOperations, CreateChangeInput, GetChangesInput, UpdateChangeInput};
 use uuid::Uuid;
 
 #[derive(Default)]
@@ -59,54 +50,23 @@ impl ChangesGraphQLMutation {
     }
 
     async fn update_change(&self, ctx: &Context<'_>, id: Uuid, input: UpdateChangeInput) -> Result<Change> {
-        let (core, member_id) = extract_context(ctx)?;
+        let (core, _member_id) = extract_context(ctx)?;
 
-        let saved_input = input.clone();
-
-        let change = core.engine.update_change(id, input).await?;
-
-        let change = change.clone();
-        let saved_change = change.clone();
-
-        create_change(
-            &core,
-            member_id,
-            change.id,
-            ChangeOperation::Update,
-            ChangeResourceType::Changes,
-            serde_json::to_string(&json!({
-                "input": saved_input,
-                "result": change,
-            }))
-            .unwrap(),
-        )
-        .await
-        .unwrap();
-
-        Ok(saved_change.into())
+        core.engine
+            .update_change(id, input)
+            .await
+            .map_err(|err| async_graphql::Error::new(err.to_string()))
+            .map(|change| change.into())
     }
 
     async fn delete_change(&self, ctx: &Context<'_>, id: Uuid) -> Result<Change> {
         let (core, _member_id) = extract_context(ctx)?;
 
-        let change = core.engine.delete_change(id).await?;
-        let saved_change = change.clone();
-
-        create_change(
-            &core,
-            change.owner_id,
-            change.id,
-            ChangeOperation::Delete,
-            ChangeResourceType::Changes,
-            serde_json::to_string(&json!({
-                "result": change,
-            }))
-            .unwrap(),
-        )
-        .await
-        .unwrap();
-
-        Ok(saved_change.into())
+        core.engine
+            .delete_change(id)
+            .await
+            .map_err(|err| async_graphql::Error::new(err.to_string()))
+            .map(|change| change.into())
     }
 }
 

src/api/graphql/operations/labels.rs

@@ -109,15 +109,15 @@ impl LabelsGraphQLMutation {
     }
 
     async fn delete_label(&self, ctx: &Context<'_>, id: Uuid) -> Result<Label> {
-        let (core, _member_id) = extract_context(ctx)?;
+        let (core, member_id) = extract_context(ctx)?;
 
         let label = core.engine.delete_label(id).await?;
         let saved_label = label.clone();
 
         tokio::spawn(async move {
             create_change(
                 &core,
-                label.owner_id,
+                member_id,
                 label.id,
                 ChangeOperation::Delete,
                 ChangeResourceType::Labels,

src/api/graphql/operations/projects.rs

@@ -77,17 +77,6 @@ impl ProjectsGraphQLMutation {
         });
 
         Ok(saved_project.into())
-
-        // let (core, member_id) = extract_context(ctx)?;
-
-        // let mut input = input;
-        // input.owner_id = member_id;
-
-        // core.engine
-        //     .create_project(input)
-        //     .await
-        //     .map_err(|err| async_graphql::Error::new(err.to_string()))
-        //     .map(|project| project.into())
     }
 
     async fn update_project(&self, ctx: &Context<'_>, id: Uuid, input: UpdateProjectInput) -> Result<Project> {
@@ -121,15 +110,15 @@ impl ProjectsGraphQLMutation {
     }
 
     async fn delete_project(&self, ctx: &Context<'_>, id: Uuid) -> Result<Project> {
-        let (core, _member_id) = extract_context(ctx)?;
+        let (core, member_id) = extract_context(ctx)?;
 
         let project = core.engine.delete_project(id).await?;
         let saved_project = project.clone();
 
         tokio::spawn(async move {
             create_change(
                 &core,
-                project.owner_id,
+                member_id,
                 project.id,
                 ChangeOperation::Delete,
                 ChangeResourceType::Projects,
@@ -143,12 +132,6 @@ impl ProjectsGraphQLMutation {
         });
 
         Ok(saved_project.into())
-
-        // core.engine
-        //     .delete_project(id)
-        //     .await
-        //     .map_err(|err| async_graphql::Error::new(err.to_string()))
-        //     .map(|project| project.into())
     }
 }
 

src/api/graphql/operations/tasks.rs

@@ -149,15 +149,15 @@ impl TasksGraphQLMutation {
     }
 
     async fn delete_task(&self, ctx: &Context<'_>, id: Uuid) -> Result<Task> {
-        let (core, _member_id) = extract_context(ctx)?;
+        let (core, member_id) = extract_context(ctx)?;
 
         let task = core.engine.delete_task(id).await?;
         let saved_task = task.clone();
 
         tokio::spawn(async move {
             create_change(
                 &core,
-                task.owner_id,
+                member_id,
                 task.id,
                 ChangeOperation::Delete,
                 ChangeResourceType::Tasks,

src/api/graphql/operations/teams.rs

@@ -77,17 +77,6 @@ impl TeamsGraphQLMutation {
         });
 
         Ok(saved_team.into())
-
-        // let (core, member_id) = extract_context(ctx)?;
-
-        // let mut input = input;
-        // input.owner_id = member_id;
-
-        // core.engine
-        //     .create_team(input)
-        //     .await
-        //     .map_err(|err| async_graphql::Error::new(err.to_string()))
-        //     .map(|team| team.into())
     }
 
     async fn update_team(&self, ctx: &Context<'_>, id: Uuid, input: UpdateTeamInput) -> Result<Team> {
@@ -118,24 +107,18 @@ impl TeamsGraphQLMutation {
         });
 
         Ok(saved_team.into())
-
-        // core.engine
-        //     .update_team(id, input)
-        //     .await
-        //     .map_err(|err| async_graphql::Error::new(err.to_string()))
-        //     .map(|team| team.into())
     }
 
     async fn delete_team(&self, ctx: &Context<'_>, id: Uuid) -> Result<Team> {
-        let (core, _member_id) = extract_context(ctx)?;
+        let (core, member_id) = extract_context(ctx)?;
 
         let team = core.engine.delete_team(id).await?;
         let saved_team = team.clone();
 
         tokio::spawn(async move {
             create_change(
                 &core,
-                team.owner_id,
+                member_id,
                 team.id,
                 ChangeOperation::Delete,
                 ChangeResourceType::Teams,
@@ -149,12 +132,6 @@ impl TeamsGraphQLMutation {
         });
 
         Ok(saved_team.into())
-
-        // core.engine
-        //     .delete_team(id)
-        //     .await
-        //     .map_err(|err| async_graphql::Error::new(err.to_string()))
-        //     .map(|team| team.into())
     }
 }