added get-points-number, get-question-number methods, update status in UserQuestionnaire, some refactoring

common/services/ScoreCalculatorService.php

@@ -77,6 +77,8 @@ class ScoreCalculatorService
 
         self::setPercentCorrectAnswers($user_correct_answers_num, $userQuestionnaire);
         $userQuestionnaire->score = round($score);
+        $userQuestionnaire->status = 2;
+        $userQuestionnaire->testing_date = date('Y:m:d H:i:s');
         $userQuestionnaire->save();
     }
 
@@ -108,6 +110,5 @@ class ScoreCalculatorService
         else {
             $userQuestionnaire->percent_correct_answers = round($user_correct_answers_num, 2);
         }
-        $userQuestionnaire->save();
     }
 }

common/services/UserCardService.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace common\services;
+
+use common\models\UserCard;
+use yii\web\ServerErrorHttpException;
+
+class UserCardService
+{
+    /**
+     * @throws ServerErrorHttpException
+     */
+    public static function getUserCard($user_id): array
+    {
+        $userCard = UserCard::findOne(['id_user' => $user_id]);
+        if (empty($userCard)) {
+            throw new ServerErrorHttpException(json_encode($userCard->errors));
+        }
+        return array('fio' => $userCard->fio,
+                    'photo' => $userCard->photo,
+                    'gender' => $userCard->gender,
+                    'level' => $userCard->level,
+                    'years_of_exp' => $userCard->years_of_exp,
+                    'specification' => $userCard->specification,
+                    'position_name' => $userCard->position->name);
+    }
+}

common/services/UserQuestionnaireService.php

@@ -2,8 +2,11 @@
 
 namespace common\services;
 
+use common\models\Question;
 use common\models\UserQuestionnaire;
+use yii\base\InvalidConfigException;
 use yii\web\NotFoundHttpException;
+use yii\web\ServerErrorHttpException;
 
 class UserQuestionnaireService
 {
@@ -23,15 +26,53 @@ class UserQuestionnaireService
 
     /**
      * @throws NotFoundHttpException
+     * @throws InvalidConfigException
      */
-    public static function calculateScore($user_questionnaire_uuid)
+    public static function calculateScore($user_questionnaire_uuid): UserQuestionnaire
     {
         $userQuestionnaireModel = UserQuestionnaire::findOne(['uuid' => $user_questionnaire_uuid]);
-        if(empty($userQuestionnaireModel)) {
+        if (empty($userQuestionnaireModel)) {
             throw new NotFoundHttpException('The questionnaire with this uuid does not exist');
         }
         ScoreCalculatorService::rateResponses($userQuestionnaireModel);
-        ScoreCalculatorService::calculateScore($userQuestionnaireModel);
+        if (ScoreCalculatorService::checkAnswerFlagsForNull($userQuestionnaireModel)) {
+            ScoreCalculatorService::calculateScore($userQuestionnaireModel);
+        } else {
+            $userQuestionnaireModel->status = 3;
+            $userQuestionnaireModel->save();
+        }
         return $userQuestionnaireModel;
     }
+
+    /**
+     * @throws ServerErrorHttpException
+     */
+    public static function getQuestionNumber($user_questionnaire_uuid): array
+    {
+        $userQuestionnaireModel = UserQuestionnaire::findOne(['uuid' => $user_questionnaire_uuid]);
+        if (empty($userQuestionnaireModel)) {
+            throw new ServerErrorHttpException(json_encode('Not found UserQuestionnaire'));
+        }
+        $count = Question::find()
+            ->where(['questionnaire_id' => $userQuestionnaireModel->questionnaire_id])
+            ->andWhere(['status' => 1])
+            ->count();
+        return array('question_number' => $count);
+    }
+
+    /**
+     * @throws ServerErrorHttpException
+     */
+    public static function getPointsNumber($user_questionnaire_uuid)
+    {
+        $userQuestionnaireModel = UserQuestionnaire::findOne(['uuid' => $user_questionnaire_uuid]);
+        if (empty($userQuestionnaireModel)) {
+            throw new ServerErrorHttpException(json_encode('Not found UserQuestionnaire'));
+        }
+        $pointSum = Question::find()
+            ->where(['questionnaire_id' => $userQuestionnaireModel->questionnaire_id])
+            ->andWhere(['status' => 1])
+            ->sum('score');
+        return array('sum_point' => $pointSum);
+    }
 }