Refactor the code from getServices()

senaite · Nov 5, 2024 · df4bf14 · df4bf14
1 parent a4d9e59
commit df4bf14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/senaite/core/content/analysisprofile.py b/src/senaite/core/content/analysisprofile.py
@@ -260,12 +260,11 @@ def getServices(self, active_only=True):
 
         :returns: List of analysis service objects
         """
-        services = []
-        for uid in self.getServiceUIDs():
-            obj = api.get_object(uid)
-            if not active_only or api.is_active(obj):
-                services.append(obj)
-        return services
+        services = map(api.get_object, self.getServiceUIDs())
+        if active_only:
+            # filter out inactive services
+            services = filter(api.is_active, services)
+        return list(services)
 
     @security.protected(permissions.ModifyPortalContent)
     def setServices(self, value):

diff --git a/src/senaite/core/content/sampletemplate.py b/src/senaite/core/content/sampletemplate.py
@@ -461,12 +461,11 @@ def getServices(self, active_only=True):
 
         :returns: List of analysis service objects
         """
-        services = []
-        for uid in self.getServiceUIDs():
-            obj = api.get_object(uid)
-            if not active_only or api.is_active(obj):
-                services.append(obj)
-        return services
+        services = map(api.get_object, self.getServiceUIDs())
+        if active_only:
+            # filter out inactive services
+            services = filter(api.is_active, services)
+        return list(services)
 
     @security.protected(permissions.ModifyPortalContent)
     def setServices(self, value):