SSDM-12929: refactor code duplication in the plugins by introducing function...

SSDM-12929: refactor code duplication in the plugins by introducing function getDataSetsOfSampleAndItsChildren() in the main script

ui-eln-lims/src/core-plugins/eln-lims/1/dss/file-system-plugins/eln-tree/resolver-plugins/flow.py

-from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search import DataSetSearchCriteria
-from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions import DataSetFetchOptions
-
 import script
 
 def addSampleChildNodes(path, samplePermId, sampleType, response, acceptor, context):
-    dataSetSearchCriteria = DataSetSearchCriteria()
-    dataSetSearchCriteria.withOrOperator()
-    dataSetSearchCriteria.withSample().withPermId().thatEquals(samplePermId)
-    parentsSearchCriteria = dataSetSearchCriteria.withSample().withParents()
-    parentsSearchCriteria.withPermId().thatEquals(samplePermId)
-    fetchOptions = DataSetFetchOptions()
-    fetchOptions.withType()
-    fetchOptions.withProperties()
-    fetchOptions.withSample()
-    dataSets = context.getApi().searchDataSets(context.getSessionToken(), dataSetSearchCriteria, fetchOptions).getObjects()
+    dataSets = script.getDataSetsOfSampleAndItsChildren(samplePermId, context)
     for dataSet in dataSets:
         if acceptor.acceptDataSet(dataSet):
             dataSetCode = dataSet.getCode()
@@ -22,16 +10,7 @@ def addSampleChildNodes(path, samplePermId, sampleType, response, acceptor, cont
             script.addDataSetFileNodes(path, dataSetCode, contentNode, response, acceptor, context)
 
 def addSampleChildNodesWithPlates(path, samplePermId, sampleType, response, acceptor, context):
-    dataSetSearchCriteria = DataSetSearchCriteria()
-    dataSetSearchCriteria.withOrOperator()
-    dataSetSearchCriteria.withSample().withPermId().thatEquals(samplePermId)
-    parentsSearchCriteria = dataSetSearchCriteria.withSample().withParents()
-    parentsSearchCriteria.withPermId().thatEquals(samplePermId)
-    fetchOptions = DataSetFetchOptions()
-    fetchOptions.withType()
-    fetchOptions.withProperties()
-    fetchOptions.withSample().withType()
-    dataSets = context.getApi().searchDataSets(context.getSessionToken(), dataSetSearchCriteria, fetchOptions).getObjects()
+    dataSets = script.getDataSetsOfSampleAndItsChildren(samplePermId, context)
     for dataSet in dataSets:
         sampleTypeCode = dataSet.getSample().getType().getCode()
         if not sampleTypeCode.endswith("_WELL"):

ui-eln-lims/src/core-plugins/eln-lims/1/dss/file-system-plugins/eln-tree/resolver-plugins/microscopy.py

-from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search import DataSetSearchCriteria
-from ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions import DataSetFetchOptions
-
 import script
 
 acceptor.hideDataSetType("MICROSCOPY_IMG_CONTAINER")
@@ -9,16 +6,7 @@ acceptor.hideDataSetType("MICROSCOPY_IMG_THUMBNAIL")
 #acceptor.hideSampleType("MICROSCOPY_SAMPLE_TYPE")
 
 def addSampleChildNodes(path, samplePermId, sampleType, response, acceptor, context):
-    dataSetSearchCriteria = DataSetSearchCriteria()
-    dataSetSearchCriteria.withOrOperator()
-    dataSetSearchCriteria.withSample().withPermId().thatEquals(samplePermId)
-    parentsSearchCriteria = dataSetSearchCriteria.withSample().withParents()
-    parentsSearchCriteria.withPermId().thatEquals(samplePermId)
-    fetchOptions = DataSetFetchOptions()
-    fetchOptions.withType()
-    fetchOptions.withProperties()
-    fetchOptions.withSample()
-    dataSets = context.getApi().searchDataSets(context.getSessionToken(), dataSetSearchCriteria, fetchOptions).getObjects()
+    dataSets = script.getDataSetsOfSampleAndItsChildren(samplePermId, context)
     for dataSet in dataSets:
         if acceptor.acceptDataSet(dataSet):
             dataSetCode = dataSet.getCode()

ui-eln-lims/src/core-plugins/eln-lims/1/dss/file-system-plugins/eln-tree/script.py

@@ -359,6 +359,18 @@ def getContentNode(permId, context):
     contentNode = content.tryGetNode(splittedId[1]) if len(splittedId) > 1 else content.getRootNode()
     return dataSetCode, contentNode, content
 
+def getDataSetsOfSampleAndItsChildren(samplePermId, context):
+    dataSetSearchCriteria = DataSetSearchCriteria()
+    dataSetSearchCriteria.withOrOperator()
+    dataSetSearchCriteria.withSample().withPermId().thatEquals(samplePermId)
+    parentsSearchCriteria = dataSetSearchCriteria.withSample().withParents()
+    parentsSearchCriteria.withPermId().thatEquals(samplePermId)
+    fetchOptions = DataSetFetchOptions()
+    fetchOptions.withType()
+    fetchOptions.withProperties()
+    fetchOptions.withSample().withType()
+    return context.getApi().searchDataSets(context.getSessionToken(), dataSetSearchCriteria, fetchOptions).getObjects()
+
 def listDataSets(path, dataSetSearchCriteria, assignedToSample, response, acceptor, context):
     fetchOptions = DataSetFetchOptions()
     fetchOptions.withType()