Merge pull request #46 from haniffalab/fix/dataset_id

handle admin or plugin study update to trigger dataset udpate

Author: davehorsfall

src/api/dataset/content-types/dataset/lifecycles.js

@@ -31,7 +31,15 @@ module.exports = {
           });
       }
 
-      event.params.data.dataset_id = (data.study?.connect?.[0] || entry.study?.id || null) + ':' + (event.params.data.uid || entry.uid);
+      const {connect, disconnect} = data.study || {};
+      let study_id = entry.study?.id || null;
+      if (connect?.length) {
+        study_id = connect[0].id;
+      }
+      if (disconnect?.length && disconnect[0].id === study_id) {
+        study_id = null;
+      }
+      event.params.data.dataset_id = (study_id) + ':' + (event.params.data.uid || entry.uid);
     }
   },
 };

src/api/study/content-types/study/lifecycles.js

@@ -43,24 +43,29 @@ module.exports = {
     event.state = data.datasets;
   },
   // Update datasets' dataset_id when connecting/disconnecting to/from study
+
+  // If created through admin event.state will be an object with connect, disconnect
+  // If created through import plugin datasets will be an array of ids
   async afterCreate(event) {
-    const datasets = event.state;
+    let datasets = event.state;
+    if (!Array.isArray(datasets)){
+      datasets = datasets.connect?.map((d) => d.id) || [];
+    }
     for (const idx in datasets) {
       await strapi.entityService.update('api::dataset.dataset', datasets[idx], {
-        data: { study: event.result.id }
+        data: {} // study id will already be added to the dataset
       });
     }
   },
   async afterUpdate(event) {
-    const { disconnect, connect } = event.state;
-    for (const idx in disconnect) {
-      await strapi.entityService.update('api::dataset.dataset', disconnect[idx].id, {
-        data: { study: null }
-      });
+    let datasets = event.state;
+    if (!Array.isArray(datasets)){
+      const {connect = [], disconnect = []} = datasets;
+      datasets = [...connect.map((d) => d.id), ...disconnect.map((d) => d.id)];
     }
-    for (const idx in connect) {
-      await strapi.entityService.update('api::dataset.dataset', connect[idx].id, {
-        data: { study: event.result.id }
+    for (const idx in datasets) {
+      await strapi.entityService.update('api::dataset.dataset', datasets[idx], {
+        data: {} // study id will already be added to the dataset
       });
     }
   }