apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix questionnaire and profile errors format

Browse Source
This commit is contained in:
iIronside
2022-10-19 15:28:09 +03:00
parent 866389a95a
commit 6385787702
5 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/services/ProfileService.php
View File

@ -16,11 +16,11 @@ class ProfileService
/**
* @throws ServerErrorHttpException
*/
public static function getMainData($user_id)//: array
public static function getMainData($user_id): array
{
$userCard = UserCard::findOne(['id_user' => $user_id]);
if (empty($userCard)) {
throw new ServerErrorHttpException(json_encode('Profile not found!'));
throw new ServerErrorHttpException('Profile not found!');
}
return array('fio' => $userCard->fio,
'photo' => $userCard->photo,
@ -31,10 +31,7 @@ class ProfileService
'position_name' => $userCard->position->name);
}
/**
* @throws BadRequestHttpException
*/
public static function getProfile($id, $request)//: ?array
public static function getProfile($id, $request): ?array
{
$searchModel = new ProfileSearchForm();
$searchModel->attributes = $request;
@ -46,7 +43,7 @@ class ProfileService
}
/**
* @throws BadRequestHttpException
* @throws ServerErrorHttpException
*/
public static function getProfileWithReportPermission($user_card_id): ?array
{
@ -59,7 +56,7 @@ class ProfileService
self::addPermission($profile, $user_card_id);
return $profile;
}
throw new BadRequestHttpException(json_encode('There is no user with this id'));
throw new ServerErrorHttpException('There is no user with this id');
}
private static function addPermission(&$profile, $user_card_id)

4
common/services/UserQuestionnaireService.php
View File

@ -51,7 +51,7 @@ class UserQuestionnaireService
{
$userQuestionnaireModel = UserQuestionnaire::findOne(['uuid' => $user_questionnaire_uuid]);
if (empty($userQuestionnaireModel)) {
throw new ServerErrorHttpException(json_encode('Not found UserQuestionnaire'));
throw new ServerErrorHttpException('Not found UserQuestionnaire');
}
$count = Question::find()
->where(['questionnaire_id' => $userQuestionnaireModel->questionnaire_id])
@ -67,7 +67,7 @@ class UserQuestionnaireService
{
$userQuestionnaireModel = UserQuestionnaire::findOne(['uuid' => $user_questionnaire_uuid]);
if (empty($userQuestionnaireModel)) {
throw new ServerErrorHttpException(json_encode('Not found UserQuestionnaire'));
throw new ServerErrorHttpException('Not found UserQuestionnaire');
}
$pointSum = Question::find()
->where(['questionnaire_id' => $userQuestionnaireModel->questionnaire_id])