record daily traffic instead of monthly

This commit is contained in:
Čarodej
2021-11-30 17:57:00 +01:00
parent ca257ae113
commit de047f7dd8
19 changed files with 69 additions and 86 deletions
@@ -14,7 +14,6 @@ class DeleteUserDataAction
{
// Delete user avatar if exists
if ($user->settings->getRawOriginal('avatar')) {
// TODO: delete all generated avatars
Storage::delete($user->settings->getRawOriginal('avatar'));
}
@@ -16,10 +16,10 @@ class GetWidgetsValuesController extends Controller
)->format();
return [
'license' => get_settings('license'),
'app_version' => config('vuefilemanager.version'),
'total_users' => User::count(),
'total_used_space' => $storage_usage,
'license' => get_settings('license'),
'app_version' => config('vuefilemanager.version'),
'total_users' => User::count(),
'total_used_space' => $storage_usage,
'total_premium_users' => Subscription::count(),
];
}
@@ -10,7 +10,6 @@ use Domain\SetupWizard\Requests\StoreStripePlansRequest;
*/
class StorePlansController extends Controller
{
public function __invoke(
StoreStripePlansRequest $request
): Response {
@@ -1,5 +1,4 @@
<?php
namespace Domain\Teams\Actions;
use App\Users\Models\User;
@@ -29,4 +28,4 @@ class CheckMaxTeamMembersLimitAction
abort(423, 'You exceed your members limit.');
}
}
}
}
@@ -1,13 +1,13 @@
<?php
namespace Domain\Teams\Controllers;
use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
use Domain\Teams\Models\TeamFolderMember;
use Illuminate\Http\Response;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Domain\Teams\Models\TeamFolderMember;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
@@ -1,8 +1,6 @@
<?php
namespace Domain\Teams\Controllers;
use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
use Domain\Teams\Models\TeamFolderMember;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
@@ -10,6 +8,7 @@ use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Domain\Teams\Models\TeamFolderMember;
use Domain\Teams\DTO\CreateTeamFolderData;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderResource;
@@ -18,6 +17,7 @@ use Domain\Folders\Resources\FolderCollection;
use Domain\Teams\Actions\UpdateInvitationsAction;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\Teams\Requests\CreateTeamFolderRequest;
use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
use Domain\Teams\Requests\UpdateTeamFolderMembersRequest;
use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
+1 -1
View File
@@ -1,8 +1,8 @@
<?php
namespace Domain\Teams\Models;
use Database\Factories\TeamFolderMemberFactory;
use Illuminate\Database\Eloquent\Model;
use Database\Factories\TeamFolderMemberFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
@@ -12,7 +12,7 @@ class RecordDownloadAction
int $file_size,
string $user_id,
): void {
$record = Traffic::currentMonth()
$record = Traffic::currentDay()
->firstOrCreate([
'user_id' => $user_id,
]);
@@ -12,7 +12,7 @@ class RecordUploadAction
int $file_size,
string $user_id,
): void {
$record = Traffic::currentMonth()
$record = Traffic::currentDay()
->firstOrCreate([
'user_id' => $user_id,
]);
+4 -14
View File
@@ -7,8 +7,6 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
/**
* @method static whereYear(string $string, string $string1, int $year)
* @method static currentMonth()
* @property string id
* @property string user_id
* @property int upload
@@ -18,29 +16,21 @@ class Traffic extends Model
{
use HasFactory;
protected $fillable = [
'user_id',
'upload',
'download',
];
protected $guarded = [];
public $incrementing = false;
protected $keyType = 'string';
public function scopeCurrentMonth($query): Builder
public function scopeCurrentDay($query): Builder
{
return $query
->whereYear('created_at', '=', now()->year)
->whereMonth('created_at', '=', now()->month);
return $query->whereDate('created_at', today());
}
protected static function boot()
{
parent::boot();
static::creating(function ($model) {
$model->id = (string) Str::uuid();
});
static::creating(fn ($model) => $model->id = (string) Str::uuid());
}
}