Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Reduce extra queries

Browse Source
This commit is contained in:
Hillel Coren 2016-09-01 20:02:37 +03:00
parent 27ee5edd8a
commit 8696acf4d3
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Middleware/QueryLogging.php
View File

@ -33,6 +33,7 @@ class QueryLogging
$queries = DB::getQueryLog(); $queries = DB::getQueryLog();
$count = count($queries); $count = count($queries);
Log::info($request->method() . ' - ' . $request->url() . ": $count queries"); Log::info($request->method() . ' - ' . $request->url() . ": $count queries");
//Log::info($queries);
} }
} }

3
app/Libraries/HistoryUtils.php
View File

@ -33,7 +33,7 @@ class HistoryUtils
]; ];
$activities = Activity::scope() $activities = Activity::scope()
->with('client.contacts', 'invoice') ->with(['client.contacts', 'invoice'])
->whereIn('user_id', $userIds) ->whereIn('user_id', $userIds)
->whereIn('activity_type_id', $activityTypes) ->whereIn('activity_type_id', $activityTypes)
->orderBy('id', 'asc') ->orderBy('id', 'asc')
@ -46,6 +46,7 @@ class HistoryUtils
$entity = $activity->client; $entity = $activity->client;
} else { } else {
$entity = $activity->invoice; $entity = $activity->invoice;
$entity->setRelation('client', $activity->client);
} }
static::trackViewed($entity); static::trackViewed($entity);

2
app/Ninja/Repositories/DashboardRepository.php
View File

@ -114,7 +114,7 @@ class DashboardRepository
} }
return $activities->orderBy('activities.created_at', 'desc') return $activities->orderBy('activities.created_at', 'desc')
->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account') ->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account', 'task')
->take(50) ->take(50)
->get(); ->get();
} }