GH #2178: Remove unused QuestionBank code

sourcecode/apis/contentauthor/app/Libraries/H5P/Adapters/CerpusH5PAdapter.php

@@ -5,7 +5,6 @@
 use App\Libraries\H5P\Dataobjects\H5PAlterParametersSettingsDataObject;
 use App\Libraries\H5P\Interfaces\H5PAdapterInterface;
 use App\Libraries\H5P\Traits\H5PCommonAdapterTrait;
-use Cerpus\QuestionBankClient\QuestionBankClient;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 
@@ -21,7 +20,13 @@ class CerpusH5PAdapter implements H5PAdapterInterface
      */
     public function alterParameters($parameters, H5PAlterParametersSettingsDataObject $settings = null)
     {
-        return QuestionBankClient::convertMathToInlineDisplay($parameters);
+        // Convert Math to inline display
+        $pattern = [
+            '/\$\$(.+?)\$\$/i',
+        ];
+        $replace = '\\\\\\\\( $1 \\\\\\\\)';
+
+        return preg_replace($pattern, $replace, $parameters);
     }
 
     public function getEditorExtraTags($field): array

sourcecode/apis/contentauthor/app/Libraries/QuestionSet/QuestionSetHandler.php

@@ -9,7 +9,6 @@
 use App\QuestionSet;
 use App\QuestionSetQuestion;
 use App\QuestionSetQuestionAnswer;
-use Cerpus\QuestionBankClient\QuestionBankClient;
 use Cerpus\VersionClient\VersionData;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -22,14 +21,14 @@ class QuestionSetHandler
      */
     public function store($values, Request $request): Content
     {
-        /** @var QuestionSet $questionSet */
-        $questionSet = QuestionSet::make();
+        $questionSet = new QuestionSet();
         $questionSet->title = $values['title'];
         $questionSet->owner = Session::get('authId');
         $questionSet->language_code = $request->session()->get('locale', '');
         $questionSet->is_published = $questionSet::isUserPublishEnabled() ? $request->input('isPublished', 1) : 1;
         $questionSet->license = $request->get('license', '');
         $questionSet->is_draft = $request->input('isDraft', 0);
+        $questionSet->tags = join(',', $values['tags']);
         if ($questionSet->save() !== true) {
             throw new \Exception("Could not store Question Set");
         }
@@ -59,16 +58,15 @@ public function store($values, Request $request): Content
     private function storeNewQuestionsWithAnswers(QuestionSet $questionSet, $questions)
     {
         foreach ($questions as $card) {
-            /** @var QuestionSetQuestion $question */
-            $question = QuestionSetQuestion::make();
-            $question->question_text = QuestionBankClient::stripMathContainer($card['question']['text']);
+            $question = new QuestionSetQuestion();
+            $question->question_text = self::stripMathContainer($card['question']['text']);
             $question->image = !empty($card['question']['image']['id']) ? $card['question']['image']['id'] : null;
             $question->order = $card['order'];
             $questionSet->questions()->save($question);
 
             foreach ($card['answers'] as $answerIndex => $answer) {
-                $questionAnswer = QuestionSetQuestionAnswer::make();
-                $questionAnswer->answer_text = QuestionBankClient::stripMathContainer($answer['answerText']);
+                $questionAnswer = new QuestionSetQuestionAnswer();
+                $questionAnswer->answer_text = self::stripMathContainer($answer['answerText']);
                 $questionAnswer->correct = $answer['isCorrect'];
                 $questionAnswer->image = !empty($answer['image']['id']) ? $answer['image']['id'] : null;
                 $questionAnswer->order = $answerIndex;
@@ -105,18 +103,19 @@ public function update(QuestionSet $questionSet, $values, Request $request): Con
         $questionSet->is_published = $questionSet::isUserPublishEnabled() ? $request->input('isPublished', 1) : 1;
         $questionSet->is_draft = $request->input('isDraft', 0);
         $questionSet->license = $request->input('license', $questionSet->license);
+        $questionSet->tags = join(',', $values['tags']);
         $questionSet->save();
 
         DB::transaction(function () use ($values, $questionSet) {
             $storeQuestion = function ($question, $newValues) {
-                $question->question_text = QuestionBankClient::stripMathContainer($newValues['question']['text']);
+                $question->question_text = self::stripMathContainer($newValues['question']['text']);
                 $question->image = !empty($newValues['question']['image']['id']) ? $newValues['question']['image']['id'] : null;
                 $question->order = $newValues['order'];
                 $question->save();
             };
 
             $storeAnswer = function ($answer, $newValues) {
-                $answer->answer_text = QuestionBankClient::stripMathContainer($newValues['answerText']);
+                $answer->answer_text = self::stripMathContainer($newValues['answerText']);
                 $answer->correct = (bool)$newValues['isCorrect'];
                 $answer->image = !empty($newValues['image']['id']) ? $newValues['image']['id'] : null;
                 $answer->order = $newValues['order'];
@@ -159,8 +158,8 @@ public function update(QuestionSet $questionSet, $values, Request $request): Con
                     $providedAnswers
                         ->diffKeys($existingAnswers)
                         ->each(function ($newAnswer) use ($question) {
-                            $answer = QuestionSetQuestionAnswer::make();
-                            $answer->answer_text = QuestionBankClient::stripMathContainer($newAnswer['answerText']);
+                            $answer = new QuestionSetQuestionAnswer();
+                            $answer->answer_text = self::stripMathContainer($newAnswer['answerText']);
                             $answer->correct = $newAnswer['isCorrect'];
                             $answer->image = !empty($newAnswer['image']['id']) ? $newAnswer['image']['id'] : null;
                             $answer->order = $newAnswer['order'];
@@ -191,4 +190,15 @@ public function update(QuestionSet $questionSet, $values, Request $request): Con
 
         return $questionSet;
     }
+
+    private static function stripMathContainer($text): string
+    {
+        $pattern = [
+            '/<span.+?class=.math_container.*?>([\s\S]+?)<\/span>/i',
+            '/\${2}\\\\\(([\s\S]+?)\\\\\)\${2}/i',
+        ];
+        $replace = '\\$\\$$1\\$\\$';
+
+        return preg_replace($pattern, $replace, $text);
+    }
 }