gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-26 12:23:06 +08:00
Code Issues Releases Wiki Activity

Merge branch 'koogua/v1.4.6' into demo

Browse Source
This commit is contained in:
koogua 2021-10-17 14:49:10 +08:00
commit afdf6f50f7
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Services/Logic/Course/ConsultListTrait.php
View File

@ -32,6 +32,7 @@ trait ConsultListTrait
foreach ($consults as $consult) { foreach ($consults as $consult) {
$owner = $users[$consult['owner_id']] ?? new \stdClass(); $owner = $users[$consult['owner_id']] ?? new \stdClass();
$me = $meMappings[$consult['id']]; $me = $meMappings[$consult['id']];
$items[] = [ $items[] = [
@ -61,8 +62,13 @@ trait ConsultListTrait
$likedIds = []; $likedIds = [];
if ($user->id > 0) { if ($user->id > 0) {
$likes = $likeRepo->findByUserId($user->id); $likes = $likeRepo->findByUserId($user->id)
$likedIds = array_column($likes->toArray(), 'consult_id'); ->filter(function ($like) {
if ($like->deleted == 0) {
return $like;
}
});
$likedIds = array_column($likes, 'consult_id');
} }
$result = []; $result = [];
@ -70,6 +76,7 @@ trait ConsultListTrait
foreach ($consults as $consult) { foreach ($consults as $consult) {
$result[$consult['id']] = [ $result[$consult['id']] = [
'liked' => in_array($consult['id'], $likedIds) ? 1 : 0, 'liked' => in_array($consult['id'], $likedIds) ? 1 : 0,
'owned' => $consult['owner_id'] == $user->id ? 1 : 0,
]; ];
} }

15
app/Services/Logic/Course/ReviewList.php
View File

@ -62,6 +62,7 @@ class ReviewList extends LogicService
foreach ($reviews as $review) { foreach ($reviews as $review) {
$owner = $users[$review['owner_id']] ?? new \stdClass(); $owner = $users[$review['owner_id']] ?? new \stdClass();
$me = $meMappings[$review['id']]; $me = $meMappings[$review['id']];
$items[] = [ $items[] = [
@ -81,7 +82,7 @@ class ReviewList extends LogicService
return $pager; return $pager;
} }
protected function getMeMappings($consults) protected function getMeMappings($reviews)
{ {
$user = $this->getCurrentUser(true); $user = $this->getCurrentUser(true);
@ -90,15 +91,21 @@ class ReviewList extends LogicService
$likedIds = []; $likedIds = [];
if ($user->id > 0) { if ($user->id > 0) {
$likes = $likeRepo->findByUserId($user->id); $likes = $likeRepo->findByUserId($user->id)
$likedIds = array_column($likes->toArray(), 'review_id'); ->filter(function ($like) {
if ($like->deleted == 0) {
return $like;
}
});
$likedIds = array_column($likes, 'review_id');
} }
$result = []; $result = [];
foreach ($consults as $consult) { foreach ($reviews as $consult) {
$result[$consult['id']] = [ $result[$consult['id']] = [
'liked' => in_array($consult['id'], $likedIds) ? 1 : 0, 'liked' => in_array($consult['id'], $likedIds) ? 1 : 0,
'owned' => $consult['owner_id'] == $user->id ? 1 : 0,
]; ];
} }