fix bugs in software service

module/schools/src/Service/SoftwareService.php

@@ -31,7 +31,7 @@ class SoftwareService implements SoftwareServiceInterface
     public function getSoftwareCategories()
     {
         $software_categories = R::findAll('softwarecategory');
-        return $software_categories;
+        return $this->exportAll($software_categories);
     }
 
     public function updateSoftwareCategory($id, $data)
@@ -80,7 +80,7 @@ class SoftwareService implements SoftwareServiceInterface
     public function getSoftwareBySchoolId($id)
     {
         $software = R::findAll('software', 'school_id = ?', [$id]);
-        return $software->exportAll();
+        return $this->exportAll($software);
     }
 
     public function getSoftwareByLabId($id)
@@ -88,4 +88,14 @@ class SoftwareService implements SoftwareServiceInterface
         $software = R::findAll('software', 'lab_id = ?', [$id]);
         return $software->exportAll();
     }
+
+    private function exportAll($beans)
+    {
+        $exported = [];
+        foreach($beans as $bean)
+        {
+            $exported[] = $bean->export();
+        }
+        return $exported;
+    }
 }

module/schools/src/Service/SoftwareServiceInterface.php

@@ -13,7 +13,7 @@ interface SoftwareServiceInterface
 {
     public function createSoftwareCategory($name);
     public function getSoftwareCategoryById($id);
-    public function getSoftwareCagegories();
+    public function getSoftwareCategories();
     public function updateSoftwareCategory($id, $data);
     public function createSoftware(array $data);
     public function updateSoftware(array $data, $id);