enh: update local DB when user adds dataset to collection

Author: paulmueller

dcoraid/dbmodel/db_api_cached.py

@@ -74,7 +74,7 @@ def get_collections(self, refresh=False):
             clist += self.ai.get_collections()
         return clist
 
-    def get_dataset_dictionary(self, ds_id):
+    def get_dataset_dict(self, ds_id):
         return self._mc[ds_id]
 
     def get_datasets_user_following(self) -> DBExtract:

dcoraid/gui/dbview/filter_chain.py

@@ -128,6 +128,7 @@ def update_resources(self):
 
 
 class FilterChainUser(FilterChain):
+    added_datasets_to_collection = QtCore.pyqtSignal(dict, list)
 
     def __init__(self, *args, **kwargs):
         """Filter chain with user-related features"""
@@ -182,3 +183,5 @@ def on_add_datasets_to_collection(self):
                                   # "capacity" should not be necessary
                                   # https://github.com/ckan/ckan/issues/6543
                                   "capacity": "member"})
+                    self.added_datasets_to_collection.emit(collection,
+                                                           dataset_ids)

dcoraid/gui/panel_my_data/widget_my_data.py

@@ -31,6 +31,29 @@ def __init__(self, *args, **kwargs):
             self.on_refresh_private_data)
         self.user_filter_chain.download_resource.connect(
             self.request_download)
+        self.user_filter_chain.added_datasets_to_collection.connect(
+            self.on_added_datasets_to_collection)
+
+    @QtCore.pyqtSlot(dict, list)
+    def on_added_datasets_to_collection(self, collection, dataset_ids):
+        """User manually added a bunch of datasets to a collection"""
+        # Get the collection
+        for col in self.database.get_collections(refresh=True):
+            if col == collection["name"]:
+                cid = collection["id"]
+                break
+        else:
+            raise KeyError(f"Collection {collection['id']} not found!")
+        # Append it to each dataset
+        for ds_id in dataset_ids:
+            ds_dict = self.database.get_dataset_dict(ds_id)
+            collections = [g["id"] for g in ds_dict["groups"]]
+            if cid in collections:
+                c_idx = collections.index(cid)
+                ds_dict["groups"][c_idx].update(collection)
+            else:
+                ds_dict["groups"].append(collection)
+            self.database.update_dataset(ds_dict)
 
     @QtCore.pyqtSlot()
     def on_refresh_private_data(self):

tests/test_gui.py

@@ -142,7 +142,14 @@ def test_gui_mydata_dataset_add_to_collection(mw, qtbot):
             return_value=(f"{ii}: {item['display_name']}", True)):
         qtbot.mouseClick(fw_datasets.toolButton_custom,
                          QtCore.Qt.MouseButton.LeftButton)
-    # Now check whether that worked
+
+    # Check whether dataset is in collection in database
+    ds_dict_db = mw.database.get_dataset_dict(ds_id)
+    assert "groups" in ds_dict_db
+    assert len(ds_dict_db["groups"]) == 1
+    assert ds_dict_db["groups"][0]["name"] == defaults["collection"]
+
+    # Check whether dataset is in collection via API
     ds_dict = api.get("package_show", id=ds_id)
     assert "groups" in ds_dict
     assert len(ds_dict["groups"]) == 1
@@ -226,7 +233,7 @@ def test_gui_upload_simple(mw, qtbot):
     mw.panel_upload.widget_jobs.update_job_status()
     QtWidgets.QApplication.processEvents(
         QtCore.QEventLoop.ProcessEventsFlag.AllEvents, 200)
-    assert mw.database.get_dataset_dictionary(dlg.dataset_id)
+    assert mw.database.get_dataset_dict(dlg.dataset_id)
 
 
 def test_gui_upload_task(mw, qtbot):