matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cached some model properties and remove useless eager loading (#253)

Browse Source 
* Cached some model properties and remove useless eager loading

* Remove ray call

* Remove double loading of forms

* Add disableCache feature when needed
This commit is contained in:
Julien Nahum
2023-12-02 14:51:08 +01:00
committed by GitHub
parent 8fd85776c6
commit a18077934c
10 changed files with 291 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Models/Forms/Form.php
View File

@@ -4,6 +4,8 @@ namespace App\Models\Forms;
use App\Events\Models\FormCreated;
use App\Models\Integration\FormZapierWebhook;
use App\Models\Traits\CachableAttributes;
use App\Models\Traits\CachesAttributes;
use App\Models\User;
use App\Models\Workspace;
use Database\Factories\FormFactory;
@@ -17,8 +19,9 @@ use Stevebauman\Purify\Facades\Purify;
use Illuminate\Support\Facades\DB;
use Illuminate\Database\Eloquent\Casts\Attribute;
class Form extends Model
class Form extends Model implements CachableAttributes
{
use CachesAttributes;
const DARK_MODE_VALUES = ['auto', 'light', 'dark'];
const THEMES = ['default', 'simple', 'notion'];
const WIDTHS = ['centered', 'full'];
@@ -126,6 +129,12 @@ class Form extends Model
'removed_properties'
];
protected $cachableAttributes = [
'is_pro',
'submissions_count',
'views_count',
];
/**
* The event map for the model.
*
@@ -137,7 +146,9 @@ class Form extends Model
public function getIsProAttribute()
{
return optional($this->workspace)->is_pro;
return $this->remember('is_pro', 15, function(): bool {
return optional($this->workspace)->is_pro;
});
}
public function getShareUrlAttribute()
@@ -155,19 +166,21 @@ class Form extends Model
public function getSubmissionsCountAttribute()
{
return $this->submissions()->count();
return $this->remember('submissions_count', 5, function(): int {
return $this->submissions()->count();
});
}
public function getViewsCountAttribute()
{
if (env('DB_CONNECTION') == 'pgsql') {
return $this->remember('views_count', 5, function(): int {
if (env('DB_CONNECTION') == 'mysql') {
return (int)($this->views()->count() +
$this->statistics()->sum(DB::raw("json_extract(data, '$.views')")));
}
return $this->views()->count() +
$this->statistics()->sum(DB::raw("cast(data->>'views' as integer)"));
} elseif (env('DB_CONNECTION') == 'mysql') {
return (int)($this->views()->count() +
$this->statistics()->sum(DB::raw("json_extract(data, '$.views')")));
}
return 0;
});
}
public function setDescriptionAttribute($value)
@@ -205,6 +218,7 @@ class Form extends Model
public function getMaxNumberOfSubmissionsReachedAttribute()
{
$this->disableCache('submissions_count');
return ($this->max_submissions_count && $this->max_submissions_count <= $this->submissions_count);
}