Merge pull request #9 from CoLearn-Dev/issue-7

- support protocol package
CoLearn-Dev · May 19, 2022 · b3e886d · b3e886d
2 parents 367cbf1 + 773e3d1
commit b3e886d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "colink-server"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 [dependencies]

diff --git a/src/service/task.rs b/src/service/task.rs
@@ -359,7 +359,18 @@ impl crate::server::MyService {
     }
 
     async fn remove_task_old_status(&self, user_id: &str, task: &Task) -> Result<(), Status> {
-        let list_key = format!("protocols:{}:{}", task.protocol_name, task.status);
+        let protocol_key = if task.status != "started" {
+            task.protocol_name.clone()
+        } else {
+            let mut ptype = "";
+            for p in &task.participants {
+                if p.user_id == user_id {
+                    ptype = &p.ptype;
+                }
+            }
+            format!("{}:{}", task.protocol_name, ptype)
+        };
+        let list_key = format!("protocols:{}:{}", protocol_key, task.status);
         self.remove_task_from_list_in_storage(user_id, task, &list_key)
             .await?;
         let list_key = format!("tasks:status:{}", task.status);
@@ -406,7 +417,18 @@ impl crate::server::MyService {
     }
 
     async fn add_task_new_status(&self, user_id: &str, task: &Task) -> Result<(), Status> {
-        let list_key = format!("protocols:{}:{}", task.protocol_name, task.status);
+        let protocol_key = if task.status != "started" {
+            task.protocol_name.clone()
+        } else {
+            let mut ptype = "";
+            for p in &task.participants {
+                if p.user_id == user_id {
+                    ptype = &p.ptype;
+                }
+            }
+            format!("{}:{}", task.protocol_name, ptype)
+        };
+        let list_key = format!("protocols:{}:{}", protocol_key, task.status);
         self.add_task_to_list_in_storage(user_id, task, &list_key)
             .await?;
         let list_key = format!("tasks:status:{}", task.status);

diff --git a/tests/pull-and-build-sdk.sh b/tests/pull-and-build-sdk.sh
@@ -2,8 +2,8 @@
 set -e
 rm -rf sdk-a
 rm -rf sdk-p
-git clone --recursive git@github.com:CoLearn-Dev/colink-sdk-a-rust-dev.git -b v0.1.0 sdk-a
-git clone --recursive git@github.com:CoLearn-Dev/colink-sdk-p-rust-dev.git -b v0.1.0 sdk-p
+git clone --recursive git@github.com:CoLearn-Dev/colink-sdk-a-rust-dev.git -b v0.1.1 sdk-a
+git clone --recursive git@github.com:CoLearn-Dev/colink-sdk-p-rust-dev.git -b v0.1.2 sdk-p
 cd sdk-a
 cargo build --all-targets
 cd ..