Skip to content

Performance issue in permanent user list page #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: cake4
Choose a base branch
from
Open

Performance issue in permanent user list page #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d39ce1c
make a query for all users
h-nargesi Sep 11, 2024
b54332b
to finding last 'acctstarttime' for each 'username'
h-nargesi Sep 11, 2024
3b2b0d7
Merge pull request #13 from RADIUSdesk/cake4
h-nargesi Sep 18, 2024
ba5c464
Merge branch 'cake4' into hotfix/permanent-user-list-performance
Sep 18, 2024
c42b415
Merge pull request #14 from RADIUSdesk/cake4
h-nargesi Oct 14, 2024
a9caa83
Merge branch 'cake4' into hotfix/permanent-user-list-performance
Oct 14, 2024
ff6d893
Merge pull request #17 from RADIUSdesk/cake4
h-nargesi Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cake4/rd_cake/setup/db/rd.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4334,7 +4334,7 @@ CREATE TABLE `radacct` (
`operator_name` varchar(32) NOT NULL DEFAULT '',
PRIMARY KEY (`radacctid`),
UNIQUE KEY `acctuniqueid` (`acctuniqueid`),
KEY `username` (`username`),
KEY `username_acctstarttime` (`username`, `acctstarttime`),
KEY `framedipaddress` (`framedipaddress`),
KEY `acctsessionid` (`acctsessionid`),
KEY `acctsessiontime` (`acctsessiontime`),
Expand Down
48 changes: 43 additions & 5 deletions cake4/rd_cake/src/Controller/PermanentUsersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,46 @@ public function index(){
$total = $query->count();
$q_r = $query->all();
$items = [];


//Get more detail on the activity
$usernames = [0];
foreach ($q_r as $user) {
$usernames[] = $user->username;
}

$last_session_query = $this->{'Radaccts'}->find('all', [
'fields' => [
'username' => 'username',
'last_acctstarttime' => 'max(acctstarttime)',
],
'group' => 'username'
]);

$last_session_query = $this->{'Radaccts'}->find()
->join([
'last_session' => [
'table' => $last_session_query,
'type' => 'inner',
'conditions' => [
'last_session.username = Radaccts.username',
'last_session.last_acctstarttime = Radaccts.acctstarttime'
]
]
])
->where(['Radaccts.username IN' => $usernames])
->select([
'username' => 'Radaccts.username',
'acctstarttime' => 'acctstarttime',
'acctstoptime' => 'acctstoptime',
'framedipaddress' => 'framedipaddress'
]);

$last_session_list = $last_session_query->toList();
$last_session_dict = array();
foreach ($last_session_list as $row) {
$last_session_dict[$row['username']] = $row;
}

foreach($q_r as $i){

$row = [];
Expand Down Expand Up @@ -153,9 +192,8 @@ public function index(){
unset($row["token"]);

//Get more detail on the activity
//select acctstarttime,acctstoptime,framedipaddress from radacct where username='ord9555@superfibre' order by acctstarttime DESC LIMIT 1;
$last_session = $this->{'Radaccts'}->find()->where(['username' => $i->username])->select(['acctstarttime','acctstoptime','framedipaddress'])->order('acctstarttime DESC')->first();
if($last_session){
if (array_key_exists($i->username, $last_session_dict)) {
$last_session = $last_session_dict[$i->username];
if(!$last_session->acctstoptime){
$row['last_seen']['status'] = 'online';
$row['last_seen']['span'] = $this->TimeCalculations->time_elapsed_string($last_session->acctstarttime,false,true);
Expand All @@ -167,7 +205,7 @@ public function index(){
}else{
$row['last_seen'] = ['status' => 'never'];
}

$actions_enabled = true;
if($right == 'view'){
$actions_enabled = false;
Expand Down