test groups refactoring

This commit is contained in:
Peter Papp
2021-07-18 16:53:12 +02:00
parent 18150cd920
commit a1778eab52
83 changed files with 1482 additions and 1421 deletions

View File

@@ -1,13 +1,13 @@
<?php
namespace App\Console\Commands;
use App\Models\File;
use App\Models\User;
use App\Models\Share;
use App\Models\Folder;
use App\Models\Setting;
use Domain\Settings\Models\File;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Folder;
use Domain\Settings\Models\Setting;
use Illuminate\Support\Str;
use App\Services\SetupService;
use Domain\SetupWizard\Services\SetupService;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Storage;
use Illuminate\Foundation\Testing\WithFaker;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Console\Commands;
use App\Models\User;
use App\Models\Setting;
use App\Services\SetupService;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Setting;
use Domain\SetupWizard\Services\SetupService;
use Illuminate\Console\Command;
class SetupProdEnvironment extends Command

View File

@@ -1,7 +1,7 @@
<?php
namespace App\Console;
use App\Services\SchedulerService;
use Domain\SetupWizard\Services\SchedulerService;
use Illuminate\Console\Scheduling\Schedule;
use App\Console\Commands\SetupDevEnvironment;
use App\Console\Commands\SetupProdEnvironment;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Actions\Fortify;
use App\Models\User;
use App\Models\Setting;
use App\Models\UserSettings;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Setting;
use Domain\Settings\Models\UserSettings;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Validation\Rule;

View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\User;
use App\Models\User;
use Domain\Settings\Models\User;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;

View File

@@ -1,7 +1,7 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Models\User;
use Domain\Settings\Models\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\CheckAccountRequest;

View File

@@ -4,8 +4,8 @@ namespace App\Models;
use ByteUnits\Metric;
use Illuminate\Support\Str;
use Laravel\Cashier\Billable;
use App\Services\HelperService;
use App\Services\StripeService;
use Domain\SetupWizard\Services\HelperService;
use Domain\SetupWizard\Services\StripeService;
use Laravel\Sanctum\HasApiTokens;
use Kyslik\ColumnSortable\Sortable;
use App\Notifications\ResetPassword;

View File

@@ -1,7 +1,7 @@
<?php
namespace App\Http\Resources;
use App\Models\File;
use Domain\Settings\Models\File;
use ByteUnits\Metric;
use Illuminate\Http\Resources\Json\JsonResource;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\User;
use Domain\Settings\Models\User;
use ByteUnits\Metric;
use App\Services\StripeService;
use Domain\SetupWizard\Services\StripeService;
use Laravel\Cashier\Subscription;
use App\Http\Controllers\Controller;
use App\Http\Resources\UsersCollection;

View File

@@ -1,8 +1,8 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\Invoice;
use App\Services\StripeService;
use Domain\Settings\Models\Invoice;
use Domain\SetupWizard\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\InvoiceResource;
use App\Http\Resources\InvoiceAdminCollection;

View File

@@ -2,10 +2,10 @@
namespace App\Http\Controllers\Admin;
use Storage;
use App\Models\User;
use App\Models\UserSettings;
use Domain\Settings\Models\User;
use Domain\Settings\Models\UserSettings;
use Illuminate\Http\Response;
use App\Services\StripeService;
use Domain\SetupWizard\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use Illuminate\Support\Facades\Auth;

View File

@@ -1,7 +1,7 @@
<?php
namespace App\Http\Resources;
use App\Models\User;
use Domain\Settings\Models\User;
use Laravel\Cashier\Cashier;
use Illuminate\Http\Resources\Json\JsonResource;

View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Models\File;
use App\Models\User;
use App\Models\Share;
use App\Models\Folder;
use Domain\Settings\Models\File;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Folder;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;

View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Models\Zip;
use Domain\Settings\Models\Zip;
use Illuminate\Http\Request;
use App\Services\HelperService;
use App\Models\File as UserFile;
use Domain\SetupWizard\Services\HelperService;
use Domain\Settings\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Models\Folder;
use Domain\Settings\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;

View File

@@ -1,13 +1,13 @@
<?php
namespace App\Http\Controllers\App;
use App\Models\Page;
use App\Models\Share;
use App\Models\Setting;
use App\Models\Language;
use Domain\Settings\Models\Page;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Setting;
use Domain\Settings\Models\Language;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Services\StripeService;
use Domain\SetupWizard\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageResource;
use Illuminate\Support\Facades\Mail;

View File

@@ -2,13 +2,13 @@
namespace App\Http\Controllers\FileManager;
use Exception;
use App\Models\File;
use App\Models\Folder;
use Domain\Settings\Models\File;
use Domain\Settings\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Services\HelperService;
use Domain\SetupWizard\Services\DemoService;
use Domain\SetupWizard\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Domain\SetupWizard\Services\FileManagerService;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;

View File

@@ -1,8 +1,8 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\Setting;
use App\Models\Language;
use Domain\Settings\Models\Setting;
use Domain\Settings\Models\Language;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\LanguageResource;

View File

@@ -2,7 +2,7 @@
namespace App\Models;
use Illuminate\Support\Str;
use App\Services\LanguageService;
use Domain\SetupWizard\Services\LanguageService;
use Illuminate\Support\Facades\DB;
use Kyslik\ColumnSortable\Sortable;
use Illuminate\Database\Eloquent\Model;

View File

@@ -1,7 +1,7 @@
<?php
namespace App\Http\Resources;
use App\Models\Language;
use Domain\Settings\Models\Language;
use Illuminate\Http\Resources\Json\ResourceCollection;
class LanguageCollection extends ResourceCollection

View File

@@ -2,8 +2,8 @@
namespace App\Services;
use DB;
use App\Models\Language;
use App\Models\LanguageTranslation;
use Domain\Settings\Models\Language;
use Domain\Settings\Models\LanguageTranslation;
class LanguageService
{

View File

@@ -3,9 +3,9 @@ namespace App\Http\Controllers\App;
use Gate;
use Artisan;
use App\Models\Language;
use Domain\Settings\Models\Language;
use Illuminate\Http\Response;
use App\Services\LanguageService;
use Domain\SetupWizard\Services\LanguageService;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\Page;
use Domain\Settings\Models\Page;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageResource;

View File

@@ -1,12 +1,12 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\Plan;
use App\Models\User;
use Domain\Settings\Models\Plan;
use Domain\Settings\Models\User;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use Illuminate\Http\Response;
use App\Services\StripeService;
use Domain\SetupWizard\Services\StripeService;
use Laravel\Cashier\Subscription;
use App\Http\Controllers\Controller;
use App\Http\Resources\PlanResource;

View File

@@ -3,9 +3,9 @@ namespace App\Http\Controllers\Admin;
use Stripe;
use Artisan;
use App\Models\Setting;
use Domain\Settings\Models\Setting;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use App\Http\Controllers\Controller;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use Symfony\Component\HttpKernel\Exception\HttpException;

View File

@@ -1,5 +1,5 @@
<?php
namespace App\Models;
namespace Domain\Settings\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;

View File

@@ -4,13 +4,13 @@ namespace App\Http\Controllers\App;
use Schema;
use Stripe;
use Artisan;
use App\Models\User;
use App\Models\Setting;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Setting;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Services\SetupService;
use App\Services\StripeService;
use Domain\SetupWizard\Services\SetupService;
use Domain\SetupWizard\Services\StripeService;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Services;
namespace Domain\SetupWizard\Services;
use App\Models\Page;
use App\Models\Setting;
use App\Models\Language;
use Domain\Settings\Models\Page;
use Domain\Settings\Models\Setting;
use Domain\Settings\Models\Language;
use Illuminate\Support\Facades\Storage;
class SetupService

View File

@@ -1,12 +1,12 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Models\File;
use App\Models\Share;
use App\Models\Folder;
use Domain\Settings\Models\File;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Folder;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Services\HelperService;
use Domain\SetupWizard\Services\HelperService;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use App\Http\Resources\FileResource;

View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Models\Zip;
use App\Models\Share;
use App\Services\HelperService;
use App\Models\File as UserFile;
use Domain\Settings\Models\Zip;
use Domain\Settings\Models\Share;
use Domain\SetupWizard\Services\HelperService;
use Domain\Settings\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;

View File

@@ -1,14 +1,14 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Models\File;
use App\Models\Share;
use App\Models\Folder;
use Domain\Settings\Models\File;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Services\HelperService;
use Domain\SetupWizard\Services\DemoService;
use Domain\SetupWizard\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Domain\SetupWizard\Services\FileManagerService;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\UploadRequest;

View File

@@ -2,8 +2,8 @@
namespace App\Http\Controllers\FileManager;
use Validator;
use App\Models\Zip;
use App\Models\Share;
use Domain\Settings\Models\Zip;
use Domain\Settings\Models\Share;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;

View File

@@ -3,8 +3,8 @@ namespace App\Http\Controllers\User;
use Auth;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Services\StripeService;
use Domain\SetupWizard\Services\DemoService;
use Domain\SetupWizard\Services\StripeService;
use Laravel\Cashier\PaymentMethod;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;

View File

@@ -1,8 +1,8 @@
<?php
namespace App\Http\Controllers\Subscription;
use App\Models\User;
use App\Services\StripeService;
use Domain\Settings\Models\User;
use Domain\SetupWizard\Services\StripeService;
use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;
class StripeWebhookController extends CashierController

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\User;
use Auth;
use App\Models\User;
use Domain\Settings\Models\User;
use Stripe\SetupIntent;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use Illuminate\Http\Response;
use App\Services\StripeService;
use Domain\SetupWizard\Services\StripeService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\UserSubscription;

View File

@@ -1,7 +1,7 @@
<?php
namespace App\Http\Resources;
use App\Models\User;
use Domain\Settings\Models\User;
use Illuminate\Http\Resources\Json\JsonResource;
class InvoiceResource extends JsonResource

View File

@@ -2,7 +2,7 @@
namespace App\Http\Resources;
use Laravel\Cashier\Cashier;
use App\Services\StripeService;
use Domain\SetupWizard\Services\StripeService;
use Illuminate\Http\Resources\Json\JsonResource;
class PricingResource extends JsonResource

View File

@@ -2,7 +2,7 @@
namespace App\Services;
use Stripe;
use App\Models\User;
use Domain\Settings\Models\User;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use Laravel\Cashier\Cashier;

View File

@@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Models\File;
use App\Models\Folder;
use Domain\Settings\Models\File;
use Domain\Settings\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Domain\SetupWizard\Services\DemoService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;

View File

@@ -1,9 +1,9 @@
<?php
namespace App\Services;
use App\Models\File;
use Domain\Settings\Models\File;
use ByteUnits\Metric;
use App\Models\Folder;
use Domain\Settings\Models\Folder;
use Illuminate\Support\Str;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\RenameItemRequest;

View File

@@ -2,9 +2,9 @@
namespace App\Services;
use Carbon\Carbon;
use App\Models\Zip;
use App\Models\User;
use App\Models\Share;
use Domain\Settings\Models\Zip;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Share;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;

View File

@@ -2,13 +2,13 @@
namespace App\Services;
use DB;
use App\Models\Zip;
use App\Models\User;
use App\Models\Share;
use App\Models\Folder;
use Domain\Settings\Models\Zip;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Folder;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use App\Models\File as UserFile;
use Domain\Settings\Models\File as UserFile;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Storage;

View File

@@ -2,9 +2,9 @@
namespace App\Services;
use DB;
use App\Models\File;
use App\Models\Share;
use App\Models\Folder;
use Domain\Settings\Models\File;
use Domain\Settings\Models\Share;
use Domain\Settings\Models\Folder;
use Illuminate\Support\Arr;
use Aws\S3\MultipartUploader;
use Illuminate\Support\Facades\Log;

View File

@@ -1,13 +1,13 @@
<?php
use Carbon\Carbon;
use App\Models\File;
use App\Models\User;
use App\Models\Share;
use Domain\Settings\Models\File;
use Domain\Settings\Models\User;
use Domain\Settings\Models\Share;
use ByteUnits\Metric;
use App\Models\Folder;
use App\Models\Setting;
use App\Models\Language;
use Domain\Settings\Models\Folder;
use Domain\Settings\Models\Setting;
use Domain\Settings\Models\Language;
use Illuminate\Support\Str;
use Illuminate\Support\Collection;
use Illuminate\Database\Eloquent\Model;