Merge pull request #5302 from christianbeeznest/fixes-updates16

Course: Refactor course creation service

Author: christianbeeznest

assets/vue/components/course/Form.vue

@@ -45,12 +45,12 @@
         v-model="fillDemoContent"
        name=""
       />
-      <BaseAutocomplete
+      <!--BaseAutocomplete
         id="template"
         v-model="courseTemplate"
         :label="t('Select Template')"
         :search="searchTemplates"
-      />
+      /-->
     </div>
     <!-- Form Footer -->
     <div class="form-footer">

assets/vue/views/course/Create.vue

@@ -29,6 +29,7 @@ import { useRouter } from "vue-router"
 import Message from 'primevue/message'
 import courseService from "../../services/courseService"
 import { useI18n } from "vue-i18n"
+import { useNotification } from "../../composables/notification"
 
 const store = useStore()
 const item = ref({})
@@ -38,24 +39,26 @@ const { t } = useI18n()
 const isLoading = computed(() => store.getters['course/getField']('isLoading'))
 const violations = computed(() => store.getters['course/getField']('violations'))
 const courseData = ref({})
+const { showSuccessNotification, showErrorNotification } = useNotification()
 
 const submitCourse = async (formData) => {
   isLoading.value = true
   try {
-    let tempResponse = await courseService.createCourse(formData)
-    if (tempResponse.success) {
-      const courseId = tempResponse.courseId
-      const sessionId = 0
-      await router.push(`/course/${courseId}/home?sid=${sessionId}`)
-    } else {
-      console.error(tempResponse.message)
-    }
+    const response = await courseService.createCourse(formData)
+    const courseId = response.courseId
+    const sessionId = 0
+    showSuccessNotification(t('Course created successfully.'))
+    await router.push(`/course/${courseId}/home?sid=${sessionId}`)
   } catch (error) {
     console.error(error)
-    if (error.response && error.response.data) {
-      violations.value = error.response.data
-    } else {
-      console.error('An unexpected error occurred.')
+
+    const errorMessage = error.response && error.response.data && error.response.data.message
+      ? error.response.data.message
+      : t('An unexpected error occurred.')
+    showErrorNotification(errorMessage)
+
+    if (error.response && error.response.data && error.response.data.violations) {
+      violations.value = error.response.data.violations
     }
   } finally {
     isLoading.value = false

src/CoreBundle/Controller/CourseController.php

@@ -23,6 +23,7 @@
 use Chamilo\CoreBundle\Repository\Node\IllustrationRepository;
 use Chamilo\CoreBundle\Repository\TagRepository;
 use Chamilo\CoreBundle\Security\Authorization\Voter\CourseVoter;
+use Chamilo\CoreBundle\Service\CourseService;
 use Chamilo\CoreBundle\ServiceHelper\AccessUrlHelper;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CoreBundle\Tool\ToolChain;
@@ -721,7 +722,7 @@ public function searchCourseTemplates(
         foreach ($courseList as $course) {
             $title = $course['title'];
             $results['items'][] = [
-                'id' => $course['code'],
+                'id' => $course['id'],
                 'name' => $title.' ('.$course['code'].') ',
             ];
         }
@@ -730,43 +731,47 @@ public function searchCourseTemplates(
     }
 
     #[Route('/create', name: 'chamilo_core_course_create')]
-    public function createCourse(Request $request, TranslatorInterface $translator): JsonResponse
-    {
+    public function createCourse(
+        Request $request,
+        TranslatorInterface $translator,
+        CourseService $courseService
+    ): JsonResponse {
         $courseData = json_decode($request->getContent(), true);
 
+        $title = $courseData['name'] ?? null;
         $wantedCode = $courseData['code'] ?? null;
+        $courseLanguage = $courseData['language']['id'] ?? null;
         $categoryCode = $courseData['category'] ?? null;
-        $title = $courseData['name'];
-        $courseLanguage = isset($courseData['language']) ? $courseData['language']['id'] : '';
         $exemplaryContent = $courseData['fillDemoContent'] ?? false;
         $template = $courseData['template'] ?? '';
 
-        if (empty($wantedCode)) {
-            $wantedCode = CourseManager::generate_course_code(substr($title, 0, CourseManager::MAX_COURSE_LENGTH_CODE));
-        }
-
-        $courseCodeOk = !CourseManager::course_code_exists($wantedCode);
-        if ($courseCodeOk) {
-            $params = [
-                'title' => $title,
-                'exemplary_content' => $exemplaryContent,
-                'wanted_code' => $wantedCode,
-                'course_language' => $courseLanguage,
-                'course_template' => $template,
-            ];
+        $params = [
+            'title' => $title,
+            'wanted_code' => $wantedCode,
+            'course_language' => $courseLanguage,
+            'exemplary_content' => $exemplaryContent,
+            'course_template' => $template,
+        ];
 
-            if ($categoryCode) {
-                $params['course_categories'] = $categoryCode;
-            }
+        if ($categoryCode) {
+            $params['course_categories'] = $categoryCode;
+        }
 
-            $course = CourseManager::create_course($params);
+        try {
+            $course = $courseService->createCourse($params);
             if ($course) {
                 return new JsonResponse([
                     'success' => true,
                     'message' => $translator->trans('Course created successfully.'),
                     'courseId' => $course->getId(),
                 ]);
             }
+        } catch (\Exception $e) {
+
+            return new JsonResponse([
+                'success' => false,
+                'message' => $translator->trans($e->getMessage())
+            ], Response::HTTP_BAD_REQUEST);
         }
 
         return new JsonResponse(['success' => false, 'message' => $translator->trans('An error occurred while creating the course.')]);

src/CoreBundle/Repository/Node/CourseRepository.php

@@ -10,10 +10,10 @@
 use Chamilo\CoreBundle\Entity\AccessUrl;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\CourseRelUser;
-use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Repository\ResourceRepository;
 use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
@@ -207,4 +207,27 @@ public function getSubscribedUsersByStatus(Course $course, int $status)
 
         return $queryBuilder;
     }
+
+    public function courseCodeExists(string $code): bool
+    {
+        $qb = $this->createQueryBuilder('c')
+            ->select('count(c.id)')
+            ->where('c.code = :code OR c.visualCode = :code')
+            ->setParameter('code', $code)
+            ->getQuery();
+
+        return (int) $qb->getSingleScalarResult() > 0;
+    }
+
+    public function findCourseAsArray($id)
+    {
+        $qb = $this->createQueryBuilder('c')
+            ->select('c.id, c.code, c.title, c.visualCode, c.courseLanguage, c.departmentUrl, c.departmentName')
+            ->where('c.id = :id')
+            ->setParameter('id', $id);
+
+        $query = $qb->getQuery();
+
+        return $query->getOneOrNullResult(AbstractQuery::HYDRATE_ARRAY);
+    }
 }