controller refactoring part 17

This commit is contained in:
Peter Papp
2021-07-21 11:20:41 +02:00
parent e0eaf5cede
commit dccf98602d
21 changed files with 370 additions and 94 deletions
@@ -7,11 +7,13 @@ use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
use Domain\Files\Models\File as UserFile;
use Domain\Traffic\Actions\RecordDownloadAction;
class FileSharedAccessController extends Controller
{
public function __construct(
private HelperService $helper,
public RecordDownloadAction $recordDownload,
) {
}
@@ -30,11 +32,11 @@ class FileSharedAccessController extends Controller
->where('shared_token', $token)
->first();
$zip
->user
->recordDownload(
$disk->size("zip/$zip->basename")
);
// Store user download size
($this->recordDownload)(
$disk->size("zip/$zip->basename"),
$zip->user_id
);
return $disk
->download("zip/$zip->basename", $zip->basename, [
@@ -67,11 +69,10 @@ class FileSharedAccessController extends Controller
$this->helper->check_guest_access_to_shared_items($shared, $file);
// Store user download size
$shared
->user
->recordDownload(
(int) $file->getRawOriginal('filesize')
);
($this->recordDownload)(
(int) $file->getRawOriginal('filesize'),
$shared->user_id
);
return $this->helper->download_file($file, $shared->user_id);
}
@@ -97,11 +98,10 @@ class FileSharedAccessController extends Controller
$this->helper->check_guest_access_to_shared_items($shared, $file);
// Store user download size
$shared
->user
->recordDownload(
(int) $file->getRawOriginal('filesize')
);
($this->recordDownload)(
(int) $file->getRawOriginal('filesize'),
$shared->user_id
);
return $this->helper->download_thumbnail_file($file, $shared->user_id);
}
@@ -6,15 +6,21 @@ use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
use Domain\Traffic\Actions\RecordDownloadAction;
use Symfony\Component\HttpFoundation\StreamedResponse;
class SharePublicIndexController extends Controller
{
public function __construct(
public RecordDownloadAction $recordDownload,
) {
}
/**
* Show page index and delete share_session cookie
*/
public function __invoke(
Share $shared
Share $shared,
): View | StreamedResponse {
// Delete share_session if exist
if ($shared->is_protected) {
@@ -29,12 +35,11 @@ class SharePublicIndexController extends Controller
->first();
if ($image) {
// Get image filesize
$fileSize = (int) $image->getRawOriginal('filesize');
// Store user download size
$shared
->user
->recordDownload(
(int) $image->getRawOriginal('filesize')
);
($this->recordDownload)($fileSize, $shared->user->id);
return $this->get_single_image($image, $shared->user_id);
}