tags error from rustlib fixed

also
other refactorization in dart codebase reflected

Author: SGI-CAPP-AT2

android/app/src/main/jniLibs/arm64-v8a/libtc_helper.so

@@ -117,6 +117,20 @@ class HomeController extends GetxController {
         widgetController.updateWidget();
       }
     });
+    tryRust();
+  }
+
+  Future<void> tryRust() async {
+    Directory? someDir = await getDownloadsDirectory();
+
+    addTask(taskdbDirPath: someDir != null ? someDir.path : "", map: {
+      'description': "some task from bridge 2",
+      "uuid": "270750a0-1801-4a24-8b29-a7aaf62fc74d",
+      "tags": "t1 t2 t3"
+    });
+
+    debugPrint(
+        "tryRustHere: ${await getAllTasksJson(taskdbDirPath: someDir != null ? someDir.path : "")}");
   }
 
   Future<List<String>> getUniqueProjects() async {

lib/app/modules/home/controllers/home_controller.dart

@@ -74,6 +74,8 @@ class TaskcDetailsController extends GetxController {
       due = formatDate(task.due).obs;
       start = "".obs;
       wait = "".obs;
+      debugPrint(
+          'Replica task tags while init: ${task.tags ?? task.tags?.join(", ")}');
       tags = task.tags != null
           ? task.tags!.map((e) => e.toString()).toList().obs
           : <String>[].obs;
@@ -236,6 +238,8 @@ class TaskcDetailsController extends GetxController {
         tags.toList(),
       );
     } else if (initialTask is TaskForReplica) {
+      debugPrint(
+          'Saving replica task changes... status ${status.string} ${tags.join(", ")}');
       final int nowEpoch = DateTime.now().millisecondsSinceEpoch ~/ 1000;
       final modifiedTask = TaskForReplica(
         modified: nowEpoch,

lib/app/modules/taskc_details/controllers/taskc_details_controller.dart

@@ -19,7 +19,8 @@ class Replica {
     "start",
     "wait",
     "priority",
-    "project"
+    "project",
+    "status"
   ];
   static Future<String> addTaskToReplica(
       HashMap<String, dynamic> newTask) async {
@@ -41,7 +42,6 @@ class Replica {
       }
     }
     map['uuid'] = UuidV4().generate();
-    debugPrint("Adding to Replica: $map");
     try {
       await addTask(taskdbDirPath: taskdbDirPath, map: map);
       await getAllTasksFromReplica(); //to update the db
@@ -62,13 +62,14 @@ class Replica {
     String tags = "";
     if (newTask.tags != null) {
       tags = newTask.tags!.join(" ");
+      debugPrint("Modifying Replica Task Tags: $tags");
       map["tags"] = tags;
     }
     var json = newTask.toJson();
     for (String attr in attrs) {
       if (json[attr] != null) map[attr] = json[attr].toString();
     }
-    debugPrint("Modifying Replica Task: $map");
+    debugPrint("Modifying Replica Task JSON the map: $map");
     try {
       await updateTask(
           uuidSt: newTask.uuid, taskdbDirPath: taskdbDirPath, map: map);
@@ -102,7 +103,6 @@ class Replica {
       debugPrint("Parsed from Replica: $tasks");
     } catch (e) {
       debugPrint("Error fetching from Replica $e");
-
       return [];
     }
     return tasks;

lib/app/v3/champion/Replica.dart

@@ -38,7 +38,9 @@ class TaskForReplica {
       description: json['description']?.toString(),
       tags: (json['tags'] is List)
           ? (json['tags'] as List).map((e) => e.toString()).toList()
-          : null,
+          : (json['tags'] is String)
+              ? json['tags'].toString().split(' ')
+              : null,
       uuid: json['uuid']?.toString() ?? '',
       priority: json['priority']?.toString(),
       project: json['project']?.toString(),

lib/app/v3/champion/models/task_for_replica.dart

@@ -42,7 +42,8 @@ fn get_all_tasks(taskdb_dir_path: String) -> Vec<HashMap<String, String>> {
         for (k, v) in value.get_taskmap() {
             if k.contains("tag_") {
                 if let Some(stripped) = k.strip_prefix("tag_") {
-                    tags.push_str(stripped);
+					tags.push_str(stripped);
+					tags.push(' ');
                 }
             } else {
                 map.insert(k.into(), v.into());
@@ -116,14 +117,37 @@ pub fn update_task(
                     let _ = t.set_priority(value, &mut ops);
                 }
                 "tags" => {
-                    for part in value.split_whitespace() {
+					let existing_tags: Vec<String> = t
+						.get_taskmap()
+						.iter()
+						.filter_map(|(k, _)| k.strip_prefix("tag_").map(|s| s.to_string()))
+						.collect();
+					for tag_name in existing_tags {
+						println!("removing tag at rust side {}", tag_name);
+						let mut tag = Tag::from_str(&tag_name).unwrap();
+						let _ = t.remove_tag(&mut tag, &mut ops);
+					}
+                    
+					for part in value.split_whitespace() {
+                        println!("tag at rust side {}", part);
                         let mut tag = Tag::from_str(part).unwrap();
                         let _ = t.add_tag(&mut tag, &mut ops);
                     }
                 }
                 "project" => {
                     let _ = t.set_user_defined_attribute("project", value, &mut ops);
                 }
+                "status" => {
+                    let status = match value.as_str() {
+                        "pending" => taskchampion::Status::Pending,
+                        "completed" => taskchampion::Status::Completed,
+                        "deleted" => taskchampion::Status::Deleted,
+                        _ => taskchampion::Status::Pending,
+                    };
+                    // print!("status at rust side {}", value);
+                    println!("status at rust side {}", value);
+                    let _ = t.set_status(status, &mut ops);
+                }
                 _ => {}
             }
         }
@@ -213,3 +237,36 @@ pub async fn sync(
     replica.sync(&mut server, false).unwrap();
     0
 }
+
+#[test]
+fn test_add_task_with_tags() {
+    use std::{collections::HashMap, env, fs};
+    // create unique temporary directory for taskdb
+    let tmp = env::temp_dir().join(format!("taskdb_test_{}", Uuid::new_v4()));
+    let taskdb_path = tmp.to_string_lossy().into_owned();
+    fs::create_dir_all(&tmp).expect("create temp taskdb dir");
+
+    // prepare task map with tags
+    let mut map: HashMap<String, String> = HashMap::new();
+    let uuid = Uuid::new_v4().to_string();
+    map.insert("uuid".to_string(), uuid.clone());
+    map.insert("description".to_string(), "test task".to_string());
+    map.insert("tags".to_string(), "tag1 tag2".to_string());
+
+    // add task
+    let res = add_task(taskdb_path.clone(), map);
+    assert_eq!(res, 0);
+
+    // read tasks as json and verify tags are present
+    let json = get_all_tasks_json(taskdb_path.clone()).expect("get_all_tasks_json");
+    let tasks: Vec<HashMap<String, String>> = serde_json::from_str(&json).expect("parse json");
+    let found = tasks.into_iter().find(|m| m.get("uuid").map(|s| s == &uuid).unwrap_or(false));
+    assert!(found.is_some(), "task with uuid not found");
+    let task = found.unwrap();
+    let tags = task.get("tags").map(|s| s.as_str()).unwrap_or("");
+    assert!(tags.contains("tag1"), "tag1 missing in tags: {}", tags);
+    assert!(tags.contains("tag2"), "tag2 missing in tags: {}", tags);
+
+    // cleanup
+    fs::remove_dir_all(&tmp).ok();
+}