Refactoring subscribed session list for user #5576
Conversation
AngelFQC
force-pushed
the
BT21745
branch
2 times, most recently
from
f897bce to
4b8d270
Compare
…5560 According to session visibility by the user and considering sessions with access with a duration time
…current or past - refs BT#21745
…ation - refs BT#21745
…ccess by duration - refs BT#21745
…ity set - refs BT#21745
![codeclimate[bot]](https://avatars.githubusercontent.com/in/9403?s=60&v=4){kind=small}
| @@ -113,6 +114,7 @@ class Session implements ResourceWithAccessUrlInterface, Stringable | |||
| public const VISIBLE = 2; | |||
| public const INVISIBLE = 3; | |||
| public const AVAILABLE = 4; | |||
| public const LIST_ONLY = 5; | |||
There was a problem hiding this comment.
Line indented incorrectly; expected 8 spaces, found 4
| @@ -357,6 +359,9 @@ | |||
| #[ORM\JoinColumn(name: 'image_id', referencedColumnName: 'id', onDelete: 'SET NULL')] | |||
| protected ?Asset $image = null; | |||
|
|
|||
| #[Groups(['user_subscriptions:sessions', 'session:read', 'session:item:read'])] | |||
| private int $accessVisibility = 0; | |||
There was a problem hiding this comment.
Line indented incorrectly; expected 8 spaces, found 4
| @@ -1292,10 +1297,36 @@ | |||
| return $totalDuration > $currentTime; | |||
| } | |||
|
|
|||
| public function getDaysLeftByUser(User $user): int | |||
There was a problem hiding this comment.
Line indented incorrectly; expected 8 spaces, found 4
| @@ -1292,10 +1297,36 @@ | |||
| return $totalDuration > $currentTime; | |||
| } | |||
|
|
|||
| public function getDaysLeftByUser(User $user): int | |||
| { | ||
| $userSessionSubscription = $user->getSubscriptionToSession($this); | ||
|
|
||
| $duration = $this->duration; |
There was a problem hiding this comment.
Line indented incorrectly; expected at least 12 spaces, found 8
…list visibility - refs BT#21745
|
|
||
| $duration = $this->duration; | ||
|
|
||
| if ($userSessionSubscription) { |
There was a problem hiding this comment.
Line indented incorrectly; expected 12 spaces, found 8
| $duration = $this->duration; | ||
|
|
||
| if ($userSessionSubscription) { | ||
| $duration += $userSessionSubscription->getDuration(); |
There was a problem hiding this comment.
Line indented incorrectly; expected at least 16 spaces, found 12
| $courseAccess = $user->getFirstAccessToSession($this); | ||
|
|
||
| if (!$courseAccess) { | ||
| return $duration; |
There was a problem hiding this comment.
Line indented incorrectly; expected at least 16 spaces, found 12
| return $duration; | ||
| } | ||
|
|
||
| $endDateInSeconds = $courseAccess->getLoginCourseDate()->getTimestamp() + $duration * 24 * 60 * 60; |
There was a problem hiding this comment.
Line indented incorrectly; expected at least 12 spaces, found 8
| $endDateInSeconds = $courseAccess->getLoginCourseDate()->getTimestamp() + $duration * 24 * 60 * 60; | ||
| $currentTime = time(); | ||
|
|
||
| return (int) round(($endDateInSeconds - $currentTime) / 60 / 60 / 24); |
There was a problem hiding this comment.
Line indented incorrectly; expected at least 12 spaces, found 8
|
Code Climate has analyzed commit 9fd6aeb and detected 43 issues on this pull request. Here's the issue category breakdown:
View more on Code Climate. |
According to session visibility by the user and considering sessions with access with a duration time
Refs BT#21745 #5560