fixes according to reviewbiest-2748

3 files changed, 2 insertions, 47 deletions

diff --git a/lib/models/Courseware/Instance.php b/lib/models/Courseware/Instance.php
index c9005de..9bea0cf 100644
--- a/lib/models/Courseware/Instance.php
+++ b/lib/models/Courseware/Instance.php
@@ -14,51 +14,6 @@ namespace Courseware;
 class Instance
 {
     /**
-     * @param \Range $range
-     * @return ?static
-     */
-    public static function existsForRange(\Range $range): bool
-    {
-        switch ($range->getRangeType()) {
-            case 'course':
-            case 'user':
-                $result = \DBManager::get()->fetchOne(
-                    'SELECT COUNT(*) as count FROM cw_structural_elements WHERE range_id = ? AND range_type = ? AND parent_id IS NULL',
-                    [$range->getRangeId(), $range->getRangeType()]
-                );
-
-                return ((int) $result['count']) > 0;
-
-            default:
-                throw new \InvalidArgumentException('Only ranges of type "user" and "course" are currently supported.');
-        }
-    }
-
-
-        /**
-     * @param \Range $range
-     * @return ?static
-     */
-    public static function findForRange(\Range $range)
-    {
-        $root = null;
-        switch ($range->getRangeType()) {
-            case 'course':
-                $root = StructuralElement::getCoursewareCourse($range->getRangeId());
-                break;
-            case 'user':
-                $root = StructuralElement::getCoursewareUser($range->getRangeId());
-                break;
-        }
-        if (!$root) {
-            return null;
-        }
-
-        return new self($root);
-    }
-
-
-    /**
      * @var StructuralElement
      */
     private $root;
diff --git a/resources/vue/store/courseware/courseware-shelf.module.js b/resources/vue/store/courseware/courseware-shelf.module.js
index e5ea54c..e94a374 100644
--- a/resources/vue/store/courseware/courseware-shelf.module.js
+++ b/resources/vue/store/courseware/courseware-shelf.module.js
@@ -357,7 +357,7 @@ export const actions = {
 
          return items
             .filter(({ membership, course }) => {
-                return course.relationships.courseware.data;
+                return course.relationships['courseware-units'].data.length > 0;
             })
             .map(({ course }) => course);
 
diff --git a/resources/vue/store/courseware/courseware.module.js b/resources/vue/store/courseware/courseware.module.js
index b6a383b..4f84c93 100644
--- a/resources/vue/store/courseware/courseware.module.js
+++ b/resources/vue/store/courseware/courseware.module.js
@@ -1282,7 +1282,7 @@ export const actions = {
 
          return items
             .filter(({ membership, course }) => {
-                return course.relationships.courseware.data;
+                return course.relationships['courseware-units'].data.length > 0;
             })
             .map(({ course }) => course);