WebSVN – LeadersLinked - Services – Diff – /module/LeadersLinked/src/Controller/MicrolearningController.php

      * @param Storage $storage The storage service instance.
      * @return array An array of formatted capsule data.
      */
     private function _getCapsulesByTopic($topic, $storage)
+    {
-        $capsulesData = [];
+        $data = [];
-        // Get path for capsule images
-        $pathCapsule = $storage->getPathMicrolearningCapsule();
-        // Initialize mappers
-        $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
-        $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
-        $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
-        $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter); // Added mapper
-        // Fetch access granted capsule IDs for the current user
         $accessGrantedIds = $this->getAccessGranted();
+        if (!$topic) {
+            return $data;
+        }
+        if (!in_array($topic->id, $accessGrantedIds->topics)) {
+            return $data;
+        }
-        // Fetch active topic-capsule relations for the given topic
-        // Assuming the 'true' in the original call implied active relations/capsules.
+        $currentUserPlugin = $this->plugin('currentUserPlugin');
+        $currentUser = $currentUserPlugin->getUser();
-        // We fetch active relations first.
+        $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
         $topicCapsuleRelations = $topicCapsuleMapper->fetchAllActiveByTopicId($topic->id);
         $capsuleIdsToFetch = [];
-        if (!empty($topicCapsuleRelations)) {
-            foreach ($topicCapsuleRelations as $relation) {
-                // Ensure the user has access to this specific capsule ID from the relation
+        foreach ($topicCapsuleRelations as $relation) {
-                if (in_array($relation->capsule_id, $accessGrantedIds->capsules)) {
-                    $capsuleIdsToFetch[] = $relation->capsule_id;
+            if (in_array($relation->capsule_id, $accessGrantedIds->capsules)) {
                 $capsuleIdsToFetch[] = $relation->capsule_id;
             }
-        }
+        }
-        $capsules = [];
-        if (!empty($capsuleIdsToFetch)) {
-            // Fetch capsule details for the accessible and related capsule IDs
-            // Removed array_unique to match capsulesAction more closely
+        if (empty($capsuleIdsToFetch)) {
-            $capsules = $capsuleMapper->fetchAllByIds($capsuleIdsToFetch);
-        }
-        if(count($capsules) > 0) {
-            // Get current user
-            $currentUserPlugin = $this->plugin('currentUserPlugin');
+            return $data;
-            $currentUser = $currentUserPlugin->getUser();
-            // Iterate through each capsule to prepare its data
-            foreach($capsules as $capsule) {
-                // Get user progress for this capsule
-                $userCapsuleProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule->id);
-                $capsuleProgress = 0;
-                $capsuleCompleted = false;
+        }
-                if($userCapsuleProgress) {
-                    $capsuleProgress = $userCapsuleProgress->progress;
-                    $capsuleCompleted = $userCapsuleProgress->completed;
-                }
-                // Get comment count and average rating for the capsule
-                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id, $capsule->id);
-                // Add formatted capsule data to the array, ensuring links are present as in capsulesAction
-                array_push($capsulesData, [
-                    'uuid'              => $capsule->uuid,
-                    'name'              => $capsule->name ? $capsule->name : '',
-                    'description'       => $capsule->description ? $capsule->description : '',
-                    'image'             => $capsule->image ? $storage->getGenericImage($pathCapsule, $capsule->uuid, $capsule->image)  : '',
-                    'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
-                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
-                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
-                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
-                    'progress'          => $capsuleProgress,
-                    'completed'         => $capsuleCompleted,
-                    'order'             => $capsule->order,
-                    'added_on'          => $capsule->added_on,
-                    'updated_on'        => $capsule->updated_on,
+        $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
+        $capsules = $capsuleMapper->fetchAllByIds($capsuleIdsToFetch);
+        $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
-                ]);
+        $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
-            }
+        $path = $storage->getPathMicrolearningCapsule();
+        foreach ($capsules as $capsule) {
+            if (!in_array($capsule->id, $accessGrantedIds->capsules)) {
+                continue;
+            }
+            $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule->id);
+            $progress = $userProgress->progress ?? 0;
-            // Sort capsules by order, then by added_on date, then by name
+            $completed = $userProgress->completed ?? 0;
+            $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id, $capsule->id);
+            $image = $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image) : '';
-            usort($capsulesData, function($a, $b) {
+            $total_comments = strval($dataCountAndRatingAverage['total_comments']);
-                $result =  $a['order'] <=> $b['order'];
+            $total_rating = strval($dataCountAndRatingAverage['total_rating']);
-                if(0 == $result) {
+            array_push($data, [
+                'uuid'              => $capsule->uuid,
+                'name'              => $capsule->name ? $capsule->name : '',
-                    $result = strcasecmp($a['added_on'], $b['added_on']);
+                'description'       => $capsule->description ? $capsule->description : '',
-                    if(0 == $result) {
+                'image'             => $image,
-                        $result = strcasecmp($a['name'], $b['name']);
+                'total_comments'    => $total_comments,
+                'total_rating'      => $total_rating,
+                'progress'          => $progress,
-                    }
+                'completed'         => $completed,
                 'order'             => $capsule->order,
+                'added_on'          => $capsule->added_on,
-                // usort expects -1, 0, or 1. Adjusting the logic to fit this.
+                'updated_on'        => $capsule->updated_on,
-                if($result < 0) { return -1; } else if($result > 0) { return 1; } else { return 0; }
+            ]);
             });
-        return $capsulesData;
+        return $data;
+    }
+    public function capsulesAction()
-    public function capsulesAction()
-    {
-        $request = $this->getRequest();
+    {
-        if($request->isGet()) {
+        $request = $this->getRequest();
-            $currentUserPlugin = $this->plugin('currentUserPlugin');
+        if($request->isGet()) {
-            $currentUser = $currentUserPlugin->getUser();
+            // currentUserPlugin and currentUser are fetched within _getCapsulesByTopic if needed directly by it
             // $currentUserPlugin = $this->plugin('currentUserPlugin');
             // $currentUser = $currentUserPlugin->getUser();
-            $topic_id_param = $this->params()->fromRoute('topic_id'); // Renombrado para claridad
+            $topic_id_param = $this->params()->fromRoute('topic_id');
             $topicMapper = MicrolearningTopicMapper::getInstance($this->adapter);
-            $topic = $topicMapper->fetchOneByUuid($topic_id_param);
+            $topic = $topicMapper->fetchOneByUuid($topic_id_param); // $topic is the topic object
             if(!$topic) {
                 return new JsonModel([
                     'success' => false,
                     'data' => 'ERROR_TOPIC_NOT_FOUND'
                 ]);
-            }
-            $accessGrantedIds = $this->getAccessGranted();
-            if(!in_array($topic->id, $accessGrantedIds->topics)) {
-                return new JsonModel([
-                    'success' => false,
-                    'data' => 'ERROR_YOU_DO_NOT_HAVE_ACCESS_TO_THIS_TOPIC'
-                ]);
-            }
-            $data = [];
-            // Obtener la relación Tópico-Cápsula
-            $topicCapsuleMapper = MicrolearningTopicCapsuleMapper::getInstance($this->adapter);
-            $topicCapsuleRelations = $topicCapsuleMapper->fetchAllActiveByTopicId($topic->id);
-            $capsuleIdsToFetch = [];
-            $capsuleRelationData = []; // Para guardar datos específicos de la relación si es necesario
-            foreach ($topicCapsuleRelations as $relation) {
-                if (in_array($relation->capsule_id, $accessGrantedIds->capsules)) {
-                    $capsuleIdsToFetch[] = $relation->capsule_id;
+            }
-                    $capsuleRelationData[$relation->capsule_id] = [
-                        // Aquí puedes guardar datos de $relation si los necesitas más tarde
-                        // por ejemplo: 'publish_on' => $relation->publish_on
-                    ];
-                }
-            }
-            if (empty($capsuleIdsToFetch)) {
-                return new JsonModel([
-                    'success' => true,
                     'data' => [] // No hay cápsulas accesibles para este tópico
-                ]);
+            $accessGrantedIds = $this->getAccessGranted(); // Needed for the access check here
-            }
-            // Obtener los detalles de las cápsulas
-            $capsuleMapper = MicrolearningCapsuleMapper::getInstance($this->adapter);
-            $capsules = $capsuleMapper->fetchAllByIds($capsuleIdsToFetch);
-            $userProgressMapper = MicrolearningUserProgressMapper::getInstance($this->adapter);
-            $capsuleCommentMapper = MicrolearningCapsuleCommentMapper::getInstance($this->adapter);
-            $storage = Storage::getInstance($this->config, $this->adapter);
-            $path = $storage->getPathMicrolearningCapsule();
-            // Construir la respuesta combinando datos de Cápsula y Progreso
-            foreach($capsules as $capsule) // Iterar sobre los objetos Capsule obtenidos
-            {
-                // $capsule ya no tiene topic_id directamente.
-                // El contexto del tópico viene de $topic (obtenido al inicio).
-                // Verificar acceso de nuevo (doble chequeo, podría optimizarse si getAccessGranted es fiable)
-                if(!in_array($capsule->id, $accessGrantedIds->capsules)) {
-                     continue;
-                }
-                $userProgress = $userProgressMapper->fetchOneByUseridAndCapsuleId($currentUser->id, $capsule->id);
-                if($userProgress) {
-                    $progress = $userProgress->progress;
-                    $completed = $userProgress->completed;
+            if(!in_array($topic->id, $accessGrantedIds->topics)) {
-                } else {
-                    $progress = 0;
-                    $completed = 0;
-                }
-                // Pasar company_id y capsule_id de la cápsula
-                $dataCountAndRatingAverage = $capsuleCommentMapper->fetchCountAndRatingAverage($capsule->company_id,  $capsule->id);
-                array_push($data, [
-                    'uuid'              => $capsule->uuid,
-                    'name'              => $capsule->name ? $capsule->name : '',
-                    'description'       => $capsule->description ? $capsule->description : '',
-                    'image'             => $capsule->image ? $storage->getGenericImage($path, $capsule->uuid, $capsule->image)  : '',
-                    // Usar $topic->uuid y $capsule->uuid para los enlaces
-                    'link_comments'     => $this->url()->fromRoute('microlearning/capsules-comments', ['capsule_id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_comment_add'  => $this->url()->fromRoute('microlearning/capsules-comments/add', ['capsule_id' => $capsule->uuid],['force_canonical' => true]),
-                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
-                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
-                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
-                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
-                    'progress'          => $progress,
-                    'completed'         => $completed,
-                    'order'             => $capsule->order, // Asumiendo que el orden viene de la cápsula
-                    'added_on'          => $capsule->added_on, // Fecha de la cápsula
-                    'updated_on'        => $capsule->updated_on, // Fecha de la cápsula
-                    // Puedes agregar datos de $capsuleRelationData[$capsule->id] si es necesario
-                ]);
-            }
-            usort($data, function($a, $b) {
-                $result =  $a['order'] <=> $b['order'];
-                if(0 == $result) {
-                    $result = strcasecmp($a['added_on'], $b['added_on']);
-                    if(0 == $result) {
-                        $result = strcasecmp($a['name'], $b['name']);
-                    }
-                }
+                return new JsonModel([
+                    'success' => false,
-                if($result < 0) {
+                    'data' => 'ERROR_YOU_DO_NOT_HAVE_ACCESS_TO_THIS_TOPIC'
-                    return 1;
+                ]);
                 } else if($result > 0) {
                     return -1;
-                } else  {
+            // Initialize storage and call the refactored private method
-                    return  0;
+            $storage = Storage::getInstance($this->config, $this->adapter);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Controller/MicrolearningController.php – Rev 576 → 578