diff --git a/.env.testing b/.env.testing new file mode 100644 index 000000000..c5fd8dfef --- /dev/null +++ b/.env.testing @@ -0,0 +1,39 @@ +APP_NAME=Testing +APP_ENV=testing +APP_KEY=base64:I9IIGKOLEXaZXIW2FrRe+XgfQPZEP/krNNIX1X86mCs= +APP_DEBUG=true +# APP_URL=http://localhost:8000 + +APP_LOCALE=en +APP_FALLBACK_LOCALE=en +APP_FAKER_LOCALE=en_US + +APP_MAINTENANCE_DRIVER=file + +PHP_CLI_SERVER_WORKERS=4 + +BCRYPT_ROUNDS=12 + +CACHE_DRIVER=array + +LOG_CHANNEL=single +LOG_DEPRECATIONS_CHANNEL=null +LOG_LEVEL=debug +LOG_SQL=false + +DB_CONNECTION=mysql +DB_HOST=mysql +DB_PORT=3306 +DB_DATABASE=test +DB_USERNAME=root +DB_PASSWORD=cRMKd3yNht + +MAIL_MAILER=log +QUEUE_CONNECTION=sync +SESSION_DRIVER=array +TELESCOPE_ENABLED=false +GOOGLE_CLOUD_LOGGING_ENABLED=false +GOOGLE_CLOUD_PUBSUB_ENABLED=false +MEDIA_URL=http://media.url +JWT_SECRET=7DgKgfVvocDNrVzxXJPR3fkJuplN0PsIQ4PInjjbAEHRDmFLxwpHbvCbLPPtisiM +JWT_EXPIRATION=86400 \ No newline at end of file diff --git a/.gitignore b/.gitignore index aba12549e..3dd5440b5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,8 @@ composer.lock tiltconf.json _ide_helper.php *~ -application_default_credentials.json \ No newline at end of file +application_default_credentials.json + +**/caddy +frankenphp +frankenphp-worker.php \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8d8ee00c4..92fd63ee0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,18 +32,20 @@ RUN apt-get update && apt-get install -y \ # Install Redis and Imagick RUN wget -O redis-5.3.7.tgz 'http://pecl.php.net/get/redis-5.3.7.tgz' \ && pecl install redis-5.3.7.tgz \ - && pecl install swoole \ && rm -rf redis-5.3.7.tgz \ && rm -rf /tmp/pear \ && docker-php-ext-enable redis \ - && docker-php-ext-enable gd \ - && docker-php-ext-enable swoole + && docker-php-ext-enable gd # Install Composer RUN curl -sS https://getcomposer.org/installer | php -- \ --install-dir=/usr/local/bin --filename=composer -# Send update for php.ini +RUN curl https://frankenphp.dev/install.sh | sh \ + && mv frankenphp /usr/local/bin/frankenphp \ + && chmod +x /usr/local/bin/frankenphp + + # Send update for php.ini COPY ./init/php.development.ini /usr/local/etc/php/php.ini # Copy the application @@ -57,7 +59,6 @@ RUN composer install --optimize-autoloader \ && php artisan optimize \ && php artisan config:clear \ && php artisan ide-helper:generate \ - && php artisan octane:install --server=swoole \ && composer dumpautoload # Generate Swagger @@ -69,6 +70,8 @@ RUN php artisan l5-swagger:generate # Add symbolic link for public file storage RUN php artisan storage:link +RUN chmod +x vendor/bin/pint + COPY ./docker/start.sh /var/www/docker/start.sh RUN chmod +x /var/www/docker/start.sh diff --git a/app/AliasReplyScanner/AliasReplyScanner.php b/app/AliasReplyScanner/AliasReplyScanner.php index 4a213bfd0..96e18a8e0 100644 --- a/app/AliasReplyScanner/AliasReplyScanner.php +++ b/app/AliasReplyScanner/AliasReplyScanner.php @@ -7,13 +7,10 @@ use App\Models\Team; use App\Models\User; use App\Jobs\SendEmailJob; - use App\Models\EmailTemplate; use App\Models\EnquiryThread; - use App\Models\EnquiryMessage; use Webklex\PHPIMAP\ClientManager; - use EnquiriesManagementController as EMC; class AliasReplyScanner @@ -57,7 +54,7 @@ public function checkBodyIsSensible($text) // Tokenize the text into words $words = str_word_count($text, 1); - if(count($words) == 0) { + if (count($words) == 0) { return false; } diff --git a/app/Console/Commands/AddSuperAdminToAllTeams.php b/app/Console/Commands/AddSuperAdminToAllTeams.php index f1d23918f..949765806 100644 --- a/app/Console/Commands/AddSuperAdminToAllTeams.php +++ b/app/Console/Commands/AddSuperAdminToAllTeams.php @@ -30,8 +30,8 @@ public function handle() { $teamIds = Team::pluck("id"); $superAdminIds = User::where("is_admin", true)->pluck('id'); - foreach($teamIds as $teamId) { - foreach($superAdminIds as $adminId) { + foreach ($teamIds as $teamId) { + foreach ($superAdminIds as $adminId) { TeamHasUser::updateOrCreate( [ 'team_id' => $teamId, diff --git a/app/Console/Commands/AliasReplyScanner.php b/app/Console/Commands/AliasReplyScanner.php index f81635306..efe702323 100644 --- a/app/Console/Commands/AliasReplyScanner.php +++ b/app/Console/Commands/AliasReplyScanner.php @@ -3,9 +3,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; - use App\Http\Traits\TeamTransformation; - use AliasReplyScanner as ARS; class AliasReplyScanner extends Command @@ -36,7 +34,7 @@ public function handle() $messages = ARS::getNewMessagesSafe(); $this->info('Found ' . count($messages) . ' new messages'); - foreach($messages as $i => $message) { + foreach ($messages as $i => $message) { $this->info('Working on message #' . $i); $this->processMessage($message); } diff --git a/app/Console/Commands/AssignTeamToCollection.php b/app/Console/Commands/AssignTeamToCollection.php index a62128ba8..179580492 100644 --- a/app/Console/Commands/AssignTeamToCollection.php +++ b/app/Console/Commands/AssignTeamToCollection.php @@ -47,10 +47,10 @@ public function handle() $teamMongoId = $item['team_id']; $teamName = $item['team_name']; $team = Team::where("mongo_object_id", $teamMongoId)->select("id")->first(); - if(!$team && !is_null($teamName) && trim($teamName) !== '') { + if (!$team && !is_null($teamName) && trim($teamName) !== '') { $team = Team::where("name", "like", "%".$teamName."%")->select("id")->first(); } - if(!$team) { + if (!$team) { $team = $fallbackTeam; } diff --git a/app/Console/Commands/CleanTeamNames.php b/app/Console/Commands/CleanTeamNames.php index 85deea389..6c18b84e4 100644 --- a/app/Console/Commands/CleanTeamNames.php +++ b/app/Console/Commands/CleanTeamNames.php @@ -3,7 +3,6 @@ namespace App\Console\Commands; use App\Models\Team; - use App\Models\Dataset; use App\Models\DatasetVersion; use Illuminate\Console\Command; diff --git a/app/Console/Commands/DataProvidersPostMigration.php b/app/Console/Commands/DataProvidersPostMigration.php index 1ace0cd57..bdd5d89d6 100644 --- a/app/Console/Commands/DataProvidersPostMigration.php +++ b/app/Console/Commands/DataProvidersPostMigration.php @@ -3,12 +3,10 @@ namespace App\Console\Commands; use Exception; - use App\Models\Team; use Illuminate\Console\Command; use App\Models\DataProviderColl; use App\Http\Traits\IndexElastic; - use App\Models\DataProviderCollHasTeam; class DataProvidersPostMigration extends Command diff --git a/app/Console/Commands/DatasetLinkagesMigration.php b/app/Console/Commands/DatasetLinkagesMigration.php index 679fc7314..efc6d57f7 100644 --- a/app/Console/Commands/DatasetLinkagesMigration.php +++ b/app/Console/Commands/DatasetLinkagesMigration.php @@ -41,12 +41,12 @@ public function handle() foreach ($this->csvData as $csv) { $sourceDataset = Dataset::where('mongo_object_id', $csv['source_mongo_object_id']) ->select('id')->first(); - if(!$sourceDataset) { + if (!$sourceDataset) { continue; } $targetDataset = Dataset::where('mongo_object_id', $csv['target_mongo_object_id']) ->select('id')->first(); - if(!$targetDataset) { + if (!$targetDataset) { continue; } diff --git a/app/Console/Commands/FAIRSharingScraper.php b/app/Console/Commands/FAIRSharingScraper.php index 793613248..01a3f5f22 100644 --- a/app/Console/Commands/FAIRSharingScraper.php +++ b/app/Console/Commands/FAIRSharingScraper.php @@ -4,9 +4,7 @@ use stdClass; use Exception; - use App\Models\CommandConfig; - use Illuminate\Console\Command; use Illuminate\Support\Facades\Http; @@ -68,7 +66,7 @@ public function handle(): void private function runStep(stdClass $runStep): void { $response = null; - switch(strtolower($runStep->auth_type)) { + switch (strtolower($runStep->auth_type)) { case 'bearer': try { $response = Http::withHeaders([ @@ -98,7 +96,7 @@ private function authStep(stdClass $authStep): void $response = Http::acceptJson() ->post($authStep->url, $authStep->payload); - if($response->status() === 200) { + if ($response->status() === 200) { $this->authToken = $response->json()[$authStep->token_response_key]; return; } diff --git a/app/Console/Commands/FixCollectionImages.php b/app/Console/Commands/FixCollectionImages.php index 85a9030ed..200ddca90 100644 --- a/app/Console/Commands/FixCollectionImages.php +++ b/app/Console/Commands/FixCollectionImages.php @@ -50,7 +50,7 @@ public function handle() if ($dryRun) { $col = $collection->first(); - if(!$col) { + if (!$col) { $this->error("Cannot find collection mongo id = {$collectionMongoId}"); } else { $this->info("Team ID: {$col->id}, Old Logo: {$col->image_link}, New Logo: {$imagePath}"); diff --git a/app/Console/Commands/FixImages.php b/app/Console/Commands/FixImages.php index ae7bd4269..2e22bc23f 100644 --- a/app/Console/Commands/FixImages.php +++ b/app/Console/Commands/FixImages.php @@ -30,8 +30,8 @@ public function handle() $dryRun = $this->option('dryRun'); $teams = Team::select(["id","team_logo"])->get(); $progressbar = $this->output->createProgressBar(count($teams)); - foreach($teams as $team) { - if(is_null($team->team_logo)) { + foreach ($teams as $team) { + if (is_null($team->team_logo)) { $progressbar->advance(); continue; } diff --git a/app/Console/Commands/ReindexEntities.php b/app/Console/Commands/ReindexEntities.php index ebb9840af..7cc6620e1 100644 --- a/app/Console/Commands/ReindexEntities.php +++ b/app/Console/Commands/ReindexEntities.php @@ -12,7 +12,6 @@ use App\Http\Traits\IndexElastic; use App\Models\DataProviderColl; use Illuminate\Console\Command; - use ElasticClientController as ECC; class ReindexEntities extends Command @@ -123,7 +122,7 @@ private function datasets() $beforeCount = ECC::countDocuments(ECC::ELASTIC_NAME_DATASET); echo "Before reindexing there were $beforeCount datasets indexed \n"; - if($this->fresh) { + if ($this->fresh) { $nDeleted = ECC::deleteAllDocuments(ECC::ELASTIC_NAME_DATASET); echo "Deleted $nDeleted documents from the index \n"; } diff --git a/app/Console/Commands/ToolsPostMigrationProcess.php b/app/Console/Commands/ToolsPostMigrationProcess.php index 8ba892017..62553fd26 100644 --- a/app/Console/Commands/ToolsPostMigrationProcess.php +++ b/app/Console/Commands/ToolsPostMigrationProcess.php @@ -3,15 +3,12 @@ namespace App\Console\Commands; use Exception; - use App\Models\Tool; use App\Models\License; use App\Models\TypeCategory; use Illuminate\Console\Command; use App\Models\ProgrammingLanguage; use App\Models\ToolHasTypeCategory; - - use App\Models\ToolHasProgrammingLanguage; use App\Http\Traits\IndexElastic; diff --git a/app/Console/Commands/UpdateCollectionHasUsers.php b/app/Console/Commands/UpdateCollectionHasUsers.php index 8badd0c58..e9468aa05 100644 --- a/app/Console/Commands/UpdateCollectionHasUsers.php +++ b/app/Console/Commands/UpdateCollectionHasUsers.php @@ -144,7 +144,7 @@ public function handle() ]); // collections.authors - foreach($authors as $author) { + foreach ($authors as $author) { CollectionHasUser::create([ 'collection_id' => $collection->id, 'user_id' => $author, diff --git a/app/Console/Commands/UpdateCollectionLinkedEntities.php b/app/Console/Commands/UpdateCollectionLinkedEntities.php index d9ff612bb..0f3d17bb5 100644 --- a/app/Console/Commands/UpdateCollectionLinkedEntities.php +++ b/app/Console/Commands/UpdateCollectionLinkedEntities.php @@ -56,7 +56,7 @@ public function handle() foreach ($this->csvData as $csv) { $collection = Collection::where('mongo_object_id', $csv['collection_mongo_object_id'])->select('id')->firstOrFail(); - if(is_null($collection)) { + if (is_null($collection)) { //for dev and preprod //this csv was made from prod snapshot $progressbar->advance(); @@ -66,15 +66,15 @@ public function handle() list($modelClass, $modelHasClass) = $relatedObjectMap[$csv['related_entity']]; $relatedModel = null; - if($csv['related_entity'] !== 'publication') { + if ($csv['related_entity'] !== 'publication') { $relatedModel = $modelClass::where('mongo_object_id', $csv['related_mongo_object_id'])->first(); } - if(is_null($relatedModel)) { + if (is_null($relatedModel)) { $relatedModel = $modelClass::where('mongo_id', $csv['related_mongo_id'])->first(); } - if(is_null($relatedModel)) { + if (is_null($relatedModel)) { //cannot find relationship $progressbar->advance(); continue; diff --git a/app/Console/Commands/UploadImagesPostMigrationProcess.php b/app/Console/Commands/UploadImagesPostMigrationProcess.php index 970da65be..3f93c71dc 100644 --- a/app/Console/Commands/UploadImagesPostMigrationProcess.php +++ b/app/Console/Commands/UploadImagesPostMigrationProcess.php @@ -3,11 +3,8 @@ namespace App\Console\Commands; use Exception; - use App\Models\Upload; - use App\Models\Collection; - use Illuminate\Console\Command; class UploadImagesPostMigrationProcess extends Command diff --git a/app/EnquiriesManagementController/EnquiriesManagementController.php b/app/EnquiriesManagementController/EnquiriesManagementController.php index 4dc74f364..4d0261aa2 100644 --- a/app/EnquiriesManagementController/EnquiriesManagementController.php +++ b/app/EnquiriesManagementController/EnquiriesManagementController.php @@ -4,9 +4,7 @@ use Auditor; use Exception; - use App\Jobs\SendEmailJob; - use App\Models\Role; use App\Models\Team; use App\Models\User; diff --git a/app/Exceptions/IntegrationPermissionException.php b/app/Exceptions/IntegrationPermissionException.php index 2d240767c..394cdbfe0 100644 --- a/app/Exceptions/IntegrationPermissionException.php +++ b/app/Exceptions/IntegrationPermissionException.php @@ -3,7 +3,6 @@ namespace App\Exceptions; use Exception; - use Illuminate\Http\Response; class IntegrationPermissionException extends Exception diff --git a/app/Http/Controllers/Api/V1/ActivityLogController.php b/app/Http/Controllers/Api/V1/ActivityLogController.php index d43b93679..f5ec8468f 100644 --- a/app/Http/Controllers/Api/V1/ActivityLogController.php +++ b/app/Http/Controllers/Api/V1/ActivityLogController.php @@ -443,7 +443,7 @@ public function edit(EditActivityLog $request, int $id): JsonResponse public function destroy(DeleteActivityLog $request, int $id): JsonResponse { try { - ActivityLog::where('permission_id', $id)->delete(); + ActivityLog::where('id', $id)->delete(); return response()->json([ 'message' => Config::get('statuscodes.STATUS_OK.message'), diff --git a/app/Http/Controllers/Api/V1/AdminDatasetController.php b/app/Http/Controllers/Api/V1/AdminDatasetController.php index c415d4324..46626a0a5 100644 --- a/app/Http/Controllers/Api/V1/AdminDatasetController.php +++ b/app/Http/Controllers/Api/V1/AdminDatasetController.php @@ -5,14 +5,11 @@ use Config; use Exception; use Auditor; - use App\Http\Controllers\Controller; - use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use App\Jobs\TermExtraction; use App\Jobs\LinkageExtraction; - use App\Models\Dataset; class AdminDatasetController extends Controller @@ -90,7 +87,7 @@ public function triggerTermExtraction(Request $request): JsonResponse { try { - if(!Config::get('ted.enabled')) { + if (!Config::get('ted.enabled')) { throw new Exception("TED not enabled and you're trying to trigger TED"); } diff --git a/app/Http/Controllers/Api/V1/AdminPanelController.php b/app/Http/Controllers/Api/V1/AdminPanelController.php index a0d99dc57..f94d57867 100644 --- a/app/Http/Controllers/Api/V1/AdminPanelController.php +++ b/app/Http/Controllers/Api/V1/AdminPanelController.php @@ -3,9 +3,7 @@ namespace App\Http\Controllers\Api\V1; use App\Jobs\AdminControlTriggerTermExtractionDirector; - use Illuminate\Http\Request; - use App\Http\Controllers\Controller; class AdminPanelController extends Controller diff --git a/app/Http/Controllers/Api/V1/ApplicationController.php b/app/Http/Controllers/Api/V1/ApplicationController.php index f7b97e012..fa9984a54 100644 --- a/app/Http/Controllers/Api/V1/ApplicationController.php +++ b/app/Http/Controllers/Api/V1/ApplicationController.php @@ -104,7 +104,7 @@ public function index(Request $request): JsonResponse $this->checkAccess($input, $teamId, null, 'team'); } $apps = Application::where('user_id', $jwtUser)->whereNotNull('team_id')->select('team_id')->distinct()->get(); - foreach($apps as $app) { + foreach ($apps as $app) { $this->checkAccess($input, $app->team_id, null, 'team'); } diff --git a/app/Http/Controllers/Api/V1/CohortRequestController.php b/app/Http/Controllers/Api/V1/CohortRequestController.php index 09e8cbf40..251431939 100644 --- a/app/Http/Controllers/Api/V1/CohortRequestController.php +++ b/app/Http/Controllers/Api/V1/CohortRequestController.php @@ -189,7 +189,7 @@ public function index(Request $request): JsonResponse }); }); - foreach($sort as $key => $value) { + foreach ($sort as $key => $value) { if (in_array($key, ['created_at', 'updated_at', 'request_status'])) { $query->orderBy('cohort_requests.' . $key, strtoupper($value)); } diff --git a/app/Http/Controllers/Api/V1/CollectionController.php b/app/Http/Controllers/Api/V1/CollectionController.php index 79d1482f7..b1be7ad99 100644 --- a/app/Http/Controllers/Api/V1/CollectionController.php +++ b/app/Http/Controllers/Api/V1/CollectionController.php @@ -1187,7 +1187,7 @@ private function getCollectionById(int $collectionId, bool $trimmed = false) $collection->image_link = Config::get('services.media.base_url') . $collection->image_link; } - if($collection->users) { + if ($collection->users) { $collection->users->map(function ($user) { $currentEmail = $user->email; [$username, $domain] = explode('@', $currentEmail); @@ -1674,7 +1674,7 @@ private function checkKeywords(int $collectionId, array $inKeywords) { $kws = CollectionHasKeyword::where('collection_id', $collectionId)->get(); - foreach($kws as $kw) { + foreach ($kws as $kw) { $kwId = $kw->keyword_id; $checkKeyword = Keyword::where('id', $kwId)->first(); diff --git a/app/Http/Controllers/Api/V1/DataAccessApplicationController.php b/app/Http/Controllers/Api/V1/DataAccessApplicationController.php index c4da2ce1a..000dcb964 100644 --- a/app/Http/Controllers/Api/V1/DataAccessApplicationController.php +++ b/app/Http/Controllers/Api/V1/DataAccessApplicationController.php @@ -152,7 +152,7 @@ public function store(CreateDataAccessApplication $request): JsonResponse $teams = implode(',', array_column($question, 'team')); $guidanceArray = array(); - foreach($question as $q) { + foreach ($question as $q) { if (isset($guidanceArray[$q['guidance']])) { $guidanceArray[$q['guidance']][] = $q['team']; } else { @@ -160,7 +160,7 @@ public function store(CreateDataAccessApplication $request): JsonResponse } } $guidance = ''; - foreach($guidanceArray as $g => $t) { + foreach ($guidanceArray as $g => $t) { $guidance .= '' . implode(',', $t) . '' . '

' . $g . '

'; } @@ -333,7 +333,7 @@ public function destroyFile(DeleteDataAccessApplicationFile $request, int $id, i try { $file = Upload::where('id', $fileId)->first(); - Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '.scanned') + Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '_scanned') ->delete($file->file_location); $file->delete(); diff --git a/app/Http/Controllers/Api/V1/DataProviderCollController.php b/app/Http/Controllers/Api/V1/DataProviderCollController.php index d3abd6641..4836ae966 100644 --- a/app/Http/Controllers/Api/V1/DataProviderCollController.php +++ b/app/Http/Controllers/Api/V1/DataProviderCollController.php @@ -5,13 +5,10 @@ use Config; use Auditor; use Exception; - use App\Models\Team; use App\Models\Dataset; - use Illuminate\Http\Request; use App\Models\DatasetVersion; - use App\Models\DataProviderColl; use Illuminate\Support\Facades\Log; use Illuminate\Http\JsonResponse; diff --git a/app/Http/Controllers/Api/V1/DatasetController.php b/app/Http/Controllers/Api/V1/DatasetController.php index 9bb750b28..cdf548b23 100644 --- a/app/Http/Controllers/Api/V1/DatasetController.php +++ b/app/Http/Controllers/Api/V1/DatasetController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Team; use App\Models\User; use App\Models\Dataset; @@ -14,16 +13,12 @@ use Illuminate\Http\Request; use App\Models\DatasetVersion; use App\Http\Traits\CheckAccess; - use Illuminate\Http\JsonResponse; use App\Http\Controllers\Controller; - use App\Http\Traits\MetadataOnboard; use App\Http\Traits\MetadataVersioning; use App\Models\Traits\ModelHelpers; - use Maatwebsite\Excel\Facades\Excel; - use Illuminate\Support\Facades\Storage; use MetadataManagementController as MMC; use App\Http\Requests\Dataset\GetDataset; @@ -780,13 +775,13 @@ public function update(UpdateDataset $request, int $id) ); // Dispatch term extraction to a subprocess if the dataset moves from draft to active - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $currDataset->id, $datasetVersionId, ); - if(Config::get('ted.enabled')) { + if (Config::get('ted.enabled')) { $tedMetadata = ($useGWDMetada) ? $gwdmMetadata : $input['metadata']; $tedData = Config::get('ted.use_partial') ? $tedMetadata['summary'] : $tedMetadata; @@ -925,7 +920,7 @@ public function edit(EditDataset $request, int $id) $metadata = DatasetVersion::withTrashed()->where('dataset_id', $id)->latest()->first(); - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $datasetModel->id, $metadata->id, @@ -1192,7 +1187,7 @@ function () use ($results) { $metadata = $rowDetails['metadata']['metadata']; $publisherName = $metadata['metadata']['summary']['publisher']; - if(version_compare(Config::get('metadata.GWDM.version'), "1.1", "<")) { + if (version_compare(Config::get('metadata.GWDM.version'), "1.1", "<")) { $publisherName = $publisherName['publisherName']; } else { $publisherName = $publisherName['name']; diff --git a/app/Http/Controllers/Api/V1/DurController.php b/app/Http/Controllers/Api/V1/DurController.php index 65f383508..fbcfc217c 100644 --- a/app/Http/Controllers/Api/V1/DurController.php +++ b/app/Http/Controllers/Api/V1/DurController.php @@ -26,7 +26,6 @@ use App\Http\Requests\Dur\UpdateDur; use App\Http\Requests\Dur\UploadDur; use App\Models\DurHasDatasetVersion; - use App\Exceptions\NotFoundException; use Illuminate\Support\Facades\Storage; use App\Http\Traits\MapOrganisationSector; @@ -1817,7 +1816,7 @@ private function checkKeywords(int $durId, array $inKeywords) { $kws = DurHasKeyword::where('dur_id', $durId)->get(); - foreach($kws as $kw) { + foreach ($kws as $kw) { $kwId = $kw->keyword_id; $checkKeyword = Keyword::where('id', $kwId)->first(); @@ -1899,7 +1898,7 @@ private function checkTools(int $durId, array $inTools) { $tools = DurHasTool::where('dur_id', $durId)->get(); - foreach($tools as $tool) { + foreach ($tools as $tool) { $toolId = $tool->tool_id; $checkTool = Tool::where('id', $toolId)->first(); diff --git a/app/Http/Controllers/Api/V1/EmailController.php b/app/Http/Controllers/Api/V1/EmailController.php index e724ad956..0239ceafe 100644 --- a/app/Http/Controllers/Api/V1/EmailController.php +++ b/app/Http/Controllers/Api/V1/EmailController.php @@ -3,12 +3,8 @@ namespace App\Http\Controllers\Api\V1; use Config; - - use App\Models\User; - use App\Jobs\SendEmailJob; - use App\Models\EmailTemplate; use App\Http\Controllers\Controller; use App\Http\Requests\DispatchEmailRequest; diff --git a/app/Http/Controllers/Api/V1/EnquiryThreadController.php b/app/Http/Controllers/Api/V1/EnquiryThreadController.php index 397682395..0f6f86de4 100644 --- a/app/Http/Controllers/Api/V1/EnquiryThreadController.php +++ b/app/Http/Controllers/Api/V1/EnquiryThreadController.php @@ -5,17 +5,13 @@ use Config; use Auditor; use Exception; - use App\Models\Team; - use App\Models\User; use App\Models\Dataset; use Illuminate\Support\Str; use Illuminate\Http\Request; - use App\Models\EnquiryThread; use Illuminate\Http\JsonResponse; - use App\Http\Controllers\Controller; use EnquiriesManagementController as EMC; diff --git a/app/Http/Controllers/Api/V1/FederationController.php b/app/Http/Controllers/Api/V1/FederationController.php index 2764b39c8..0a8682bc1 100644 --- a/app/Http/Controllers/Api/V1/FederationController.php +++ b/app/Http/Controllers/Api/V1/FederationController.php @@ -16,7 +16,6 @@ use App\Models\TeamUserHasRole; use App\Models\TeamHasFederation; use App\Http\Controllers\Controller; - use Illuminate\Support\Facades\Http; use App\Models\FederationHasNotification; use App\Http\Traits\RequestTransformation; @@ -306,7 +305,7 @@ public function store(CreateFederation $request, int $teamId) $secrets_payload = $this->getSecretsPayload($input); - if($secrets_payload) { + if ($secrets_payload) { $auth_secret_key_location = env('GOOGLE_SECRETS_GMI_PREPEND_NAME') . $federation->id; $payload = [ "path" => env('GOOGLE_APPLICATION_PROJECT_PATH'), @@ -333,7 +332,7 @@ public function store(CreateFederation $request, int $teamId) 'team_id' => $teamId, ]); - foreach($input['notifications'] as $notification) { + foreach ($input['notifications'] as $notification) { // $notification may be a user id, or it may be an email address. $notification = Notification::create([ 'notification_type' => 'federation', @@ -472,7 +471,7 @@ public function update(UpdateFederation $request, int $teamId, int $federationId Federation::where('id', $federationId)->update($updateArray); $secrets_payload = $this->getSecretsPayload($input); - if($secrets_payload) { + if ($secrets_payload) { $auth_secret_key_location = env('GOOGLE_SECRETS_GMI_PREPEND_NAME') . $federationId; $payload = [ "path" => env('GOOGLE_APPLICATION_PROJECT_PATH'), @@ -645,7 +644,7 @@ public function edit(EditFederation $request, int $teamId, int $federationId) Federation::where('id', $federationId)->update($updateArray); $secrets_payload = $this->getSecretsPayload($input); - if($secrets_payload) { + if ($secrets_payload) { $auth_secret_key_location = env('GOOGLE_SECRETS_GMI_PREPEND_NAME') . $federationId; $payload = [ "path" => env('GOOGLE_APPLICATION_PROJECT_PATH'), diff --git a/app/Http/Controllers/Api/V1/FormHydrationController.php b/app/Http/Controllers/Api/V1/FormHydrationController.php index 263f19239..9bd215581 100644 --- a/app/Http/Controllers/Api/V1/FormHydrationController.php +++ b/app/Http/Controllers/Api/V1/FormHydrationController.php @@ -4,14 +4,11 @@ use Config; use MetadataManagementController as MMC; - use App\Http\Controllers\Controller; use App\Models\Dataset; use App\Models\Team; - use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; - use Illuminate\Support\Facades\Http; class FormHydrationController extends Controller @@ -165,7 +162,7 @@ private function getDefaultValues(int $id): array $datasets = Dataset::where('team_id', $id)->get(); $datasetDefaultValues = array(); - if(count($datasets) > 0) { //protect if team has no datasets + if (count($datasets) > 0) { //protect if team has no datasets foreach ($datasets as $dataset) { $dataset['metadata'] = $dataset->latestVersion()->metadata; diff --git a/app/Http/Controllers/Api/V1/IntegrationCollectionController.php b/app/Http/Controllers/Api/V1/IntegrationCollectionController.php index 01ceacb82..baad3a57b 100644 --- a/app/Http/Controllers/Api/V1/IntegrationCollectionController.php +++ b/app/Http/Controllers/Api/V1/IntegrationCollectionController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Dataset; use App\Models\Keyword; use App\Models\Collection; @@ -15,19 +14,15 @@ use App\Models\CollectionHasDur; use App\Http\Traits\IndexElastic; use App\Models\CollectionHasTool; - use App\Models\CollectionHasUser; use Illuminate\Http\JsonResponse; use App\Http\Controllers\Controller; use App\Models\CollectionHasKeyword; use App\Exceptions\NotFoundException; use App\Http\Traits\IntegrationOverride; - - use App\Models\CollectionHasPublication; use App\Http\Traits\RequestTransformation; use App\Models\CollectionHasDatasetVersion; - use App\Http\Requests\CollectionIntegration\GetCollectionIntegration; use App\Http\Requests\CollectionIntegration\CreateCollectionIntegration; use App\Http\Requests\CollectionIntegration\EditCollectionIntegration; @@ -1260,7 +1255,7 @@ private function checkKeywords(int $collectionId, array $inKeywords) { $kws = CollectionHasKeyword::where('collection_id', $collectionId)->get(); - foreach($kws as $kw) { + foreach ($kws as $kw) { $kwId = $kw->keyword_id; $checkKeyword = Keyword::where('id', $kwId)->first(); diff --git a/app/Http/Controllers/Api/V1/IntegrationDatasetController.php b/app/Http/Controllers/Api/V1/IntegrationDatasetController.php index 1ebae5e0b..e5a208110 100644 --- a/app/Http/Controllers/Api/V1/IntegrationDatasetController.php +++ b/app/Http/Controllers/Api/V1/IntegrationDatasetController.php @@ -5,27 +5,21 @@ use Auditor; use Config; use Exception; - use App\Models\Team; use App\Models\User; use App\Models\Dataset; use App\Models\DatasetVersion; use App\Models\DatasetVersionHasSpatialCoverage; use App\Models\SpatialCoverage; - use App\Jobs\TermExtraction; use App\Jobs\LinkageExtraction; use MetadataManagementController as MMC; - use App\Http\Traits\IntegrationOverride; use App\Http\Traits\MetadataOnboard; - use App\Http\Controllers\Controller; - use Illuminate\Support\Str; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; - use App\Http\Requests\Dataset\GetDataset; use App\Http\Requests\Dataset\TestDataset; use App\Http\Requests\Dataset\CreateDataset; @@ -575,14 +569,14 @@ public function store(CreateDataset $request): JsonResponse // - publisher.publisherId --> publisher.gatewayId // - publisher.publisherName --> publisher.name // ------------------------------------------------------------------- - if(version_compare(Config::get('metadata.GWDM.version'), '1.1', '<')) { + if (version_compare(Config::get('metadata.GWDM.version'), '1.1', '<')) { $publisher = [ 'publisherId' => $team['pid'], 'publisherName' => $team['name'], ]; } else { $version = $this->getVersion(1); - if(array_key_exists('version', $input['metadata']['metadata']['required'])) { + if (array_key_exists('version', $input['metadata']['metadata']['required'])) { $version = $input['metadata']['metadata']['required']['version']; } $required['version'] = $version; @@ -608,7 +602,7 @@ public function store(CreateDataset $request): JsonResponse $this->mapCoverage($input['metadata'], $version); // Dispatch term extraction to a subprocess as it may take some time - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $dataset->id, @@ -809,8 +803,8 @@ public function update(UpdateDataset $request, int $id) //update the GWDM modified date and version $input['metadata']['metadata']['required']['modified'] = $updateTime; - if(version_compare(Config::get('metadata.GWDM.version'), '1.0', '>')) { - if(version_compare($lastMetadata['gwdmVersion'], '1.0', '>')) { + if (version_compare(Config::get('metadata.GWDM.version'), '1.0', '>')) { + if (version_compare($lastMetadata['gwdmVersion'], '1.0', '>')) { $lastVersionCode = $lastMetadata['metadata']['required']['version']; } } @@ -1172,7 +1166,7 @@ public function datasetTest(TestDataset $request) private function getVersion(int $version) { - if($version > 999) { + if ($version > 999) { throw new Exception('too many versions'); } @@ -1190,7 +1184,7 @@ private function getVersion(int $version) private function extractMetadata(Mixed $metadata) { - if(isset($metadata['metadata']['metadata'])) { + if (isset($metadata['metadata']['metadata'])) { $metadata = $metadata['metadata']; } diff --git a/app/Http/Controllers/Api/V1/IntegrationDurController.php b/app/Http/Controllers/Api/V1/IntegrationDurController.php index 40eb1a385..814969e49 100644 --- a/app/Http/Controllers/Api/V1/IntegrationDurController.php +++ b/app/Http/Controllers/Api/V1/IntegrationDurController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Dur; use App\Models\Tool; use App\Models\Sector; @@ -13,9 +12,7 @@ use App\Models\Keyword; use App\Models\DurHasTool; use App\Models\Application; - use Illuminate\Http\Request; - use App\Models\DurHasKeyword; use App\Models\DurHasDatasetVersion; use App\Models\DatasetVersion; @@ -24,12 +21,9 @@ use Illuminate\Http\JsonResponse; use App\Http\Requests\Dur\EditDur; use App\Http\Controllers\Controller; - use App\Http\Requests\Dur\CreateDur; use App\Http\Requests\Dur\DeleteDur; - use App\Http\Requests\Dur\UpdateDur; - use App\Exceptions\NotFoundException; use App\Http\Traits\IntegrationOverride; use App\Http\Traits\RequestTransformation; @@ -1432,7 +1426,7 @@ private function checkKeywords(int $durId, array $inKeywords) { $kws = DurHasKeyword::where('dur_id', $durId)->get(); - foreach($kws as $kw) { + foreach ($kws as $kw) { $kwId = $kw->keyword_id; $checkKeyword = Keyword::where('id', $kwId)->first(); @@ -1514,7 +1508,7 @@ private function checkTools(int $durId, array $inTools) { $tools = DurHasTool::where('dur_id', $durId)->get(); - foreach($tools as $tool) { + foreach ($tools as $tool) { $toolId = $tool->tool_id; $checkTool = Tool::where('id', $toolId)->first(); diff --git a/app/Http/Controllers/Api/V1/KeywordController.php b/app/Http/Controllers/Api/V1/KeywordController.php index af9530fe6..455e7b9ae 100644 --- a/app/Http/Controllers/Api/V1/KeywordController.php +++ b/app/Http/Controllers/Api/V1/KeywordController.php @@ -79,7 +79,7 @@ public function index(Request $request): JsonResponse $perPage = (int) request('perPage', Config::get('constants.per_page')); $keywords = Keyword::where('enabled', 1) ->paginate(function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; diff --git a/app/Http/Controllers/Api/V1/LibraryController.php b/app/Http/Controllers/Api/V1/LibraryController.php index 03355a116..7a56b7f0f 100644 --- a/app/Http/Controllers/Api/V1/LibraryController.php +++ b/app/Http/Controllers/Api/V1/LibraryController.php @@ -97,7 +97,7 @@ public function index(Request $request): JsonResponse $libraries = $libraries->paginate(function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; diff --git a/app/Http/Controllers/Api/V1/NotificationController.php b/app/Http/Controllers/Api/V1/NotificationController.php index e6e9f79f3..81d21ac1e 100644 --- a/app/Http/Controllers/Api/V1/NotificationController.php +++ b/app/Http/Controllers/Api/V1/NotificationController.php @@ -2,21 +2,22 @@ namespace App\Http\Controllers\Api\V1; -use Auditor; use Config; +use Auditor; use Exception; use App\Models\User; use App\Models\Notification; use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; use App\Http\Controllers\Controller; +use App\Exceptions\NotFoundException; +use App\Http\Traits\TeamTransformation; +use App\Http\Traits\RequestTransformation; +use App\Http\Requests\Notification\GetNotification; use App\Http\Requests\Notification\EditNotification; use App\Http\Requests\Notification\CreateNotification; use App\Http\Requests\Notification\DeleteNotification; use App\Http\Requests\Notification\UpdateNotification; -use App\Http\Traits\TeamTransformation; -use App\Http\Traits\RequestTransformation; -use App\Http\Requests\Notification\GetNotification; class NotificationController extends Controller { @@ -54,10 +55,10 @@ class NotificationController extends Controller public function index(Request $request): JsonResponse { - try { - $input = $request->all(); - $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + $input = $request->all(); + $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + try { $perPage = request('perPage', Config::get('constants.per_page')); $notifications = Notification::where('enabled', 1)->paginate($perPage); @@ -130,10 +131,10 @@ public function index(Request $request): JsonResponse */ public function show(GetNotification $request, int $id): JsonResponse { - try { - $input = $request->all(); - $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + $input = $request->all(); + $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + try { $notification = Notification::findOrFail($id); // mask the email if the user_id is supplied. Otherwise, return the full email. @@ -210,10 +211,10 @@ public function show(GetNotification $request, int $id): JsonResponse */ public function store(CreateNotification $request): JsonResponse { - try { - $input = $request->all(); - $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + $input = $request->all(); + $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + try { $notification = Notification::create([ 'notification_type' => $input['notification_type'], 'message' => $input['message'], @@ -311,10 +312,10 @@ public function store(CreateNotification $request): JsonResponse */ public function update(UpdateNotification $request, int $id): JsonResponse { - try { - $input = $request->all(); - $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + $input = $request->all(); + $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + try { Notification::where('id', $id)->update([ 'notification_type' => $input['notification_type'], 'message' => $input['message'], @@ -411,10 +412,10 @@ public function update(UpdateNotification $request, int $id): JsonResponse */ public function edit(EditNotification $request, int $id): JsonResponse { - try { - $input = $request->all(); - $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + $input = $request->all(); + $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + try { $arrayKeys = [ 'notification_type', 'message', @@ -495,10 +496,10 @@ public function edit(EditNotification $request, int $id): JsonResponse */ public function destroy(DeleteNotification $request, int $id): JsonResponse { - try { - $input = $request->all(); - $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + $input = $request->all(); + $jwtUser = array_key_exists('jwt_user', $input) ? $input['jwt_user'] : []; + try { $notification = Notification::findOrFail($id); if ($notification) { $notification->delete(); diff --git a/app/Http/Controllers/Api/V1/ProgrammingLanguageController.php b/app/Http/Controllers/Api/V1/ProgrammingLanguageController.php index 97c18b765..4ba10cb4d 100644 --- a/app/Http/Controllers/Api/V1/ProgrammingLanguageController.php +++ b/app/Http/Controllers/Api/V1/ProgrammingLanguageController.php @@ -55,7 +55,7 @@ public function index(Request $request): JsonResponse $programming_languages = ProgrammingLanguage::where('enabled', 1) ->paginate(function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; diff --git a/app/Http/Controllers/Api/V1/PublicationController.php b/app/Http/Controllers/Api/V1/PublicationController.php index c6cfc1a6a..c707d560b 100644 --- a/app/Http/Controllers/Api/V1/PublicationController.php +++ b/app/Http/Controllers/Api/V1/PublicationController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Dataset; use App\Models\Publication; use Illuminate\Http\Request; @@ -16,13 +15,11 @@ use App\Models\PublicationHasTool; use App\Http\Controllers\Controller; use App\Exceptions\NotFoundException; - use App\Models\CollectionHasPublication; use App\Http\Traits\RequestTransformation; use App\Models\PublicationHasDatasetVersion; use App\Http\Requests\Publication\GetPublication; use App\Http\Requests\Publication\EditPublication; - use App\Http\Requests\Publication\CreatePublication; use App\Http\Requests\Publication\DeletePublication; use App\Http\Requests\Publication\UpdatePublication; diff --git a/app/Http/Controllers/Api/V1/QuestionBankController.php b/app/Http/Controllers/Api/V1/QuestionBankController.php index 7116fcefd..b617a78b3 100644 --- a/app/Http/Controllers/Api/V1/QuestionBankController.php +++ b/app/Http/Controllers/Api/V1/QuestionBankController.php @@ -150,7 +150,7 @@ function ($query) use ($isChild) { ) ->paginate( function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; @@ -309,7 +309,7 @@ function ($query) use ($isChild) { ) ->paginate( function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; @@ -468,7 +468,7 @@ function ($query) use ($isChild) { ) ->paginate( function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; @@ -626,7 +626,7 @@ function ($query) use ($isChild) { ) ->paginate( function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; diff --git a/app/Http/Controllers/Api/V1/SearchController.php b/app/Http/Controllers/Api/V1/SearchController.php index 66ee22631..ae3cae805 100644 --- a/app/Http/Controllers/Api/V1/SearchController.php +++ b/app/Http/Controllers/Api/V1/SearchController.php @@ -18,14 +18,12 @@ use App\Models\Publication; use App\Models\TypeCategory; use Illuminate\Http\Request; - use Illuminate\Http\Response; use App\Exports\DataUseExport; use App\Models\DatasetVersion; use App\Exports\ToolListExport; use App\Models\DataProviderColl; use App\Http\Traits\IndexElastic; - use App\Models\DurHasPublication; use Illuminate\Http\JsonResponse; use App\Exports\DatasetListExport; @@ -191,7 +189,7 @@ public function datasets(Request $request): JsonResponse|BinaryFileResponse $model = Dataset::with('team')->where('id', $matchedId) ->first(); - if(!$model) { + if (!$model) { \Log::warning('Elastic found id=' . $matchedId . ' which is not an existing dataset'); if (isset($datasetsArray[$i])) { unset($datasetsArray[$i]); @@ -1172,7 +1170,7 @@ public function publications(PublicationSearch $request): JsonResponse|BinaryFil 'aggregations' => isset($response['aggregations']) ? $response['aggregations'] : [], 'elastic_total' => $totalResults, ]; - if ($matchedIds) { + if ($matchedIds) { $arrAggs['ids'] = $matchedIds; } $aggs = collect($arrAggs); diff --git a/app/Http/Controllers/Api/V1/TagController.php b/app/Http/Controllers/Api/V1/TagController.php index 1b5cfe9c0..a03a31112 100644 --- a/app/Http/Controllers/Api/V1/TagController.php +++ b/app/Http/Controllers/Api/V1/TagController.php @@ -58,7 +58,7 @@ public function index(): JsonResponse try { $tags = Tag::where('enabled', 1) ->paginate(function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; diff --git a/app/Http/Controllers/Api/V1/TeamController.php b/app/Http/Controllers/Api/V1/TeamController.php index 1bd04005f..3f0382d31 100644 --- a/app/Http/Controllers/Api/V1/TeamController.php +++ b/app/Http/Controllers/Api/V1/TeamController.php @@ -624,7 +624,7 @@ public function store(CreateTeam $request): JsonResponse } //make sure the super admin is added to this team on creation - foreach($superAdminIds as $adminId) { + foreach ($superAdminIds as $adminId) { TeamHasUser::create( ['team_id' => $team->id, 'user_id' => $adminId], ); diff --git a/app/Http/Controllers/Api/V1/TeamDataAccessApplicationController.php b/app/Http/Controllers/Api/V1/TeamDataAccessApplicationController.php index 7ff670267..d54772abf 100644 --- a/app/Http/Controllers/Api/V1/TeamDataAccessApplicationController.php +++ b/app/Http/Controllers/Api/V1/TeamDataAccessApplicationController.php @@ -25,7 +25,6 @@ use App\Models\TeamHasDataAccessApplication; use App\Models\Upload; use App\Models\User; - use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; @@ -465,7 +464,7 @@ public function downloadFile(GetDataAccessApplicationFile $request, int $teamId, 'description' => 'DataAccessApplication ' . $id . ' download file ' . $fileId, ]); - return Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '.scanned') + return Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '_scanned') ->download($file->file_location); } @@ -840,7 +839,7 @@ public function destroyFile(DeleteDataAccessApplicationFile $request, int $teamI $file = Upload::where('id', $fileId)->first(); - Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '.scanned') + Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '_scanned') ->delete($file->file_location); $file->delete(); diff --git a/app/Http/Controllers/Api/V1/ToolController.php b/app/Http/Controllers/Api/V1/ToolController.php index b0c4b94c3..7edc3cf46 100644 --- a/app/Http/Controllers/Api/V1/ToolController.php +++ b/app/Http/Controllers/Api/V1/ToolController.php @@ -34,7 +34,6 @@ use App\Http\Requests\Tool\CreateTool; use App\Http\Requests\Tool\DeleteTool; use App\Http\Requests\Tool\UpdateTool; - use App\Models\ToolHasProgrammingPackage; use App\Http\Traits\RequestTransformation; use App\Models\ToolHasProgrammingLanguage; @@ -505,7 +504,7 @@ public function store(CreateTool $request): JsonResponse $this->checkCollections($toolId, $collections, (int)$jwtUser['id']); $currentTool = Tool::where('id', $toolId)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools((int) $toolId); } @@ -913,7 +912,7 @@ public function edit(EditTool $request, int $id): JsonResponse } $currentTool = Tool::where('id', $id)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools($id); } @@ -1081,12 +1080,12 @@ private function getToolById(int $toolId, bool $onlyActive = false) */ private function createNewTagIfNotExists(mixed $value) { - if(!is_numeric($value) && !empty($value)) { + if (!is_numeric($value) && !empty($value)) { $tag = Tag::where([ 'description' => $value, ])->first(); - if(is_null($tag)) { + if (is_null($tag)) { $createdTag = Tag::create([ 'type' => TagType::TOPICS, 'description' => $value, @@ -1122,7 +1121,7 @@ private function insertToolHasTag(array $tags, int $toolId): mixed // This whole thing could be an updateOrCreate, but Eloquent can't cope with the fact // this model has no single primary key column so we have to go around the houses. - if(is_null($createdTagId)) { + if (is_null($createdTagId)) { $toolHasTag = ToolHasTag::withTrashed()->where( [ 'tool_id' => (int)$toolId, diff --git a/app/Http/Controllers/Api/V1/TypeCategoryController.php b/app/Http/Controllers/Api/V1/TypeCategoryController.php index 1f9b6335f..d89e33be9 100644 --- a/app/Http/Controllers/Api/V1/TypeCategoryController.php +++ b/app/Http/Controllers/Api/V1/TypeCategoryController.php @@ -56,7 +56,7 @@ public function index(Request $request): JsonResponse $typeCategories = TypeCategory::where('enabled', 1) ->paginate(function ($total) use ($perPage) { - if($perPage === -1) { + if ($perPage === -1) { return $total; } return $perPage; diff --git a/app/Http/Controllers/Api/V1/UploadController.php b/app/Http/Controllers/Api/V1/UploadController.php index 291a8c9e3..483a922ce 100644 --- a/app/Http/Controllers/Api/V1/UploadController.php +++ b/app/Http/Controllers/Api/V1/UploadController.php @@ -94,7 +94,7 @@ public function upload(Request $request): JsonResponse $filePath = $file->storeAs( '', $storedFilename, - $fileSystem . '.unscanned' + $fileSystem . '_unscanned' ); // if there is an error, storeAs returns false and does not actually throw... @@ -271,7 +271,7 @@ public function content(Request $request, int $id): JsonResponse 'message' => 'File failed scan, content cannot be retrieved' ]); } else { - $contents = Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '.scanned') + $contents = Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '_scanned') ->get($upload->file_location); Auditor::log([ diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.php index 79f2eecc8..956d93590 100644 --- a/app/Http/Controllers/Api/V1/UserController.php +++ b/app/Http/Controllers/Api/V1/UserController.php @@ -94,7 +94,7 @@ public function index(IndexUser $request): mixed return $user; }) ]; - } elseif($mini) { + } elseif ($mini) { //temporary force to get all users but with masked email // - will not be needed in the future as can just use the above if block $users = [ @@ -105,7 +105,7 @@ public function index(IndexUser $request): mixed return $user; }) ]; - } elseif($userIsAdmin) { + } elseif ($userIsAdmin) { $users = User::with(['roles', 'roles.permissions', 'teams', 'notifications'])->paginate($perPage, ['*'], 'page'); } else { $users = User::select('id', 'name')->paginate($perPage, ['*'], 'page'); @@ -479,7 +479,7 @@ public function update(UpdateUser $request, int $id): mixed } } - if(array_key_exists('preferred_email', $input)) { + if (array_key_exists('preferred_email', $input)) { $array['preferred_email'] = $user->provider === 'open-athens' ? $user->preferred_email : $input['preferred_email']; } diff --git a/app/Http/Controllers/Api/V1/UserDataAccessApplicationController.php b/app/Http/Controllers/Api/V1/UserDataAccessApplicationController.php index 8f31b02e2..a4be4be63 100644 --- a/app/Http/Controllers/Api/V1/UserDataAccessApplicationController.php +++ b/app/Http/Controllers/Api/V1/UserDataAccessApplicationController.php @@ -577,7 +577,7 @@ public function downloadFile(GetUserDataAccessApplicationFile $request, int $use 'description' => 'DataAccessApplication ' . $id . ' download file ' . $fileId, ]); - return Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '.scanned') + return Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '_scanned') ->download($file->file_location); } @@ -1051,7 +1051,7 @@ public function destroyFile(DeleteUserDataAccessApplicationFile $request, int $u $file = Upload::where('id', $fileId)->first(); - Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '.scanned') + Storage::disk(env('SCANNING_FILESYSTEM_DISK', 'local_scan') . '_scanned') ->delete($file->file_location); $file->delete(); diff --git a/app/Http/Controllers/Api/V1/UserOrganisationController.php b/app/Http/Controllers/Api/V1/UserOrganisationController.php index adc99fadf..9b1e15a08 100644 --- a/app/Http/Controllers/Api/V1/UserOrganisationController.php +++ b/app/Http/Controllers/Api/V1/UserOrganisationController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Api\V1; use Exception; - use Auditor; use App\Models\User; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Api/V2/CollectionController.php b/app/Http/Controllers/Api/V2/CollectionController.php index 6ac6f5f20..b79f68324 100644 --- a/app/Http/Controllers/Api/V2/CollectionController.php +++ b/app/Http/Controllers/Api/V2/CollectionController.php @@ -993,7 +993,7 @@ private function getCollectionById(int $collectionId, bool $trimmed = false) $collection->image_link = Config::get('services.media.base_url') . $collection->image_link; } - if($collection->users) { + if ($collection->users) { $collection->users->map(function ($user) { $currentEmail = $user->email; [$username, $domain] = explode('@', $currentEmail); diff --git a/app/Http/Controllers/Api/V2/DatasetController.php b/app/Http/Controllers/Api/V2/DatasetController.php index aa3bff706..e27ef34e0 100644 --- a/app/Http/Controllers/Api/V2/DatasetController.php +++ b/app/Http/Controllers/Api/V2/DatasetController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Team; use App\Models\User; use App\Models\Dataset; @@ -14,16 +13,12 @@ use Illuminate\Http\Request; use App\Models\DatasetVersion; use App\Http\Traits\CheckAccess; - use Illuminate\Http\JsonResponse; use App\Http\Controllers\Controller; - use App\Http\Traits\MetadataOnboard; use App\Http\Traits\MetadataVersioning; use App\Models\Traits\ModelHelpers; - use Maatwebsite\Excel\Facades\Excel; - use Illuminate\Support\Facades\Storage; use MetadataManagementController as MMC; use App\Http\Requests\V2\Dataset\GetDataset; @@ -615,13 +610,13 @@ public function update(UpdateDataset $request, int $id) ); // Dispatch term extraction to a subprocess if the dataset moves from draft to active - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $currDataset->id, $datasetVersionId, ); - if(Config::get('ted.enabled')) { + if (Config::get('ted.enabled')) { $tedData = Config::get('ted.use_partial') ? $input['metadata']['metadata']['summary'] : $input['metadata']['metadata']; TermExtraction::dispatch( @@ -719,7 +714,7 @@ public function edit(EditDataset $request, int $id) $metadata = DatasetVersion::where('dataset_id', $id)->latest()->first(); - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $datasetModel->id, $metadata->id, diff --git a/app/Http/Controllers/Api/V2/PublicationController.php b/app/Http/Controllers/Api/V2/PublicationController.php index 2935dc597..4c2ee8d8f 100644 --- a/app/Http/Controllers/Api/V2/PublicationController.php +++ b/app/Http/Controllers/Api/V2/PublicationController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Publication; use Illuminate\Http\Request; use Illuminate\Support\Carbon; @@ -14,13 +13,11 @@ use Illuminate\Http\JsonResponse; use App\Models\PublicationHasTool; use App\Http\Controllers\Controller; - use App\Models\CollectionHasPublication; use App\Http\Traits\PublicationsV2Helper; use App\Http\Traits\RequestTransformation; use App\Models\PublicationHasDatasetVersion; use App\Http\Requests\Publication\GetPublication; - use App\Http\Requests\Publication\EditPublication; use App\Http\Requests\Publication\CreatePublication; use App\Http\Requests\Publication\DeletePublication; diff --git a/app/Http/Controllers/Api/V2/TeamDatasetController.php b/app/Http/Controllers/Api/V2/TeamDatasetController.php index 3d1647f34..efbf6ee38 100644 --- a/app/Http/Controllers/Api/V2/TeamDatasetController.php +++ b/app/Http/Controllers/Api/V2/TeamDatasetController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use App\Models\Team; use App\Models\User; use App\Models\Dataset; @@ -14,16 +13,12 @@ use Illuminate\Http\Request; use App\Models\DatasetVersion; use App\Http\Traits\CheckAccess; - use Illuminate\Http\JsonResponse; use App\Http\Controllers\Controller; - use App\Http\Traits\MetadataOnboard; use App\Http\Traits\MetadataVersioning; use App\Models\Traits\ModelHelpers; - use Maatwebsite\Excel\Facades\Excel; - use MetadataManagementController as MMC; use App\Http\Traits\DatasetsV2Helpers; use App\Http\Traits\RequestTransformation; @@ -801,13 +796,13 @@ public function update(UpdateTeamDataset $request, int $teamId, int $id) ); // Dispatch term extraction to a subprocess if the dataset moves from draft to active - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $currDataset->id, $datasetVersionId, ); - if(Config::get('ted.enabled')) { + if (Config::get('ted.enabled')) { $tedData = Config::get('ted.use_partial') ? $input['metadata']['metadata']['summary'] : $input['metadata']['metadata']; TermExtraction::dispatch( @@ -916,7 +911,7 @@ public function edit(EditTeamDataset $request, int $teamId, int $id) $metadata = DatasetVersion::where('dataset_id', $id)->latest()->first(); - if($request['status'] === Dataset::STATUS_ACTIVE) { + if ($request['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $datasetModel->id, $metadata->id, diff --git a/app/Http/Controllers/Api/V2/TeamToolController.php b/app/Http/Controllers/Api/V2/TeamToolController.php index d0e28787e..31d75afe6 100644 --- a/app/Http/Controllers/Api/V2/TeamToolController.php +++ b/app/Http/Controllers/Api/V2/TeamToolController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use Carbon\Carbon; use App\Models\Tool; use App\Models\DurHasTool; @@ -464,7 +463,7 @@ public function store(CreateToolByTeamId $request, int $teamId): JsonResponse $this->checkCollections($toolId, $collections, (int)$jwtUser['id']); $currentTool = Tool::where('id', $toolId)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools((int) $toolId); } @@ -874,7 +873,7 @@ public function edit(EditToolByTeamIdById $request, int $teamId, int $id): JsonR } $currentTool = Tool::where('id', $id)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools($id); } diff --git a/app/Http/Controllers/Api/V2/ToolController.php b/app/Http/Controllers/Api/V2/ToolController.php index a09e6495b..7aac27413 100644 --- a/app/Http/Controllers/Api/V2/ToolController.php +++ b/app/Http/Controllers/Api/V2/ToolController.php @@ -415,7 +415,7 @@ public function store(CreateTool $request): JsonResponse $this->checkCollections($toolId, $collections, (int)$jwtUser['id']); $currentTool = Tool::where('id', $toolId)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools((int) $toolId); } @@ -793,7 +793,7 @@ public function edit(EditTool $request, int $id): JsonResponse } $currentTool = Tool::where('id', $id)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools($id); } diff --git a/app/Http/Controllers/Api/V2/UserPublicationController.php b/app/Http/Controllers/Api/V2/UserPublicationController.php index dfaa9d9ab..83a61cb7f 100644 --- a/app/Http/Controllers/Api/V2/UserPublicationController.php +++ b/app/Http/Controllers/Api/V2/UserPublicationController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use Carbon\Carbon; use App\Models\Publication; use App\Http\Traits\CheckAccess; diff --git a/app/Http/Controllers/Api/V2/UserToolController.php b/app/Http/Controllers/Api/V2/UserToolController.php index 05d51e097..4766692ac 100644 --- a/app/Http/Controllers/Api/V2/UserToolController.php +++ b/app/Http/Controllers/Api/V2/UserToolController.php @@ -5,7 +5,6 @@ use Config; use Auditor; use Exception; - use Carbon\Carbon; use App\Models\Tool; use App\Models\DurHasTool; @@ -445,7 +444,7 @@ public function store(CreateToolByUserId $request, int $userId): JsonResponse $this->checkCollections($toolId, $collections, $userId); $currentTool = Tool::where('id', $toolId)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools((int) $toolId); } @@ -846,7 +845,7 @@ public function edit(EditToolByUserIdById $request, int $userId, int $id): JsonR } $currentTool = Tool::where('id', $id)->first(); - if($currentTool->status === Tool::STATUS_ACTIVE) { + if ($currentTool->status === Tool::STATUS_ACTIVE) { $this->indexElasticTools($id); } diff --git a/app/Http/Controllers/ServiceLayerController.php b/app/Http/Controllers/ServiceLayerController.php index fb2975733..0316907a0 100644 --- a/app/Http/Controllers/ServiceLayerController.php +++ b/app/Http/Controllers/ServiceLayerController.php @@ -7,8 +7,6 @@ use Exception; use App\Models\Federation; use App\Models\Dataset; - - use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; @@ -74,14 +72,14 @@ function ($query) use ($request) { $response = array(); foreach ($datasets as $dataset) { - if(count($dataset->versions) == 0) { + if (count($dataset->versions) == 0) { continue; } $metadataVersions = []; - foreach($dataset->versions as $version) { + foreach ($dataset->versions as $version) { $gwdmVersion = $version->metadata['gwdmVersion']; - if(version_compare($gwdmVersion, '1.0', '>')) { + if (version_compare($gwdmVersion, '1.0', '>')) { $metadata = $version->metadata['metadata']; $metadataVersions[] = $metadata['required']['version']; } @@ -92,7 +90,7 @@ function ($query) use ($request) { ]; if ($request->has('onlyVersions')) { - if($request->boolean('onlyVersions')) { + if ($request->boolean('onlyVersions')) { continue; } } diff --git a/app/Http/Middleware/AuthenticateIntegrationMiddleware.php b/app/Http/Middleware/AuthenticateIntegrationMiddleware.php index f4b299f4b..fad855351 100644 --- a/app/Http/Middleware/AuthenticateIntegrationMiddleware.php +++ b/app/Http/Middleware/AuthenticateIntegrationMiddleware.php @@ -28,7 +28,7 @@ class AuthenticateIntegrationMiddleware */ public function handle(Request $request, Closure $next): Response { - if(!($request->header('x-application-id') && $request->header('x-client_id'))) { + if (!($request->header('x-application-id') && $request->header('x-client_id'))) { throw new UnauthorizedException('Please provide a x-application-id and x-client-id in your headers'); } diff --git a/app/Http/Middleware/CheckIntegrationAccessMiddleware.php b/app/Http/Middleware/CheckIntegrationAccessMiddleware.php index a3a22dce1..b93a019c3 100644 --- a/app/Http/Middleware/CheckIntegrationAccessMiddleware.php +++ b/app/Http/Middleware/CheckIntegrationAccessMiddleware.php @@ -3,11 +3,8 @@ namespace App\Http\Middleware; use Closure; - use App\Models\Application; - use App\Exceptions\IntegrationPermissionException; - use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/app/Http/Middleware/ProfileRequest.php b/app/Http/Middleware/ProfileRequest.php index 9946aab38..de36e1112 100644 --- a/app/Http/Middleware/ProfileRequest.php +++ b/app/Http/Middleware/ProfileRequest.php @@ -3,10 +3,8 @@ namespace App\Http\Middleware; use Config; - use SebastianBergmann\Timer\Timer; use SebastianBergmann\Timer\ResourceUsageFormatter; - use Closure; use Illuminate\Http\Request; use Illuminate\Http\Response; diff --git a/app/Http/Requests/EmailTemplate/CreateEmailTemplate.php b/app/Http/Requests/EmailTemplate/CreateEmailTemplate.php index 4c0003992..c1971cefc 100644 --- a/app/Http/Requests/EmailTemplate/CreateEmailTemplate.php +++ b/app/Http/Requests/EmailTemplate/CreateEmailTemplate.php @@ -24,7 +24,7 @@ function ($attribute, $value, $fail) { ->where('enabled', $this->input('enabled')) ->first(); - if($emailTemplate) { + if ($emailTemplate) { $fail('The selected identifier is invalid, already exist.'); } } diff --git a/app/Http/Traits/CollectionsV2Helpers.php b/app/Http/Traits/CollectionsV2Helpers.php index 60460142e..aef73ee36 100644 --- a/app/Http/Traits/CollectionsV2Helpers.php +++ b/app/Http/Traits/CollectionsV2Helpers.php @@ -89,7 +89,7 @@ private function getCollectionActiveById(int $collectionId, bool $trimmed = fals $collection->image_link = Config::get('services.media.base_url') . $collection->image_link; } - if($collection->users) { + if ($collection->users) { $collection->users->map(function ($user) { $currentEmail = $user->email; [$username, $domain] = explode('@', $currentEmail); @@ -543,7 +543,7 @@ private function checkKeywords(int $collectionId, array $inKeywords) { $kws = CollectionHasKeyword::where('collection_id', $collectionId)->get(); - foreach($kws as $kw) { + foreach ($kws as $kw) { $kwId = $kw->keyword_id; $checkKeyword = Keyword::where('id', $kwId)->first(); diff --git a/app/Http/Traits/DataAccessApplicationHelpers.php b/app/Http/Traits/DataAccessApplicationHelpers.php index 1291a9836..e6887cede 100644 --- a/app/Http/Traits/DataAccessApplicationHelpers.php +++ b/app/Http/Traits/DataAccessApplicationHelpers.php @@ -152,7 +152,7 @@ public function dashboardIndex( if (!is_null($filterApproval)) { $approvalMatches = []; foreach ($applications as $a) { - foreach($a['teams'] as $t) { + foreach ($a['teams'] as $t) { if ((isset($teamId)) && ($t->team_id === $teamId) && ($t->approval_status === $filterApproval)) { $approvalMatches[] = $a->id; } elseif ((isset($userId)) && ($t->approval_status === $filterApproval)) { @@ -166,7 +166,7 @@ public function dashboardIndex( if (!is_null($filterSubmission)) { $submissionMatches = []; foreach ($applications as $a) { - foreach($a['teams'] as $t) { + foreach ($a['teams'] as $t) { if ((isset($teamId)) && ($t->team_id === $teamId) && ($t->submission_status === $filterSubmission)) { $submissionMatches[] = $a->id; } elseif ((isset($userId)) && ($t->submission_status === $filterSubmission)) { diff --git a/app/Http/Traits/IndexElastic.php b/app/Http/Traits/IndexElastic.php index 48137e5c8..fa16ea460 100644 --- a/app/Http/Traits/IndexElastic.php +++ b/app/Http/Traits/IndexElastic.php @@ -5,10 +5,8 @@ use Auditor; use Config; use Exception; - use Illuminate\Support\Arr; use Illuminate\Support\Carbon; - use App\Models\Collection; use App\Models\CollectionHasDatasetVersion; use App\Models\CollectionHasDur; @@ -33,8 +31,6 @@ use App\Models\ToolHasTag; use App\Models\ToolHasTypeCategory; use App\Models\TypeCategory; - - use ElasticClientController as ECC; trait IndexElastic @@ -61,8 +57,8 @@ public function reindexElastic(string $datasetId, bool $returnParams = false, bo $datasetMatch = Dataset::where('id', $datasetId) ->firstOrFail(); - if($activeCheck) { - if($datasetMatch->status !== Dataset::STATUS_ACTIVE) { + if ($activeCheck) { + if ($datasetMatch->status !== Dataset::STATUS_ACTIVE) { return null; } } @@ -110,7 +106,7 @@ public function reindexElastic(string $datasetId, bool $returnParams = false, bo 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { unset($metadata); return $params; } @@ -228,7 +224,7 @@ public function reindexElasticDataProvider(string $teamId, bool $returnParams = 'body' => $toIndex, 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { return $params; } @@ -364,7 +360,7 @@ public function indexElasticCollections(int $collectionId, bool $returnParams = 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { return $params; } ECC::indexDocument($params); @@ -509,7 +505,7 @@ public function indexElasticDur(string $id, bool $returnParams = false): null|ar 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { return $params; } @@ -597,7 +593,7 @@ public function indexElasticPublication(string $id, bool $returnParams = false): 'body' => $toIndex, 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { return $params; } @@ -724,7 +720,7 @@ public function indexElasticTools(int $toolId, bool $returnParams = false): null 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { return $params; } @@ -823,7 +819,7 @@ public function deleteDataProviderCollFromElastic(string $id) public function getMaterialTypes(array $metadata): array|null { $materialTypes = null; - if(version_compare(Config::get('metadata.GWDM.version'), "2.0", "<")) { + if (version_compare(Config::get('metadata.GWDM.version'), "2.0", "<")) { $containsTissue = !empty($this->getValueByPossibleKeys($metadata, [ 'metadata.coverage.biologicalsamples', 'metadata.coverage.physicalSampleAvailability', @@ -845,7 +841,7 @@ public function getMaterialTypes(array $metadata): array|null public function getContainsTissues(?array $materialTypes) { - if($materialTypes === null) { + if ($materialTypes === null) { return false; } return count($materialTypes) > 0; @@ -904,7 +900,7 @@ public function indexElasticDataCustodianNetwork(int $dataCustodianNetworkId, bo 'headers' => 'application/json' ]; - if($returnParams) { + if ($returnParams) { return $params; } diff --git a/app/Http/Traits/IntegrationOverride.php b/app/Http/Traits/IntegrationOverride.php index c93e73707..efe5d7f9d 100644 --- a/app/Http/Traits/IntegrationOverride.php +++ b/app/Http/Traits/IntegrationOverride.php @@ -4,7 +4,6 @@ use App\Models\Application; use Illuminate\Http\Request; - use App\Exceptions\UnauthorizedException; trait IntegrationOverride diff --git a/app/Http/Traits/MetadataOnboard.php b/app/Http/Traits/MetadataOnboard.php index 0dd5e78db..0a501cb85 100644 --- a/app/Http/Traits/MetadataOnboard.php +++ b/app/Http/Traits/MetadataOnboard.php @@ -4,16 +4,13 @@ use Config; use Exception; - use App\Models\Dataset; use App\Models\DatasetVersion; use App\Models\DatasetVersionHasSpatialCoverage; use App\Models\SpatialCoverage; use App\Jobs\TermExtraction; use App\Jobs\LinkageExtraction; - use Illuminate\Support\Str; - use MetadataManagementController as MMC; trait MetadataOnboard @@ -120,7 +117,7 @@ public function metadataOnboard( // - publisher.publisherId --> publisher.gatewayId // - publisher.publisherName --> publisher.name // ------------------------------------------------------------------- - if(version_compare(Config::get('metadata.GWDM.version'), '1.1', '<')) { + if (version_compare(Config::get('metadata.GWDM.version'), '1.1', '<')) { $publisher = [ 'publisherId' => $team['pid'], 'publisherName' => $team['name'], @@ -128,7 +125,7 @@ public function metadataOnboard( $input['metadata']['metadata']['summary']['publisher'] = $publisher; } else { $version = $this->formatVersion(1); - if(array_key_exists('version', $input['metadata']['metadata']['required'])) { + if (array_key_exists('version', $input['metadata']['metadata']['required'])) { $version = $input['metadata']['metadata']['required']['version']; } $required['version'] = $version; @@ -149,14 +146,14 @@ public function metadataOnboard( $this->mapCoverage($input['metadata'], $version); // Dispatch term extraction to a subprocess if the dataset is marked as active - if($input['status'] === Dataset::STATUS_ACTIVE) { + if ($input['status'] === Dataset::STATUS_ACTIVE) { LinkageExtraction::dispatch( $dataset->id, $version->id ); - if(Config::get('ted.enabled')) { + if (Config::get('ted.enabled')) { $tedData = Config::get('ted.use_partial') ? $input['metadata']['metadata']['summary'] : $input['metadata']['metadata']; TermExtraction::dispatch( @@ -225,7 +222,7 @@ private function mapCoverage(array $metadata, DatasetVersion $version): void public function getVersion(int $version) { - if($version > 999) { + if ($version > 999) { throw new Exception('too many versions'); } diff --git a/app/Http/Traits/MetadataVersioning.php b/app/Http/Traits/MetadataVersioning.php index 2c6e7f0bb..a9a33fbed 100644 --- a/app/Http/Traits/MetadataVersioning.php +++ b/app/Http/Traits/MetadataVersioning.php @@ -3,7 +3,6 @@ namespace App\Http\Traits; use Config; - use App\Models\Dataset; use App\Models\DatasetVersion; use App\Models\DatasetVersionHasDatasetVersion; @@ -31,7 +30,7 @@ public function addMetadataVersion( ): array { $versionNumber = 0; - if($incomingStatus === Dataset::STATUS_ACTIVE) { + if ($incomingStatus === Dataset::STATUS_ACTIVE) { // Determine the last version of metadata if ($currDataset->status !== Dataset::STATUS_DRAFT) { $versionNumber = $previousMetadataVersionNumber + 1; @@ -41,8 +40,8 @@ public function addMetadataVersion( //update the GWDM modified date and version $gwdmMetadata['required']['modified'] = $updateTime; - if(version_compare(Config::get('metadata.GWDM.version'), '1.0', '>')) { - if(version_compare($lastMetadata['gwdmVersion'], '1.0', '>')) { + if (version_compare(Config::get('metadata.GWDM.version'), '1.0', '>')) { + if (version_compare($lastMetadata['gwdmVersion'], '1.0', '>')) { $newMetadata['required']['version'] = $versionCode; } } diff --git a/app/Http/Traits/RequestTransformation.php b/app/Http/Traits/RequestTransformation.php index 05111b786..a05e01503 100644 --- a/app/Http/Traits/RequestTransformation.php +++ b/app/Http/Traits/RequestTransformation.php @@ -8,7 +8,7 @@ public function checkEditArray(array $input, array $keys): array { $response = []; - foreach($input as $key => $value) { + foreach ($input as $key => $value) { if (in_array($key, $keys)) { $response[$key] = $value; } diff --git a/app/Http/Traits/TeamTransformation.php b/app/Http/Traits/TeamTransformation.php index 81a9e920f..00612510c 100644 --- a/app/Http/Traits/TeamTransformation.php +++ b/app/Http/Traits/TeamTransformation.php @@ -154,7 +154,7 @@ public function getTeamNotifications($team, int $teamId, int $userId) private function maskEmail(string|null $email) { - if(is_null($email)) { + if (is_null($email)) { return $email; } diff --git a/app/Http/Traits/ToolsV2Helper.php b/app/Http/Traits/ToolsV2Helper.php index 7f97845b9..b08712581 100644 --- a/app/Http/Traits/ToolsV2Helper.php +++ b/app/Http/Traits/ToolsV2Helper.php @@ -217,12 +217,12 @@ public function getToolById(int $toolId, bool $onlyActive = false) */ public function createNewTagIfNotExists(mixed $value) { - if(!is_numeric($value) && !empty($value)) { + if (!is_numeric($value) && !empty($value)) { $tag = Tag::where([ 'description' => $value, ])->first(); - if(is_null($tag)) { + if (is_null($tag)) { $createdTag = Tag::create([ 'type' => TagType::TOPICS, 'description' => $value, @@ -258,7 +258,7 @@ public function insertToolHasTag(array $tags, int $toolId): mixed // This whole thing could be an updateOrCreate, but Eloquent can't cope with the fact // this model has no single primary key column so we have to go around the houses. - if(is_null($createdTagId)) { + if (is_null($createdTagId)) { $toolHasTag = ToolHasTag::where( [ 'tool_id' => (int)$toolId, diff --git a/app/Http/Traits/UserTransformation.php b/app/Http/Traits/UserTransformation.php index f725848ec..fcee965e2 100644 --- a/app/Http/Traits/UserTransformation.php +++ b/app/Http/Traits/UserTransformation.php @@ -108,7 +108,7 @@ public function getUsers(array $users): array private function maskEmail(string|null $email) { - if(is_null($email)) { + if (is_null($email)) { return $email; } diff --git a/app/Imports/DataUsesTemplateImport.php b/app/Imports/DataUsesTemplateImport.php index 1a718529a..32251ae44 100644 --- a/app/Imports/DataUsesTemplateImport.php +++ b/app/Imports/DataUsesTemplateImport.php @@ -3,7 +3,6 @@ namespace App\Imports; use Carbon\Carbon; - use App\Models\Dur; use Maatwebsite\Excel\Concerns\ToModel; use App\Http\Traits\MapOrganisationSector; diff --git a/app/Jobs/AdminControlTriggerTermExtractionDirector.php b/app/Jobs/AdminControlTriggerTermExtractionDirector.php index 1de09daf4..142908bc8 100644 --- a/app/Jobs/AdminControlTriggerTermExtractionDirector.php +++ b/app/Jobs/AdminControlTriggerTermExtractionDirector.php @@ -3,13 +3,11 @@ namespace App\Jobs; use Auditor; - use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; - use Illuminate\Support\Facades\Artisan; class AdminControlTriggerTermExtractionDirector implements ShouldQueue diff --git a/app/Jobs/AliasReplyScannerJob.php b/app/Jobs/AliasReplyScannerJob.php index ab4af650e..b316a2b77 100644 --- a/app/Jobs/AliasReplyScannerJob.php +++ b/app/Jobs/AliasReplyScannerJob.php @@ -9,7 +9,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; use App\Http\Traits\TeamTransformation; - use AliasReplyScanner as ARS; class AliasReplyScannerJob implements ShouldQueue @@ -40,7 +39,7 @@ public function handle(): void $this->noMessagesFound = count($messages); - foreach($messages as $i => $message) { + foreach ($messages as $i => $message) { CloudLogger::write('Working on message #' . $i); $this->processMessage($message); } diff --git a/app/Jobs/AuditLogJob.php b/app/Jobs/AuditLogJob.php index 0f5030a35..b450bd68d 100644 --- a/app/Jobs/AuditLogJob.php +++ b/app/Jobs/AuditLogJob.php @@ -9,7 +9,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; - use Laravel\Horizon\Contracts\Silenced; class AuditLogJob implements ShouldQueue, Silenced diff --git a/app/Jobs/ScanFileUpload.php b/app/Jobs/ScanFileUpload.php index 23dbd773e..0c0387557 100644 --- a/app/Jobs/ScanFileUpload.php +++ b/app/Jobs/ScanFileUpload.php @@ -6,7 +6,6 @@ use CloudLogger; use Config; use Exception; - use App\Models\Collection; use App\Models\DataAccessApplicationAnswer; use App\Models\Dataset; @@ -20,19 +19,15 @@ use App\Imports\ImportStructuralMetadata; use App\Http\Traits\MetadataOnboard; use MetadataManagementController as MMC; - use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; - use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Storage; - use Intervention\Image\ImageManager; use Intervention\Image\Drivers\Gd\Driver; - use Maatwebsite\Excel\Facades\Excel; class ScanFileUpload implements ShouldQueue @@ -142,7 +137,7 @@ public function handle(): void 'status' => 'FAILED', 'error' => $response['viruses'] ]); - Storage::disk($this->fileSystem . '.unscanned') + Storage::disk($this->fileSystem . '_unscanned') ->delete($upload->file_location); CloudLogger::write([ @@ -161,10 +156,10 @@ public function handle(): void CloudLogger::write('Uploaded file passed malware scan'); $loc = $upload->file_location; - $content = Storage::disk($this->fileSystem . '.unscanned')->get($loc); + $content = Storage::disk($this->fileSystem . '_unscanned')->get($loc); - Storage::disk($this->fileSystem . '.scanned')->put($loc, $content); - Storage::disk($this->fileSystem . '.unscanned')->delete($loc); + Storage::disk($this->fileSystem . '_scanned')->put($loc, $content); + Storage::disk($this->fileSystem . '_unscanned')->delete($loc); CloudLogger::write('Uploaded file moved to safe scanned storage'); @@ -226,14 +221,14 @@ private function createDurFromFile(string $loc, Upload $upload): void 'user_id' => $this->userId, 'team_id' => $this->teamId, ]; - $path = Storage::disk($this->fileSystem . '.scanned')->path($loc); + $path = Storage::disk($this->fileSystem . '_scanned')->path($loc); $import = new ImportDur($data); if ($this->isLocalOrTestEnv) { Excel::import($import, $path); } else { - Excel::import($import, $path, $this->fileSystem . '.scanned'); + Excel::import($import, $path, $this->fileSystem . '_scanned'); } @@ -324,7 +319,7 @@ private function createDatasetFromFile(string $loc, Upload $upload): void try { $team = Team::findOrFail($this->teamId)->toArray(); - $content = Storage::disk($this->fileSystem . '.scanned')->get($loc); + $content = Storage::disk($this->fileSystem . '_scanned')->get($loc); $metadata = json_decode($content, true); @@ -404,14 +399,14 @@ private function createDatasetFromFile(string $loc, Upload $upload): void private function attachStructuralMetadata(string $loc, Upload $upload) { try { - $path = Storage::disk($this->fileSystem . '.scanned')->path($loc); + $path = Storage::disk($this->fileSystem . '_scanned')->path($loc); $import = []; if ($this->isLocalOrTestEnv) { $import = Excel::toArray(new ImportStructuralMetadata(), $path); } else { - $import = Excel::toArray(new ImportStructuralMetadata(), $path, $this->fileSystem . '.scanned'); + $import = Excel::toArray(new ImportStructuralMetadata(), $path, $this->fileSystem . '_scanned'); } $structuralMetadata = array(); @@ -598,13 +593,13 @@ private function uploadMedia(string $loc, Upload $upload, $entity, string $entit { try { $entityId = $entity->id; - $path = Storage::disk($this->fileSystem . '.scanned')->path($loc); + $path = Storage::disk($this->fileSystem . '_scanned')->path($loc); $imageValid = $this->validateImage($path); if ($imageValid['result']) { - $content = Storage::disk($this->fileSystem . '.scanned')->get($loc); - Storage::disk($this->fileSystem . '.media')->put('/' . $entityName . '/' . $loc, $content); + $content = Storage::disk($this->fileSystem . '_scanned')->get($loc); + Storage::disk($this->fileSystem . '_media')->put('/' . $entityName . '/' . $loc, $content); $newPath = '/' . $entityName . '/' . $loc; $entity->update([ @@ -649,7 +644,7 @@ private function validateImage($path): mixed $manager = new ImageManager(Driver::class); if ($this->fileSystem === 'gcs') { $image = $manager->read( - Storage::disk($this->fileSystem . '.scanned')->get($path) + Storage::disk($this->fileSystem . '_scanned')->get($path) ); } else { $image = $manager->read($path); diff --git a/app/Jobs/SendEmailJob.php b/app/Jobs/SendEmailJob.php index 517323282..489631397 100644 --- a/app/Jobs/SendEmailJob.php +++ b/app/Jobs/SendEmailJob.php @@ -4,13 +4,11 @@ use App\Mail\Email; use App\Models\EmailTemplate; - use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; - use Illuminate\Support\Facades\Mail; class SendEmailJob implements ShouldQueue diff --git a/app/Jobs/TermExtraction.php b/app/Jobs/TermExtraction.php index 267ad1cbf..54a49c671 100644 --- a/app/Jobs/TermExtraction.php +++ b/app/Jobs/TermExtraction.php @@ -4,19 +4,15 @@ use Auditor; use Exception; - use App\Models\Dataset; use App\Models\NamedEntities; use App\Models\DatasetVersionHasNamedEntities; - use App\Http\Traits\IndexElastic; - use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; - use Illuminate\Support\Facades\Http; class TermExtraction implements ShouldQueue @@ -72,7 +68,7 @@ public function handle(): void ]); $data = json_decode(gzdecode(gzuncompress(base64_decode($this->data))), true); - if($this->usePartialExtraction) { + if ($this->usePartialExtraction) { //data is partial - summary data only $this->postSummaryToTermExtractionDirector(json_encode($data)); } else { diff --git a/app/Mail/Email.php b/app/Mail/Email.php index 8b91db5da..30b91615a 100644 --- a/app/Mail/Email.php +++ b/app/Mail/Email.php @@ -12,7 +12,6 @@ use Illuminate\Mail\Mailables\Address; use Illuminate\Mail\Mailables\Envelope; use Illuminate\Queue\SerializesModels; - use Illuminate\Support\Facades\Http; class Email extends Mailable diff --git a/app/Mauro/Mauro.php b/app/Mauro/Mauro.php index c2c1371fc..a583f7eec 100644 --- a/app/Mauro/Mauro.php +++ b/app/Mauro/Mauro.php @@ -4,7 +4,6 @@ use Exception; use App\Exceptions\MauroServiceException; - use Illuminate\Support\Facades\Http; class Mauro diff --git a/app/MetadataManagementController/MetadataManagementController.php b/app/MetadataManagementController/MetadataManagementController.php index dc9d1cd5b..a519fb580 100644 --- a/app/MetadataManagementController/MetadataManagementController.php +++ b/app/MetadataManagementController/MetadataManagementController.php @@ -9,7 +9,6 @@ use App\Models\Library; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Http; - use App\Http\Traits\GetValueByPossibleKeys; class MetadataManagementController @@ -68,7 +67,7 @@ public function translateDataModelType( $wasTranslated = $response->status() === 200; $metadata = null; $message = null; - if($wasTranslated) { + if ($wasTranslated) { $metadata = $response->json(); $message = 'translation successful'; } else { @@ -158,7 +157,7 @@ public function deleteDataset(string $id, bool $setToArchived = false): void { try { $dataset = Dataset::with('versions')->where('id', (int)$id)->first(); - if(!$dataset) { + if (!$dataset) { throw new Exception('Dataset with id=' . $id . ' cannot be found'); } $dataset->deleted_at = Carbon::now(); diff --git a/app/Models/DataAccessApplication.php b/app/Models/DataAccessApplication.php index d0c08cff5..6489003f6 100644 --- a/app/Models/DataAccessApplication.php +++ b/app/Models/DataAccessApplication.php @@ -7,7 +7,6 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; use Illuminate\Database\Eloquent\SoftDeletes; - use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/DataAccessApplicationAnswer.php b/app/Models/DataAccessApplicationAnswer.php index fc1129e61..5054d4afa 100644 --- a/app/Models/DataAccessApplicationAnswer.php +++ b/app/Models/DataAccessApplicationAnswer.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; - use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/DataAccessApplicationComment.php b/app/Models/DataAccessApplicationComment.php index 034ff6026..682f95a68 100644 --- a/app/Models/DataAccessApplicationComment.php +++ b/app/Models/DataAccessApplicationComment.php @@ -4,7 +4,6 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; - use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/DataAccessApplicationHasDataset.php b/app/Models/DataAccessApplicationHasDataset.php index 43dff126f..da9db2a3a 100644 --- a/app/Models/DataAccessApplicationHasDataset.php +++ b/app/Models/DataAccessApplicationHasDataset.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; - use Illuminate\Database\Eloquent\Factories\HasFactory; class DataAccessApplicationHasDataset extends Model diff --git a/app/Models/DataAccessApplicationHasQuestion.php b/app/Models/DataAccessApplicationHasQuestion.php index b04c823f8..770255061 100644 --- a/app/Models/DataAccessApplicationHasQuestion.php +++ b/app/Models/DataAccessApplicationHasQuestion.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; - use Illuminate\Database\Eloquent\Factories\HasFactory; class DataAccessApplicationHasQuestion extends Model diff --git a/app/Models/DataAccessApplicationReview.php b/app/Models/DataAccessApplicationReview.php index 297e14ca3..95e31f7f4 100644 --- a/app/Models/DataAccessApplicationReview.php +++ b/app/Models/DataAccessApplicationReview.php @@ -4,7 +4,6 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; - use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/DataAccessTemplate.php b/app/Models/DataAccessTemplate.php index af2f59f07..efc7ed85b 100644 --- a/app/Models/DataAccessTemplate.php +++ b/app/Models/DataAccessTemplate.php @@ -6,7 +6,6 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; use Illuminate\Database\Eloquent\SoftDeletes; - use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Factories\HasFactory; diff --git a/app/Models/DataAccessTemplateHasQuestion.php b/app/Models/DataAccessTemplateHasQuestion.php index 1041119f7..9899c3f1d 100644 --- a/app/Models/DataAccessTemplateHasQuestion.php +++ b/app/Models/DataAccessTemplateHasQuestion.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; - use Illuminate\Database\Eloquent\Factories\HasFactory; class DataAccessTemplateHasQuestion extends Model diff --git a/app/Models/DataProviderColl.php b/app/Models/DataProviderColl.php index 93d6dff05..919520565 100644 --- a/app/Models/DataProviderColl.php +++ b/app/Models/DataProviderColl.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; - use Illuminate\Database\Eloquent\Relations\BelongsToMany; class DataProviderColl extends Model diff --git a/app/Models/Dataset.php b/app/Models/Dataset.php index 4ad368bc8..f0381daea 100644 --- a/app/Models/Dataset.php +++ b/app/Models/Dataset.php @@ -3,7 +3,6 @@ namespace App\Models; use DB; - use App\Models\Traits\EntityCounter; use App\Observers\DatasetObserver; use Illuminate\Database\Eloquent\Attributes\ObservedBy; @@ -353,7 +352,7 @@ function ($query) use ($foreignTableId) { $filteredLinkage = $linkageRecords->where($foreignTableId, $entity->id); - if($includeIntermediate) { + if ($includeIntermediate) { $entity->setAttribute('dataset_versions', $filteredLinkage->values()->toArray()); } else { // Extract dataset version IDs and link types associated with the current entity diff --git a/app/Models/EnquiryMessage.php b/app/Models/EnquiryMessage.php index c56f7f394..cb554c627 100644 --- a/app/Models/EnquiryMessage.php +++ b/app/Models/EnquiryMessage.php @@ -4,7 +4,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; - use Illuminate\Database\Eloquent\Relations\BelongsTo; class EnquiryMessage extends Model diff --git a/app/Models/QuestionBank.php b/app/Models/QuestionBank.php index 23331b366..ab359dc31 100644 --- a/app/Models/QuestionBank.php +++ b/app/Models/QuestionBank.php @@ -6,7 +6,6 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; use Illuminate\Database\Eloquent\SoftDeletes; - use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; diff --git a/app/Models/QuestionBankVersion.php b/app/Models/QuestionBankVersion.php index 70184d9de..9c3c87caa 100644 --- a/app/Models/QuestionBankVersion.php +++ b/app/Models/QuestionBankVersion.php @@ -6,7 +6,6 @@ use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\Prunable; use Illuminate\Database\Eloquent\SoftDeletes; - use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; diff --git a/app/Models/Sector.php b/app/Models/Sector.php index 3fc4337d6..b747dfe45 100644 --- a/app/Models/Sector.php +++ b/app/Models/Sector.php @@ -4,7 +4,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; - use Illuminate\Database\Eloquent\Relations\HasMany; class Sector extends Model diff --git a/app/Models/TeamHasDataAccessApplication.php b/app/Models/TeamHasDataAccessApplication.php index 010af7ae5..7621b6aac 100644 --- a/app/Models/TeamHasDataAccessApplication.php +++ b/app/Models/TeamHasDataAccessApplication.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Observers\TeamHasDataAccessApplicationObserver; - use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; diff --git a/app/Observers/CollectionObserver.php b/app/Observers/CollectionObserver.php index 5ca59a133..d878c758e 100644 --- a/app/Observers/CollectionObserver.php +++ b/app/Observers/CollectionObserver.php @@ -45,7 +45,7 @@ public function updated(Collection $collection): void } - if($collection->status === Collection::STATUS_ACTIVE) { + if ($collection->status === Collection::STATUS_ACTIVE) { $this->indexElasticCollections((int) $collection->id); if ($collection->team_id) { $this->reindexElasticDataProviderWithRelations((int) $collection->team_id, 'dataset'); @@ -59,7 +59,7 @@ public function updated(Collection $collection): void */ public function deleted(Collection $collection): void { - if($collection->status === Collection::STATUS_ACTIVE) { + if ($collection->status === Collection::STATUS_ACTIVE) { $this->deleteCollectionFromElastic((int) $collection->id); if ($collection->team_id) { $this->reindexElasticDataProviderWithRelations((int) $collection->team_id, 'dataset'); diff --git a/app/Observers/DatasetObserver.php b/app/Observers/DatasetObserver.php index c27253b2f..3b6b920fe 100644 --- a/app/Observers/DatasetObserver.php +++ b/app/Observers/DatasetObserver.php @@ -18,7 +18,7 @@ public function created(Dataset $dataset): void $datasetVersion = DatasetVersion::where([ 'dataset_id' => $dataset->id ])->select('id')->first(); - if($dataset->status === Dataset::STATUS_ACTIVE && !is_null($datasetVersion)) { + if ($dataset->status === Dataset::STATUS_ACTIVE && !is_null($datasetVersion)) { $this->reindexElastic($dataset->id); if ($dataset->team_id) { $this->reindexElasticDataProviderWithRelations((int) $dataset->team_id, 'dataset'); @@ -52,7 +52,7 @@ public function updated(Dataset $dataset): void } - if($dataset->status === Dataset::STATUS_ACTIVE && !is_null($datasetVersion)) { + if ($dataset->status === Dataset::STATUS_ACTIVE && !is_null($datasetVersion)) { $this->reindexElastic($dataset->id); if ($dataset->team_id) { $this->reindexElasticDataProviderWithRelations((int) $dataset->team_id, 'dataset'); @@ -76,7 +76,7 @@ public function deleted(Dataset $dataset): void { $prevStatus = $dataset->prevStatus; - if($prevStatus === Dataset::STATUS_ACTIVE) { + if ($prevStatus === Dataset::STATUS_ACTIVE) { $this->deleteDatasetFromElastic($dataset->id); if ($dataset->team_id) { $this->reindexElasticDataProviderWithRelations((int) $dataset->team_id, 'dataset'); diff --git a/app/Observers/DurObserver.php b/app/Observers/DurObserver.php index 87aeda48e..9232b9067 100644 --- a/app/Observers/DurObserver.php +++ b/app/Observers/DurObserver.php @@ -14,7 +14,7 @@ class DurObserver */ public function created(Dur $dur): void { - if($dur->status === Dur::STATUS_ACTIVE) { + if ($dur->status === Dur::STATUS_ACTIVE) { $this->indexElasticDur($dur->id); if ($dur->team_id) { $this->reindexElasticDataProviderWithRelations((int) $dur->team_id, 'dataset'); @@ -44,7 +44,7 @@ public function updated(Dur $dur): void } } - if($dur->status === Dur::STATUS_ACTIVE) { + if ($dur->status === Dur::STATUS_ACTIVE) { $this->indexElasticDur($dur->id); if ($dur->team_id) { $this->reindexElasticDataProviderWithRelations((int) $dur->team_id, 'dataset'); @@ -67,7 +67,7 @@ public function deleted(Dur $dur): void { $prevStatus = $dur->prevStatus; - if($prevStatus === Dur::STATUS_ACTIVE) { + if ($prevStatus === Dur::STATUS_ACTIVE) { $this->deleteDurFromElastic($dur->id); if ($dur->team_id) { $this->reindexElasticDataProviderWithRelations((int) $dur->team_id, 'dataset'); diff --git a/app/Observers/PublicationObserver.php b/app/Observers/PublicationObserver.php index bc2b76f06..4ba1873de 100644 --- a/app/Observers/PublicationObserver.php +++ b/app/Observers/PublicationObserver.php @@ -14,7 +14,7 @@ class PublicationObserver */ public function created(Publication $publication): void { - if($publication->status === Publication::STATUS_ACTIVE) { + if ($publication->status === Publication::STATUS_ACTIVE) { $this->indexElasticPublication((int) $publication->id); } } @@ -38,7 +38,7 @@ public function updated(Publication $publication): void $this->deletePublicationFromElastic((int) $publication->id); } - if($publication->status === Publication::STATUS_ACTIVE) { + if ($publication->status === Publication::STATUS_ACTIVE) { $this->indexElasticPublication((int) $publication->id); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 5fd6ebd16..f2e808577 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -5,8 +5,8 @@ use Config; use Laravel\Passport\Passport; use Illuminate\Support\ServiceProvider; -use App\Http\Controllers\SSO\CustomAccessToken; use App\Models\TeamHasDataAccessApplication; +use App\Http\Controllers\SSO\CustomAccessToken; use App\Observers\TeamHasDataAccessApplicationObserver; class AppServiceProvider extends ServiceProvider diff --git a/app/Providers/AuditorServiceProvider.php b/app/Providers/AuditorServiceProvider.php index fadf645f6..72bce2f01 100644 --- a/app/Providers/AuditorServiceProvider.php +++ b/app/Providers/AuditorServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use App\Auditor\Auditor; - use Illuminate\Support\ServiceProvider; class AuditorServiceProvider extends ServiceProvider diff --git a/app/Providers/EnquiriesManagementControllerServiceProvider.php b/app/Providers/EnquiriesManagementControllerServiceProvider.php index cae3c8973..b4b34ac28 100644 --- a/app/Providers/EnquiriesManagementControllerServiceProvider.php +++ b/app/Providers/EnquiriesManagementControllerServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use App\EnquiriesManagementController\EnquiriesManagementController; - use Illuminate\Support\ServiceProvider; class EnquiriesManagementControllerServiceProvider extends ServiceProvider diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php index d49472f02..5d3df95fa 100644 --- a/app/Providers/HorizonServiceProvider.php +++ b/app/Providers/HorizonServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use App\Models\User; - use Illuminate\Support\Facades\Gate; use Laravel\Horizon\Horizon; use Laravel\Horizon\HorizonApplicationServiceProvider; diff --git a/app/Providers/MauroServiceProvider.php b/app/Providers/MauroServiceProvider.php index b339a0952..987f7bd46 100644 --- a/app/Providers/MauroServiceProvider.php +++ b/app/Providers/MauroServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use App\Mauro\Mauro; - use Illuminate\Support\ServiceProvider; class MauroServiceProvider extends ServiceProvider diff --git a/app/Providers/MetadataManagementControllerServiceProvider.php b/app/Providers/MetadataManagementControllerServiceProvider.php index 68683980a..01b8e687d 100644 --- a/app/Providers/MetadataManagementControllerServiceProvider.php +++ b/app/Providers/MetadataManagementControllerServiceProvider.php @@ -3,7 +3,6 @@ namespace App\Providers; use App\MetadataManagementController\MetadataManagementController; - use Illuminate\Support\ServiceProvider; class MetadataManagementControllerServiceProvider extends ServiceProvider diff --git a/composer.json b/composer.json index 4704d61e1..217d5fd3c 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.2", "darkaonline/l5-swagger": "^8.4", "elasticsearch/elasticsearch": "^8.10", "google/cloud-logging": "^1.30", @@ -22,12 +22,12 @@ "guzzlehttp/guzzle": "^7.2", "intervention/image": "^3.7", "jumbojett/openid-connect-php": "dev-update-redirect-return", - "laravel/framework": "^10.0", + "laravel/framework": "^11.0", "laravel/helpers": "^1.6", "laravel/horizon": "^5.29", "laravel/octane": "^2.5", "laravel/passport": "^12.2", - "laravel/sanctum": "^3.2", + "laravel/sanctum": "^4.0", "laravel/socialite": "^5.6", "laravel/tinker": "^2.8", "laravel/ui": "^4.2", @@ -41,25 +41,22 @@ "webklex/laravel-imap": "^5.3" }, "require-dev": { - "barryvdh/laravel-ide-helper": "^2.13", - "behat/behat": "^3.14", - "behat/mink": "^1.11", - "behat/mink-goutte-driver": "^2.0", + "barryvdh/laravel-ide-helper": "^3.5", "brianium/paratest": "^7.2", "fakerphp/faker": "^1.9.1", "friends-of-behat/mink-extension": "^2.7", "intervention/image": "^3.7", "larastan/larastan": "^2.0", - "laravel/pint": "1.17.2", + "laravel/pint": "^1.21", "laravel/sail": "^1.18", "mockery/mockery": "^1.4.4", - "nunomaduro/collision": "^7.0", + "nunomaduro/collision": "^8.1", "pestphp/pest": "^2.4", "php-http/mock-client": "^1.6", "phpstan/phpstan": "^1.9", "phpunit/php-timer": "^6.0", "phpunit/phpunit": "^10.0", - "soulcodex/laravel-behat": "^1.0", + "plannr/laravel-fast-refresh-database": "^1.2", "spatie/laravel-ignition": "^2.0", "squizlabs/php_codesniffer": "*" }, @@ -100,9 +97,6 @@ "phpstan": [ "vendor/bin/phpstan analyse app --memory-limit 512M" ], - "behat": [ - "vendor/bin/behat" - ], "generate-api-docs": [ "@php artisan l5-swagger:generate" ], @@ -113,7 +107,7 @@ "php -d memory_limit=512M vendor/bin/pest --bail --parallel --compact" ], "lint": [ - "vendor/bin/pint --preset psr12" + "@php vendor/bin/pint --preset psr12" ] }, "extra": { diff --git a/config/filesystems.php b/config/filesystems.php index 2cd9c93e9..cfea7e1c5 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -43,28 +43,26 @@ 'throw' => false, ], - 'local_scan' => [ - 'unscanned' => [ - 'driver' => 'local', - 'root' => storage_path('app/public/unscanned'), - 'url' => env('APP_URL').'/storage/unscanned', - 'visibility' => 'public', - 'throw' => false, - ], - 'scanned' => [ - 'driver' => 'local', - 'root' => storage_path('app/public/scanned'), - 'url' => env('APP_URL').'/storage/scanned', - 'visibility' => 'public', - 'throw' => false, - ], - 'media' => [ - 'driver' => 'local', - 'root' => storage_path('app/public/media'), - 'url' => env('APP_URL').'/storage/media', - 'visibility' => 'public', - 'throw' => false, - ], + 'local_scan_unscanned' => [ + 'driver' => 'local', + 'root' => storage_path('app/public/unscanned'), + 'url' => env('APP_URL').'/storage/unscanned', + 'visibility' => 'public', + 'throw' => false, + ], + 'local_scan_scanned' => [ + 'driver' => 'local', + 'root' => storage_path('app/public/scanned'), + 'url' => env('APP_URL').'/storage/scanned', + 'visibility' => 'public', + 'throw' => false, + ], + 'local_scan_media' => [ + 'driver' => 'local', + 'root' => storage_path('app/public/media'), + 'url' => env('APP_URL').'/storage/media', + 'visibility' => 'public', + 'throw' => false, ], 'public' => [ @@ -87,46 +85,44 @@ 'throw' => false, ], - 'gcs' => [ - 'unscanned' => [ - 'driver' => 'gcs', - 'key_file_path' => env('GOOGLE_APPLICATION_CREDENTIALS'), - 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'), - 'bucket' => env('GOOGLE_CLOUD_UNSCANNED_BUCKET'), - 'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', ''), - 'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), - 'apiEndpoint' => env('GOOGLE_CLOUD_STORAGE_API_ENDPOINT', null), - 'visibility' => 'noPredefinedVisibility', - 'visibility_handler' => null, - 'metadata' => ['cacheControl' => 'public,max-age=86400'], - 'throw' => true, - ], - 'scanned' => [ - 'driver' => 'gcs', - 'key_file_path' => env('GOOGLE_APPLICATION_CREDENTIALS'), - 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'), - 'bucket' => env('GOOGLE_CLOUD_SCANNED_BUCKET'), - 'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', ''), - 'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), - 'apiEndpoint' => env('GOOGLE_CLOUD_STORAGE_API_ENDPOINT', null), - 'visibility' => 'noPredefinedVisibility', - 'visibility_handler' => null, - 'metadata' => ['cacheControl' => 'public,max-age=86400'], - 'throw' => true, - ], - 'media' => [ - 'driver' => 'gcs', - 'key_file_path' => env('GOOGLE_APPLICATION_CREDENTIALS'), - 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'), - 'bucket' => env('GOOGLE_CLOUD_MEDIA_BUCKET'), - 'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', ''), - 'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), - 'apiEndpoint' => env('GOOGLE_CLOUD_STORAGE_API_ENDPOINT', null), - 'visibility' => 'noPredefinedVisibility', - 'visibility_handler' => null, - 'metadata' => ['cacheControl' => 'public,max-age=86400'], - 'throw' => true, - ], + 'gcs_unscanned' => [ + 'driver' => 'gcs', + 'key_file_path' => env('GOOGLE_APPLICATION_CREDENTIALS'), + 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'), + 'bucket' => env('GOOGLE_CLOUD_UNSCANNED_BUCKET'), + 'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', ''), + 'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), + 'apiEndpoint' => env('GOOGLE_CLOUD_STORAGE_API_ENDPOINT', null), + 'visibility' => 'noPredefinedVisibility', + 'visibility_handler' => null, + 'metadata' => ['cacheControl' => 'public,max-age=86400'], + 'throw' => true, + ], + 'gcs_scanned' => [ + 'driver' => 'gcs', + 'key_file_path' => env('GOOGLE_APPLICATION_CREDENTIALS'), + 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'), + 'bucket' => env('GOOGLE_CLOUD_SCANNED_BUCKET'), + 'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', ''), + 'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), + 'apiEndpoint' => env('GOOGLE_CLOUD_STORAGE_API_ENDPOINT', null), + 'visibility' => 'noPredefinedVisibility', + 'visibility_handler' => null, + 'metadata' => ['cacheControl' => 'public,max-age=86400'], + 'throw' => true, + ], + 'gcs_media' => [ + 'driver' => 'gcs', + 'key_file_path' => env('GOOGLE_APPLICATION_CREDENTIALS'), + 'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'), + 'bucket' => env('GOOGLE_CLOUD_MEDIA_BUCKET'), + 'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', ''), + 'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), + 'apiEndpoint' => env('GOOGLE_CLOUD_STORAGE_API_ENDPOINT', null), + 'visibility' => 'noPredefinedVisibility', + 'visibility_handler' => null, + 'metadata' => ['cacheControl' => 'public,max-age=86400'], + 'throw' => true, ], ], diff --git a/config/octane.php b/config/octane.php index a9d804956..3ac3598a4 100644 --- a/config/octane.php +++ b/config/octane.php @@ -38,7 +38,7 @@ | */ - 'server' => env('OCTANE_SERVER', 'swoole'), + 'server' => env('OCTANE_SERVER', 'frankenphp'), /* |-------------------------------------------------------------------------- diff --git a/database/beta/EmailTemplatesBetaDemo.php b/database/beta/EmailTemplatesBetaDemo.php index 5665c7ffa..ebaf79c70 100644 --- a/database/beta/EmailTemplatesBetaDemo.php +++ b/database/beta/EmailTemplatesBetaDemo.php @@ -3,7 +3,6 @@ namespace Database\Beta; use App\Models\EmailTemplate; - use Illuminate\Database\Seeder; class EmailTemplatesBetaDemo extends Seeder diff --git a/database/factories/ActivityLogFactory.php b/database/factories/ActivityLogFactory.php index dbe661de2..f79c25e41 100644 --- a/database/factories/ActivityLogFactory.php +++ b/database/factories/ActivityLogFactory.php @@ -5,14 +5,16 @@ use App\Models\User; use App\Models\ActivityLogType; use App\Models\ActivityLogUserType; - use Illuminate\Database\Eloquent\Factories\Factory; +use Illuminate\Foundation\Testing\WithFaker; /** * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\ActivityLog> */ class ActivityLogFactory extends Factory { + use WithFaker; + /** * Define the model's default state. * @@ -30,7 +32,7 @@ public function definition(): array 'event_type' => 'demo_data', 'user_type_id' => fake()->randomElement($activityLogUserTypes)->id, 'log_type_id' => fake()->randomElement($activityLogTypes)->id, - 'user_id' => fake()->randomElement($users)->id, + 'user_id' => User::all()->random()->id, 'version' => '2.1.0', 'html' => sprintf('%s', $randomString), 'plain_text' => $randomString, diff --git a/database/factories/ActivityLogUserTypeFactory.php b/database/factories/ActivityLogUserTypeFactory.php index d1a97091f..05b9fa4b2 100644 --- a/database/factories/ActivityLogUserTypeFactory.php +++ b/database/factories/ActivityLogUserTypeFactory.php @@ -3,7 +3,6 @@ namespace Database\Factories; use App\Http\Enums\ActivityLogUserType; - use Illuminate\Database\Eloquent\Factories\Factory; /** diff --git a/database/factories/DataAccessApplicationAnswerFactory.php b/database/factories/DataAccessApplicationAnswerFactory.php index 938c7a9c0..3f11f9f13 100644 --- a/database/factories/DataAccessApplicationAnswerFactory.php +++ b/database/factories/DataAccessApplicationAnswerFactory.php @@ -3,7 +3,6 @@ namespace Database\Factories; use App\Models\User; - use Illuminate\Database\Eloquent\Factories\Factory; /** diff --git a/database/factories/DataAccessApplicationFactory.php b/database/factories/DataAccessApplicationFactory.php index 21d89322d..273b8eb1c 100644 --- a/database/factories/DataAccessApplicationFactory.php +++ b/database/factories/DataAccessApplicationFactory.php @@ -3,7 +3,6 @@ namespace Database\Factories; use App\Models\User; - use Illuminate\Database\Eloquent\Factories\Factory; /** diff --git a/database/factories/DatasetVersionFactory.php b/database/factories/DatasetVersionFactory.php index fae69df60..c4a04dbe8 100644 --- a/database/factories/DatasetVersionFactory.php +++ b/database/factories/DatasetVersionFactory.php @@ -4,7 +4,6 @@ use App\Models\Dataset; use Illuminate\Database\Eloquent\Factories\Factory; - use Tests\Traits\MockExternalApis; /** diff --git a/database/factories/EnquiryThreadFactory.php b/database/factories/EnquiryThreadFactory.php index faa8d242a..c088c2aef 100644 --- a/database/factories/EnquiryThreadFactory.php +++ b/database/factories/EnquiryThreadFactory.php @@ -4,7 +4,6 @@ use App\Models\Team; use App\Models\User; - use Illuminate\Database\Eloquent\Factories\Factory; /** diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 7676f6aff..66ec782fc 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -3,7 +3,6 @@ namespace Database\Factories; use App\Models\Sector; - use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Str; diff --git a/database/migrations/2023_04_03_121729_added_columns_to_tags_table.php b/database/migrations/2023_04_03_121729_added_columns_to_tags_table.php index 67123c516..5b7a7310e 100644 --- a/database/migrations/2023_04_03_121729_added_columns_to_tags_table.php +++ b/database/migrations/2023_04_03_121729_added_columns_to_tags_table.php @@ -53,7 +53,7 @@ public function down(): void $foreignKeys = $this->listTableForeignKeys('filters'); - if(in_array('tags_type_unique', $foreignKeys)) { + if (in_array('tags_type_unique', $foreignKeys)) { DB::statement('ALTER TABLE `tags` DROP FOREIGN KEY `tags_type_unique`'); DB::statement('ALTER TABLE `tags` DROP KEY `tags_type_unique`'); } diff --git a/database/migrations/2023_11_15_090700_remove_id_column_from_team_user_has_roles.php b/database/migrations/2023_11_15_090700_remove_id_column_from_team_user_has_roles.php index 47c88b787..45bab1e2b 100644 --- a/database/migrations/2023_11_15_090700_remove_id_column_from_team_user_has_roles.php +++ b/database/migrations/2023_11_15_090700_remove_id_column_from_team_user_has_roles.php @@ -10,9 +10,26 @@ */ public function up(): void { - Schema::table('team_user_has_roles', function (Blueprint $table) { - $table->dropColumn('id'); - }); + // Create a new table without a primary key constraint + DB::statement(' + CREATE TABLE team_user_has_roles_tmp ( + team_has_user_id BIGINT UNSIGNED NULL, + role_id BIGINT UNSIGNED NULL + -- Add any other columns as needed. + ); + '); + + // Copy the data from the original table to the new table + DB::statement(' + INSERT INTO team_user_has_roles_tmp (team_has_user_id, role_id) + SELECT team_has_user_id, role_id FROM team_user_has_roles; + '); + + // Drop the original table + Schema::drop('team_user_has_roles'); + + // Rename the new table to the original table name + DB::statement('ALTER TABLE team_user_has_roles_tmp RENAME TO team_user_has_roles;'); } /** diff --git a/database/migrations/2024_02_26_093354_add_unique_on_fields_to_filters_table.php b/database/migrations/2024_02_26_093354_add_unique_on_fields_to_filters_table.php index 5be4de528..3e0a29556 100644 --- a/database/migrations/2024_02_26_093354_add_unique_on_fields_to_filters_table.php +++ b/database/migrations/2024_02_26_093354_add_unique_on_fields_to_filters_table.php @@ -24,7 +24,7 @@ public function down(): void $foreignKeys = $this->listTableForeignKeys('filters'); - if(in_array('filters_type_keys_unique', $foreignKeys)) { + if (in_array('filters_type_keys_unique', $foreignKeys)) { DB::statement('ALTER TABLE `filters` DROP FOREIGN KEY `filters_type_keys_unique`'); DB::statement('ALTER TABLE `filters` DROP KEY `filters_type_keys_unique`'); } diff --git a/database/migrations/2024_05_08_133911_update_filter_table_add_provider.php b/database/migrations/2024_05_08_133911_update_filter_table_add_provider.php index 42b7440df..1e6e09544 100644 --- a/database/migrations/2024_05_08_133911_update_filter_table_add_provider.php +++ b/database/migrations/2024_05_08_133911_update_filter_table_add_provider.php @@ -37,7 +37,7 @@ public function down(): void $foreignKeys = $this->listTableForeignKeys('filters'); - if(in_array('filters_type_keys_unique', $foreignKeys)) { + if (in_array('filters_type_keys_unique', $foreignKeys)) { DB::statement('ALTER TABLE `filters` DROP FOREIGN KEY `filters_type_keys_unique`'); DB::statement('ALTER TABLE `filters` DROP KEY `filters_type_keys_unique`'); } diff --git a/database/migrations/2024_08_29_160303_add_foreign_keys_in_libraries.php b/database/migrations/2024_08_29_160303_add_foreign_keys_in_libraries.php index d96e9e21a..32b79cce5 100644 --- a/database/migrations/2024_08_29_160303_add_foreign_keys_in_libraries.php +++ b/database/migrations/2024_08_29_160303_add_foreign_keys_in_libraries.php @@ -13,32 +13,12 @@ public function up() { Schema::table('libraries', function (Blueprint $table) { - $table->renameColumn('user_id', 'old_user_id'); - }); - - Schema::table('libraries', function (Blueprint $table) { - $table->renameColumn('dataset_id', 'old_dataset_id'); - }); + $table->bigInteger('user_id')->unsigned()->nullable()->change(); + $table->bigInteger('dataset_id')->unsigned()->nullable()->change(); - Schema::table('libraries', function (Blueprint $table) { - $table->bigInteger('user_id')->unsigned()->nullable(); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - $table->bigInteger('dataset_id')->unsigned()->nullable(); $table->foreign('dataset_id')->references('id')->on('datasets')->onDelete('cascade'); }); - - Schema::table('libraries', function (Blueprint $table) { - DB::statement("UPDATE libraries SET user_id = old_user_id"); - DB::statement("UPDATE libraries SET dataset_id = old_dataset_id"); - }); - - Schema::table('libraries', function (Blueprint $table) { - $table->dropColumn(['old_user_id']); - }); - - Schema::table('libraries', function (Blueprint $table) { - $table->dropColumn(['old_dataset_id']); - }); } /** diff --git a/database/migrations/2024_10_21_111350_drop_user_id_field_from_collections_table.php b/database/migrations/2024_10_21_111350_drop_user_id_field_from_collections_table.php index 2af7b780c..3ca008558 100644 --- a/database/migrations/2024_10_21_111350_drop_user_id_field_from_collections_table.php +++ b/database/migrations/2024_10_21_111350_drop_user_id_field_from_collections_table.php @@ -14,10 +14,9 @@ public function up(): void { Schema::disableForeignKeyConstraints(); - $foreignKeys = $this->listTableForeignKeys('collections'); - if(in_array('collections_user_id_foreign', $foreignKeys)) { - DB::statement('ALTER TABLE `collections` DROP FOREIGN KEY `collections_user_id_foreign`'); - } + Schema::table('collections', function (Blueprint $table) { + $table->dropForeign(['user_id']); + }); if (Schema::hasColumn('collections', 'user_id')) { $collections = Collection::select(['id', 'user_id'])->get(); @@ -67,13 +66,4 @@ public function down(): void } Schema::enableForeignKeyConstraints(); } - - public function listTableForeignKeys($table) - { - $conn = Schema::getConnection()->getDoctrineSchemaManager(); - - return array_map(function ($key) { - return $key->getName(); - }, $conn->listTableForeignKeys($table)); - } }; diff --git a/database/migrations/2025_03_19_144308_update_project_title_nullable_in_dur_table.php b/database/migrations/2025_03_19_144308_update_project_title_nullable_in_dur_table.php new file mode 100644 index 000000000..87763307b --- /dev/null +++ b/database/migrations/2025_03_19_144308_update_project_title_nullable_in_dur_table.php @@ -0,0 +1,27 @@ +text('project_title')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('dur', function (Blueprint $table) { + $table->text('project_title')->nullable(false)->change(); + }); + } +}; diff --git a/database/seeders/ActivityLogUserTypeSeeder.php b/database/seeders/ActivityLogUserTypeSeeder.php index beaa158da..80c7168fa 100644 --- a/database/seeders/ActivityLogUserTypeSeeder.php +++ b/database/seeders/ActivityLogUserTypeSeeder.php @@ -4,7 +4,6 @@ use App\Http\Enums\ActivityLogUserType as ActivityLogUserTypeEnums; use App\Models\ActivityLogUserType; - use Illuminate\Database\Seeder; class ActivityLogUserTypeSeeder extends Seeder diff --git a/database/seeders/AuditLogSeeder.php b/database/seeders/AuditLogSeeder.php index ce8709599..a0f0a88d5 100644 --- a/database/seeders/AuditLogSeeder.php +++ b/database/seeders/AuditLogSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\AuditLog; - use Illuminate\Database\Seeder; class AuditLogSeeder extends Seeder diff --git a/database/seeders/CategorySeeder.php b/database/seeders/CategorySeeder.php index 0c00659f5..b4215ba89 100644 --- a/database/seeders/CategorySeeder.php +++ b/database/seeders/CategorySeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\Category; - use Illuminate\Database\Seeder; class CategorySeeder extends Seeder diff --git a/database/seeders/DataAccessApplicationAnswerSeeder.php b/database/seeders/DataAccessApplicationAnswerSeeder.php index ca1d328da..b641c9235 100644 --- a/database/seeders/DataAccessApplicationAnswerSeeder.php +++ b/database/seeders/DataAccessApplicationAnswerSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\DataAccessApplicationAnswer; - use Illuminate\Database\Seeder; class DataAccessApplicationAnswerSeeder extends Seeder diff --git a/database/seeders/DataAccessApplicationSeeder.php b/database/seeders/DataAccessApplicationSeeder.php index 9042f4059..95e2a06ce 100644 --- a/database/seeders/DataAccessApplicationSeeder.php +++ b/database/seeders/DataAccessApplicationSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\DataAccessApplication; - use Illuminate\Database\Seeder; class DataAccessApplicationSeeder extends Seeder diff --git a/database/seeders/DataAccessTemplateSeeder.php b/database/seeders/DataAccessTemplateSeeder.php index 8d7e38266..22d6540bb 100644 --- a/database/seeders/DataAccessTemplateSeeder.php +++ b/database/seeders/DataAccessTemplateSeeder.php @@ -5,7 +5,6 @@ use App\Models\DataAccessTemplate; use App\Models\DataAccessTemplateHasQuestion; use App\Models\QuestionBank; - use Illuminate\Database\Seeder; class DataAccessTemplateSeeder extends Seeder diff --git a/database/seeders/DatasetSeeder.php b/database/seeders/DatasetSeeder.php index 8228dc596..fc33a261b 100644 --- a/database/seeders/DatasetSeeder.php +++ b/database/seeders/DatasetSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\Dataset; - use Illuminate\Database\Seeder; class DatasetSeeder extends Seeder diff --git a/database/seeders/EmailTemplateSeeder.php b/database/seeders/EmailTemplateSeeder.php index e3dfc4193..9f9e8543c 100644 --- a/database/seeders/EmailTemplateSeeder.php +++ b/database/seeders/EmailTemplateSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\EmailTemplate; - use Illuminate\Database\Seeder; class EmailTemplateSeeder extends Seeder diff --git a/database/seeders/EnquiryMessageSeeder.php b/database/seeders/EnquiryMessageSeeder.php index d948f290f..d57e2ea02 100644 --- a/database/seeders/EnquiryMessageSeeder.php +++ b/database/seeders/EnquiryMessageSeeder.php @@ -4,7 +4,6 @@ use App\Models\EnquiryThread; use App\Models\EnquiryMessage; - use Illuminate\Database\Seeder; class EnquiryMessageSeeder extends Seeder diff --git a/database/seeders/FAIRShareCommandSeeder.php b/database/seeders/FAIRShareCommandSeeder.php index 5e77b0944..da7812d96 100644 --- a/database/seeders/FAIRShareCommandSeeder.php +++ b/database/seeders/FAIRShareCommandSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\CommandConfig; - use Illuminate\Database\Seeder; class FAIRShareCommandSeeder extends Seeder diff --git a/database/seeders/ProdUserAdminSeeder.php b/database/seeders/ProdUserAdminSeeder.php index f515fffe4..71c551bff 100644 --- a/database/seeders/ProdUserAdminSeeder.php +++ b/database/seeders/ProdUserAdminSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use Illuminate\Database\Seeder; - use Database\Seeders\Traits\HelperFunctions; class ProdUserAdminSeeder extends Seeder diff --git a/database/seeders/ProgrammingLanguageSeeder.php b/database/seeders/ProgrammingLanguageSeeder.php index ab5b66d5f..dce1ba155 100644 --- a/database/seeders/ProgrammingLanguageSeeder.php +++ b/database/seeders/ProgrammingLanguageSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\ProgrammingLanguage; - use Illuminate\Database\Seeder; class ProgrammingLanguageSeeder extends Seeder diff --git a/database/seeders/ProgrammingPackageSeeder.php b/database/seeders/ProgrammingPackageSeeder.php index b94a7b4c9..781eb3862 100644 --- a/database/seeders/ProgrammingPackageSeeder.php +++ b/database/seeders/ProgrammingPackageSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\ProgrammingPackage; - use Illuminate\Database\Seeder; class ProgrammingPackageSeeder extends Seeder diff --git a/database/seeders/PublicationSeeder.php b/database/seeders/PublicationSeeder.php index 67aa505e5..2ee814f73 100644 --- a/database/seeders/PublicationSeeder.php +++ b/database/seeders/PublicationSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\Publication; - use Illuminate\Database\Seeder; class PublicationSeeder extends Seeder diff --git a/database/seeders/QuestionBankSeeder.php b/database/seeders/QuestionBankSeeder.php index 47c2314f9..b986fb402 100644 --- a/database/seeders/QuestionBankSeeder.php +++ b/database/seeders/QuestionBankSeeder.php @@ -7,8 +7,6 @@ use App\Models\QuestionBankVersionHasChildVersion; use App\Models\QuestionHasTeam; use App\Models\DataAccessSection; - - use Illuminate\Database\Seeder; class QuestionBankSeeder extends Seeder @@ -18,8 +16,6 @@ class QuestionBankSeeder extends Seeder */ public function run(): void { - - DataAccessSection::truncate(); QuestionHasTeam::truncate(); QuestionBankVersionHasChildVersion::truncate(); diff --git a/database/seeders/RoleSeeder.php b/database/seeders/RoleSeeder.php index aaf4c88b7..a4378ff87 100644 --- a/database/seeders/RoleSeeder.php +++ b/database/seeders/RoleSeeder.php @@ -380,7 +380,7 @@ public function run(): void 'role_id' => $role->id, ])->delete(); - foreach($v['permissions'] as $p) { + foreach ($v['permissions'] as $p) { $perm = null; if ($p !== 'all') { diff --git a/database/seeders/SINGDataProviderSeeder.php b/database/seeders/SINGDataProviderSeeder.php index 81f32d67b..2c56d8f5e 100644 --- a/database/seeders/SINGDataProviderSeeder.php +++ b/database/seeders/SINGDataProviderSeeder.php @@ -3,11 +3,9 @@ namespace Database\Seeders; use Carbon\Carbon; - use App\Models\Team; use App\Models\DataProviderColl; use App\Models\DataProviderCollHasTeam; - use Illuminate\Database\Seeder; class SINGDataProviderSeeder extends Seeder diff --git a/database/seeders/SectorSeeder.php b/database/seeders/SectorSeeder.php index 9d357db1f..e72dab2fa 100644 --- a/database/seeders/SectorSeeder.php +++ b/database/seeders/SectorSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\Sector; - use Illuminate\Database\Seeder; class SectorSeeder extends Seeder diff --git a/database/seeders/SpatialCoverageSeeder.php b/database/seeders/SpatialCoverageSeeder.php index 97e13f3a8..bf8739765 100644 --- a/database/seeders/SpatialCoverageSeeder.php +++ b/database/seeders/SpatialCoverageSeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\SpatialCoverage; - use Illuminate\Database\Seeder; class SpatialCoverageSeeder extends Seeder diff --git a/database/seeders/TypeCategorySeeder.php b/database/seeders/TypeCategorySeeder.php index b6cd91216..1c47973b8 100644 --- a/database/seeders/TypeCategorySeeder.php +++ b/database/seeders/TypeCategorySeeder.php @@ -3,7 +3,6 @@ namespace Database\Seeders; use App\Models\TypeCategory; - use Illuminate\Database\Seeder; class TypeCategorySeeder extends Seeder diff --git a/database/seeders/UserAdminsSeeder.php b/database/seeders/UserAdminsSeeder.php index ca66fa186..a6f2f74f2 100644 --- a/database/seeders/UserAdminsSeeder.php +++ b/database/seeders/UserAdminsSeeder.php @@ -4,7 +4,6 @@ use App\Models\User; use Illuminate\Database\Seeder; - use Database\Seeders\Traits\HelperFunctions; // use Illuminate\Database\Console\Seeds\WithoutModelEvents; diff --git a/database/seeders/omop/ConceptSeeder.php b/database/seeders/omop/ConceptSeeder.php index abb445999..77a5d848f 100644 --- a/database/seeders/omop/ConceptSeeder.php +++ b/database/seeders/omop/ConceptSeeder.php @@ -51,7 +51,7 @@ public function run() foreach ($files as $file) { - if($useInFileSQL) {// use SQL command + if ($useInFileSQL) {// use SQL command $fullPath = addslashes($file); DB::statement(" LOAD DATA LOCAL INFILE '{$fullPath}' diff --git a/docker/start.sh b/docker/start.sh index 061bb034e..539959dcd 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -5,7 +5,7 @@ if [ -e /var/www/.env ]; then fi # Initialize the base command -base_command="php artisan octane:start --host=0.0.0.0 --port=8000" +base_command="php artisan octane:frankenphp --host=0.0.0.0 --port=8000" # Check the application environment and append the appropriate options if [ "$APP_ENV" = 'local' ] || [ "$APP_ENV" = 'dev' ]; then diff --git a/phpunit.xml b/phpunit.xml index f584fdf20..7cf5b5d6e 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,9 +1,6 @@ - ./tests/Feature @@ -14,12 +11,21 @@ - - - + + + + - + --> + + + + diff --git a/pint.json b/pint.json new file mode 100644 index 000000000..ac7a365fd --- /dev/null +++ b/pint.json @@ -0,0 +1,14 @@ +{ + "preset": "psr12", + "paths": [ + "app", + "config", + "database", + "routes", + "tests" + ], + "exclude": [ + "vendor", + "node_modules" + ] +} \ No newline at end of file diff --git a/routes/api.services.php b/routes/api.services.php index 056d23af9..5d9ffcfe2 100644 --- a/routes/api.services.php +++ b/routes/api.services.php @@ -2,7 +2,6 @@ use Illuminate\Support\Facades\Route; - use App\Http\Controllers\ServiceLayerController; use App\Http\Controllers\Api\V1\DatasetController; diff --git a/tests/Feature/ActivityLogTest.php b/tests/Feature/ActivityLogTest.php index fc6221d8a..e1b81e8e3 100644 --- a/tests/Feature/ActivityLogTest.php +++ b/tests/Feature/ActivityLogTest.php @@ -2,21 +2,21 @@ namespace Tests\Feature; +use App\Models\ActivityLogType; +use App\Models\ActivityLogUserType; use Config; - use Tests\TestCase; +use App\Models\User; +use Tests\Traits\MockExternalApis; +use Database\Seeders\ActivityLogSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\ActivityLogTypeSeeder; use Database\Seeders\ActivityLogUserTypeSeeder; -use Database\Seeders\ActivityLogSeeder; - -use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ActivityLogTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } @@ -91,9 +91,9 @@ public function test_the_application_can_list_a_single_activity_log() 'api/v1/activity_logs', [ 'event_type' => 'test_case', - 'user_type_id' => 1, - 'log_type_id' => 1, - 'user_id' => 1, + 'user_type_id' => ActivityLogUserType::all()->random()->id, + 'log_type_id' => ActivityLogType::all()->random()->id, + 'user_id' => User::all()->random()->id, 'version' => '2.1.0', 'html' => 'something', 'plain_text' => 'something', @@ -144,9 +144,9 @@ public function test_the_application_can_create_an_activity_log() 'api/v1/activity_logs', [ 'event_type' => 'test_case', - 'user_type_id' => 1, - 'log_type_id' => 1, - 'user_id' => 1, + 'user_type_id' => ActivityLogUserType::all()->random()->id, + 'log_type_id' => ActivityLogType::all()->random()->id, + 'user_id' => User::all()->random()->id, 'version' => '2.1.0', 'html' => 'something', 'plain_text' => 'something', @@ -183,9 +183,9 @@ public function test_the_application_can_update_an_activity_log() 'api/v1/activity_logs', [ 'event_type' => 'test_case', - 'user_type_id' => 1, - 'log_type_id' => 1, - 'user_id' => 1, + 'user_type_id' => ActivityLogUserType::all()->random()->id, + 'log_type_id' => ActivityLogType::all()->random()->id, + 'user_id' => User::all()->random()->id, 'version' => '2.1.0', 'html' => 'something', 'plain_text' => 'something', @@ -209,14 +209,17 @@ public function test_the_application_can_update_an_activity_log() // Finally, update the last entered activity log to // prove functionality + $newActiviyLogUserTypeId = (int) ActivityLogUserType::all()->random()->id; + $newActiviyLogTypeId = (int) ActivityLogType::all()->random()->id; + $newUserId = (int) User::all()->random()->id; $response = $this->json( 'PUT', 'api/v1/activity_logs/' . $content['data'], [ 'event_type' => 'updated_test_case', - 'user_type_id' => 2, - 'log_type_id' => 2, - 'user_id' => 2, + 'user_type_id' => $newActiviyLogUserTypeId, + 'log_type_id' => $newActiviyLogTypeId, + 'user_id' => $newUserId, 'version' => '1.0.0', 'html' => 'something', 'plain_text' => 'something', @@ -229,9 +232,9 @@ public function test_the_application_can_update_an_activity_log() $content = $response->decodeResponseJson(); $this->assertEquals($content['data']['event_type'], 'updated_test_case'); - $this->assertEquals($content['data']['user_type_id'], 2); - $this->assertEquals($content['data']['log_type_id'], 2); - $this->assertEquals($content['data']['user_id'], 2); + $this->assertEquals($content['data']['user_type_id'], $newActiviyLogUserTypeId); + $this->assertEquals($content['data']['log_type_id'], $newActiviyLogTypeId); + $this->assertEquals($content['data']['user_id'], $newUserId); $this->assertEquals($content['data']['version'], '1.0.0'); } @@ -248,9 +251,9 @@ public function test_it_can_edit_an_activity_log() 'api/v1/activity_logs', [ 'event_type' => 'test_case', - 'user_type_id' => 1, - 'log_type_id' => 1, - 'user_id' => 1, + 'user_type_id' => ActivityLogUserType::all()->random()->id, + 'log_type_id' => ActivityLogType::all()->random()->id, + 'user_id' => User::all()->random()->id, 'version' => '2.1.0', 'html' => 'something', 'plain_text' => 'something', @@ -276,14 +279,17 @@ public function test_it_can_edit_an_activity_log() $id = $content['data']; // update + $newActiviyLogUserTypeId = (int) ActivityLogUserType::all()->random()->id; + $newActiviyLogTypeId = (int) ActivityLogType::all()->random()->id; + $newUserId = (int) User::all()->random()->id; $response = $this->json( 'PUT', 'api/v1/activity_logs/' . $id, [ 'event_type' => 'updated_test_case', - 'user_type_id' => 2, - 'log_type_id' => 2, - 'user_id' => 2, + 'user_type_id' => $newActiviyLogUserTypeId, + 'log_type_id' => $newActiviyLogTypeId, + 'user_id' => $newUserId, 'version' => '1.0.0', 'html' => 'something', 'plain_text' => 'something', @@ -296,9 +302,9 @@ public function test_it_can_edit_an_activity_log() $content = $response->decodeResponseJson(); $this->assertEquals($content['data']['event_type'], 'updated_test_case'); - $this->assertEquals($content['data']['user_type_id'], 2); - $this->assertEquals($content['data']['log_type_id'], 2); - $this->assertEquals($content['data']['user_id'], 2); + $this->assertEquals($content['data']['user_type_id'], $newActiviyLogUserTypeId); + $this->assertEquals($content['data']['log_type_id'], $newActiviyLogTypeId); + $this->assertEquals($content['data']['user_id'], $newUserId); $this->assertEquals($content['data']['version'], '1.0.0'); // edit/patch @@ -316,12 +322,13 @@ public function test_it_can_edit_an_activity_log() $this->assertEquals($contentPatch1['data']['event_type'], 'updated_test_case_edit'); // edit/patch + $newActiviyLogUserTypeId = (int) ActivityLogUserType::all()->random()->id; $responsePatch2 = $this->json( 'PATCH', 'api/v1/activity_logs/' . $id, [ 'event_type' => 'updated_test_case_edit_another', - 'user_type_id' => 1, + 'user_type_id' => $newActiviyLogUserTypeId, ], $this->header, ); @@ -329,17 +336,20 @@ public function test_it_can_edit_an_activity_log() $contentPatch2 = $responsePatch2->decodeResponseJson(); $this->assertEquals($contentPatch2['data']['event_type'], 'updated_test_case_edit_another'); - $this->assertEquals($contentPatch2['data']['user_type_id'], 1); + $this->assertEquals($contentPatch2['data']['user_type_id'], $newActiviyLogUserTypeId); // edit/patch + $newActiviyLogUserTypeId = (int) ActivityLogUserType::all()->random()->id; + $newActiviyLogTypeId = (int) ActivityLogType::all()->random()->id; + $newUserId = (int) User::all()->random()->id; $responsePatch3 = $this->json( 'PATCH', 'api/v1/activity_logs/' . $id, [ 'event_type' => 'updated_test_case', - 'user_type_id' => 1, - 'log_type_id' => 1, - 'user_id' => 1, + 'user_type_id' => $newActiviyLogUserTypeId, + 'log_type_id' => $newActiviyLogTypeId, + 'user_id' => $newUserId, 'version' => '1.0.1', 'html' => 'something else', 'plain_text' => 'something else', @@ -352,9 +362,9 @@ public function test_it_can_edit_an_activity_log() $contentPatch3 = $responsePatch3->decodeResponseJson(); $this->assertEquals($contentPatch3['data']['event_type'], 'updated_test_case'); - $this->assertEquals($contentPatch3['data']['user_type_id'], 1); - $this->assertEquals($contentPatch3['data']['log_type_id'], 1); - $this->assertEquals($contentPatch3['data']['user_id'], 1); + $this->assertEquals($contentPatch3['data']['user_type_id'], $newActiviyLogUserTypeId); + $this->assertEquals($contentPatch3['data']['log_type_id'], $newActiviyLogTypeId); + $this->assertEquals($contentPatch3['data']['user_id'], $newUserId); $this->assertEquals($contentPatch3['data']['version'], '1.0.1'); $this->assertEquals($contentPatch3['data']['user_id_mongo'], 'user_id_mongo-new'); $this->assertEquals($contentPatch3['data']['version_id_mongo'], 'version_id_mongo-new'); @@ -374,9 +384,9 @@ public function test_it_can_delete_an_activity_log() 'api/v1/activity_logs', [ 'event_type' => 'test_case', - 'user_type_id' => 1, - 'log_type_id' => 1, - 'user_id' => 1, + 'user_type_id' => ActivityLogUserType::all()->random()->id, + 'log_type_id' => ActivityLogType::all()->random()->id, + 'user_id' => User::all()->random()->id, 'version' => '2.1.0', 'html' => 'something', 'plain_text' => 'something', diff --git a/tests/Feature/ActivityLogTypeTest.php b/tests/Feature/ActivityLogTypeTest.php index 612c230fe..33880b482 100644 --- a/tests/Feature/ActivityLogTypeTest.php +++ b/tests/Feature/ActivityLogTypeTest.php @@ -3,18 +3,15 @@ namespace Tests\Feature; use Config; - use Tests\TestCase; +use Tests\Traits\MockExternalApis; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\ActivityLogTypeSeeder; - -use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ActivityLogTypeTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/ActivityLogUserTypeTest.php b/tests/Feature/ActivityLogUserTypeTest.php index 658dd6440..9cc2f1508 100644 --- a/tests/Feature/ActivityLogUserTypeTest.php +++ b/tests/Feature/ActivityLogUserTypeTest.php @@ -3,18 +3,15 @@ namespace Tests\Feature; use Config; - use Tests\TestCase; +use Tests\Traits\MockExternalApis; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\ActivityLogUserTypeSeeder; - -use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ActivityLogUserTypeTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/AdminDatasetControllerTest.php b/tests/Feature/AdminDatasetControllerTest.php index c6ec84e65..6792126fd 100644 --- a/tests/Feature/AdminDatasetControllerTest.php +++ b/tests/Feature/AdminDatasetControllerTest.php @@ -2,28 +2,28 @@ namespace Tests\Feature; +use Tests\TestCase; use App\Models\Dataset; -use App\Jobs\LinkageExtraction; use App\Jobs\TermExtraction; +use App\Jobs\LinkageExtraction; use Tests\Traits\Authorization; use Tests\Traits\MockExternalApis; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Support\Facades\Queue; -use Tests\TestCase; use Database\Seeders\DatasetSeeder; -use Database\Seeders\DatasetVersionSeeder; +use Illuminate\Support\Facades\Queue; use Database\Seeders\MinimalUserSeeder; +use Database\Seeders\DatasetVersionSeeder; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class AdminDatasetControllerTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; } public const TEST_URL_DATASET = '/api/v1/datasets/admin_ctrl'; - protected function setUp(): void + public function setUp(): void { $this->commonSetUp(); $this->seed([ @@ -48,7 +48,7 @@ public function testTriggerTermExtractionWithDefaults() $this->header ); - if(config("ted.enabled")) { + if (config("ted.enabled")) { $response->assertStatus(200); // Assert: Check that the job was dispatched and response is correct @@ -74,7 +74,7 @@ public function testTriggerTermExtractionWithCustomIds() ['minId' => 3, 'maxId' => 5], $this->header ); - if(config("ted.enabled")) { + if (config("ted.enabled")) { // Assert: Check that the job was dispatched and response is correct Queue::assertPushed(TermExtraction::class); $response->assertStatus(200) @@ -106,7 +106,7 @@ public function testTriggerTermExtractionHandlesUnauthorised() //token in header for super-admin $response = $this->json('POST', self::TEST_URL_DATASET . '/trigger/term_extraction', [], $this->header); - if(config("ted.enabled")) { + if (config("ted.enabled")) { $response->assertStatus(200); } else { $response->assertStatus(500); diff --git a/tests/Feature/ApplicationTest.php b/tests/Feature/ApplicationTest.php index 891f2f8f4..341708869 100644 --- a/tests/Feature/ApplicationTest.php +++ b/tests/Feature/ApplicationTest.php @@ -3,21 +3,19 @@ namespace Tests\Feature; use Config; - use Tests\TestCase; - use App\Models\Application; - -use Database\Seeders\MinimalUserSeeder; -use Database\Seeders\ApplicationSeeder; - use Tests\Traits\MockExternalApis; +use Database\Seeders\ApplicationSeeder; +use Database\Seeders\MinimalUserSeeder; use App\Http\Traits\IntegrationOverride; use Database\Seeders\EmailTemplateSeeder; use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ApplicationTest extends TestCase { + // use FastRefreshDatabase; use RefreshDatabase; use IntegrationOverride; use MockExternalApis { diff --git a/tests/Feature/AuditLogTest.php b/tests/Feature/AuditLogTest.php index 5da671ec4..d0d445065 100644 --- a/tests/Feature/AuditLogTest.php +++ b/tests/Feature/AuditLogTest.php @@ -2,19 +2,18 @@ namespace Tests\Feature; +use App\Models\Team; use Config; - use Tests\TestCase; -use Database\Seeders\MinimalUserSeeder; -use Database\Seeders\AuditLogSeeder; - +use App\Models\User; use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Database\Seeders\AuditLogSeeder; +use Database\Seeders\MinimalUserSeeder; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class AuditLogTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } @@ -280,8 +279,8 @@ public function test_it_can_delete_an_activity_log() 'POST', self::TEST_URL, [ - 'user_id' => 1, - 'team_id' => 2, + 'user_id' => User::all()->random()->id, + 'team_id' => Team::all()->random()->id, 'action_type' => 'CREATE', 'action_name' => 'Gateway API', 'description' => 'Test audit log description', diff --git a/tests/Feature/AuthTest.php b/tests/Feature/AuthTest.php index 9f1c9ed2d..1a0708f9b 100644 --- a/tests/Feature/AuthTest.php +++ b/tests/Feature/AuthTest.php @@ -5,11 +5,11 @@ use Config; use Tests\TestCase; use Tests\Traits\Authorization; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class AuthTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; public const TEST_URL_AUTH = '/api/v1/auth'; diff --git a/tests/Feature/CategoryTest.php b/tests/Feature/CategoryTest.php index b97af2701..099322a9a 100644 --- a/tests/Feature/CategoryTest.php +++ b/tests/Feature/CategoryTest.php @@ -6,14 +6,12 @@ use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\CategorySeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class CategoryTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/CohortRequestTest.php b/tests/Feature/CohortRequestTest.php index bcfcec88e..751b6c5c0 100644 --- a/tests/Feature/CohortRequestTest.php +++ b/tests/Feature/CohortRequestTest.php @@ -14,11 +14,11 @@ use Database\Seeders\CohortRequestSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\EmailTemplateSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class CohortRequestTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/CollectionIntegrationTest.php b/tests/Feature/CollectionIntegrationTest.php index fd335cd05..8778c8d01 100644 --- a/tests/Feature/CollectionIntegrationTest.php +++ b/tests/Feature/CollectionIntegrationTest.php @@ -9,11 +9,9 @@ use App\Models\Dataset; use App\Models\Keyword; use App\Models\Collection; - use App\Models\Permission; use App\Models\Application; use App\Models\Publication; - use Database\Seeders\DurSeeder; use Database\Seeders\TagSeeder; use Tests\Traits\Authorization; @@ -32,17 +30,19 @@ use Database\Seeders\TypeCategorySeeder; use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\CollectionHasDurSeeder; +use Illuminate\Foundation\Testing\WithFaker; use Database\Seeders\CollectionHasToolSeeder; use Database\Seeders\CollectionHasUserSeeder; use Database\Seeders\CollectionHasKeywordSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\CollectionHasPublicationSeeder; use Database\Seeders\CollectionHasDatasetVersionSeeder; use Database\Seeders\PublicationHasDatasetVersionSeeder; class CollectionIntegrationTest extends TestCase { - use RefreshDatabase; + use WithFaker; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; @@ -51,6 +51,7 @@ class CollectionIntegrationTest extends TestCase public const TEST_URL = '/api/v1/integrations/collections'; protected $header = []; + protected $integration; /** * Set up the database diff --git a/tests/Feature/CollectionTeamTest.php b/tests/Feature/CollectionTeamTest.php index e7a511207..4e504abee 100644 --- a/tests/Feature/CollectionTeamTest.php +++ b/tests/Feature/CollectionTeamTest.php @@ -11,12 +11,12 @@ use App\Models\Dataset; use App\Models\Keyword; use App\Models\Collection; -use App\Models\CollectionHasUser; use App\Models\Publication; use App\Models\TeamHasUser; use Database\Seeders\DurSeeder; use Database\Seeders\TagSeeder; use Database\Seeders\ToolSeeder; +use App\Models\CollectionHasUser; use Tests\Traits\MockExternalApis; use Database\Seeders\DatasetSeeder; use Database\Seeders\KeywordSeeder; @@ -31,19 +31,20 @@ use Database\Seeders\EmailTemplateSeeder; use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\CollectionHasDurSeeder; +use Illuminate\Foundation\Testing\WithFaker; use Database\Seeders\CollectionHasToolSeeder; use Database\Seeders\CollectionHasUserSeeder; use Database\Seeders\CollectionHasKeywordSeeder; use Database\Seeders\DurHasDatasetVersionSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; - +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\CollectionHasPublicationSeeder; use Database\Seeders\CollectionHasDatasetVersionSeeder; use Database\Seeders\PublicationHasDatasetVersionSeeder; class CollectionTeamTest extends TestCase { - use RefreshDatabase; + use WithFaker; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/CustomerSatisfactionTest.php b/tests/Feature/CustomerSatisfactionTest.php index 550e3bef4..b76cc6546 100644 --- a/tests/Feature/CustomerSatisfactionTest.php +++ b/tests/Feature/CustomerSatisfactionTest.php @@ -3,12 +3,12 @@ namespace Tests\Feature; use App\Models\CustomerSatisfaction; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Tests\TestCase; class CustomerSatisfactionTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; /** * Test creating a CustomerSatisfaction entry. diff --git a/tests/Feature/DarIntegrationTest.php b/tests/Feature/DarIntegrationTest.php index 66eb9f772..154f1b4b3 100644 --- a/tests/Feature/DarIntegrationTest.php +++ b/tests/Feature/DarIntegrationTest.php @@ -2,28 +2,22 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; - use Tests\TestCase; - use App\Models\DarIntegration; use App\Models\Application; use App\Models\Permission; use App\Models\ApplicationHasPermission; - use Database\Seeders\DarIntegrationSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\ApplicationSeeder; - - -use Illuminate\Foundation\Testing\RefreshDatabase; - +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Tests\Traits\MockExternalApis; class DarIntegrationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/DataAccessApplicationTest.php b/tests/Feature/DataAccessApplicationTest.php index 47adcd6c2..3dcefa317 100644 --- a/tests/Feature/DataAccessApplicationTest.php +++ b/tests/Feature/DataAccessApplicationTest.php @@ -2,7 +2,7 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use App\Models\Team; @@ -19,16 +19,18 @@ use Database\Seeders\MinimalUserSeeder; use Database\Seeders\QuestionBankSeeder; use Database\Seeders\EmailTemplateSeeder; - - use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\SpatialCoverageSeeder; +use Illuminate\Foundation\Testing\WithFaker; use Database\Seeders\DataAccessTemplateSeeder; use Database\Seeders\DataAccessApplicationSeeder; use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DataAccessApplicationTest extends TestCase { + use WithFaker; + // use FastRefreshDatabase; use RefreshDatabase; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/DataAccessSectionTest.php b/tests/Feature/DataAccessSectionTest.php index 7fa5096f5..90d5bd4d6 100644 --- a/tests/Feature/DataAccessSectionTest.php +++ b/tests/Feature/DataAccessSectionTest.php @@ -2,20 +2,18 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\QuestionBankSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Illuminate\Support\Facades\DB; class DataAccessSectionTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/DataAccessTemplateTest.php b/tests/Feature/DataAccessTemplateTest.php index d4ed5ecc9..bbe6dd449 100644 --- a/tests/Feature/DataAccessTemplateTest.php +++ b/tests/Feature/DataAccessTemplateTest.php @@ -2,21 +2,19 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\DataAccessTemplateSeeder; use Database\Seeders\QuestionBankSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Illuminate\Support\Facades\DB; class DataAccessTemplateTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/DataProviderCollTest.php b/tests/Feature/DataProviderCollTest.php index 555d3dc93..4f67b2fcd 100644 --- a/tests/Feature/DataProviderCollTest.php +++ b/tests/Feature/DataProviderCollTest.php @@ -3,17 +3,13 @@ namespace Tests\Feature; use Tests\TestCase; - use Database\Seeders\DurSeeder; use Database\Seeders\TagSeeder; use App\Models\DataProviderColl; use Database\Seeders\TeamSeeder; use Database\Seeders\ToolSeeder; - use Tests\Traits\MockExternalApis; - use Database\Seeders\DatasetSeeder; - use Database\Seeders\KeywordSeeder; use Database\Seeders\LicenseSeeder; use ElasticClientController as ECC; @@ -27,19 +23,20 @@ use Database\Seeders\TypeCategorySeeder; use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\CollectionHasDurSeeder; +use Illuminate\Foundation\Testing\WithFaker; use Database\Seeders\CollectionHasToolSeeder; use Database\Seeders\CollectionHasUserSeeder; use Database\Seeders\DataProviderCollsSeeder; use Database\Seeders\CollectionHasKeywordSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; - +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\CollectionHasPublicationSeeder; use Database\Seeders\CollectionHasDatasetVersionSeeder; use Database\Seeders\PublicationHasDatasetVersionSeeder; class DataProviderCollTest extends TestCase { - use RefreshDatabase; + use WithFaker; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/DatasetIntegrationTest.php b/tests/Feature/DatasetIntegrationTest.php index fb3e0fcd8..7ed7bcf7d 100644 --- a/tests/Feature/DatasetIntegrationTest.php +++ b/tests/Feature/DatasetIntegrationTest.php @@ -3,9 +3,7 @@ namespace Tests\Feature; use Config; - use Tests\TestCase; - use App\Models\Dataset; use App\Models\Permission; use App\Models\Application; @@ -16,18 +14,17 @@ use Database\Seeders\SectorSeeder; use Tests\Traits\MockExternalApis; use Database\Seeders\DatasetSeeder; - use Database\Seeders\ApplicationSeeder; use Database\Seeders\MinimalUserSeeder; - use App\Models\ApplicationHasPermission; - use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Illuminate\Foundation\Testing\WithFaker; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetIntegrationTest extends TestCase { - use RefreshDatabase; + use WithFaker; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/DatasetStructuralMetadataExportTest.php b/tests/Feature/DatasetStructuralMetadataExportTest.php index b3c1e8dff..915d2f124 100644 --- a/tests/Feature/DatasetStructuralMetadataExportTest.php +++ b/tests/Feature/DatasetStructuralMetadataExportTest.php @@ -10,11 +10,11 @@ use Illuminate\Support\Facades\Storage; use Database\Seeders\SpatialCoverageSeeder; use App\Exports\DatasetStructuralMetadataExport; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetStructuralMetadataExportTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/DatasetTest.php b/tests/Feature/DatasetTest.php index aa89dc616..d83860841 100644 --- a/tests/Feature/DatasetTest.php +++ b/tests/Feature/DatasetTest.php @@ -5,22 +5,25 @@ use Config; use Tests\TestCase; use App\Models\Dataset; -use App\Models\DatasetVersion; +use App\Jobs\TermExtraction; use App\Models\NamedEntities; +use App\Models\DatasetVersion; use Illuminate\Support\Carbon; +use App\Jobs\LinkageExtraction; use Tests\Traits\Authorization; use App\Http\Enums\TeamMemberOf; use Tests\Traits\MockExternalApis; -use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Facades\Queue; use Database\Seeders\MinimalUserSeeder; +use Illuminate\Support\Facades\Storage; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Support\Facades\Queue; -use App\Jobs\LinkageExtraction; +use Illuminate\Foundation\Testing\WithFaker; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; + use WithFaker; use Authorization; use MockExternalApis { setUp as commonSetUp; @@ -34,6 +37,8 @@ class DatasetTest extends TestCase protected $metadata; protected $metadataAlt; + protected static $schemaDropped = false; + public function setUp(): void { $this->commonSetUp(); @@ -56,7 +61,7 @@ public function setUp(): void * * @return void */ - public function test_get_all_datasets_with_success(): void + public function test_v1_get_all_datasets_with_success(): void { $response = $this->json('GET', self::TEST_URL_DATASET, [], $this->header); $response->assertJsonStructure([ diff --git a/tests/Feature/DatasetVersionTest.php b/tests/Feature/DatasetVersionTest.php index 06a4cdd48..d22f2bd13 100644 --- a/tests/Feature/DatasetVersionTest.php +++ b/tests/Feature/DatasetVersionTest.php @@ -4,28 +4,28 @@ use Config; use Tests\TestCase; -use App\Models\Dataset; -use App\Models\DatasetVersion; use App\Models\Team; use App\Models\User; +use App\Models\Dataset; +use App\Models\DatasetVersion; use Tests\Traits\Authorization; -use Tests\Traits\MockExternalApis; use App\Http\Enums\TeamMemberOf; - -use Database\Seeders\TeamSeeder; use Database\Seeders\RoleSeeder; -use Database\Seeders\PermissionSeeder; -use Database\Seeders\SpatialCoverageSeeder; +use Database\Seeders\TeamSeeder; use Database\Seeders\UserSeeder; +use Tests\Traits\MockExternalApis; use Database\Seeders\DatasetSeeder; -use Database\Seeders\DatasetVersionSeeder; +use Database\Seeders\PermissionSeeder; use Database\Seeders\MinimalUserSeeder; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Database\Seeders\DatasetVersionSeeder; +use Database\Seeders\SpatialCoverageSeeder; +use Illuminate\Foundation\Testing\WithFaker; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetVersionTest extends TestCase { - use RefreshDatabase; + use WithFaker; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; @@ -36,6 +36,8 @@ class DatasetVersionTest extends TestCase public const TEST_URL_NOTIFICATION = '/api/v1/notifications'; public const TEST_URL_USER = '/api/v1/users'; + protected $metadata; + public function setUp(): void { $this->commonSetUp(); @@ -281,7 +283,7 @@ public function test_dataset_metadata_publisher_is_saved_correctly(): void $teamPid = Team::where('id', $teamId)->first()->getPid(); $publisherId = $metadata['metadata']['summary']['publisher']; - if(version_compare(Config::get('metadata.GWDM.version'), "1.1", "<")) { + if (version_compare(Config::get('metadata.GWDM.version'), "1.1", "<")) { $publisherId = $publisherId['publisherId']; $this->assertEquals( $publisherId, diff --git a/tests/Feature/DurIntegrationTest.php b/tests/Feature/DurIntegrationTest.php index 546b37c2a..592c87ba7 100644 --- a/tests/Feature/DurIntegrationTest.php +++ b/tests/Feature/DurIntegrationTest.php @@ -12,7 +12,6 @@ use App\Models\Permission; use App\Models\Application; use Database\Seeders\DurSeeder; - use Database\Seeders\TagSeeder; use Database\Seeders\ToolSeeder; use Tests\Traits\MockExternalApis; @@ -34,12 +33,12 @@ use Database\Seeders\PublicationHasToolSeeder; use Database\Seeders\ProgrammingLanguageSeeder; use Database\Seeders\DurHasDatasetVersionSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\PublicationHasDatasetVersionSeeder; class DurIntegrationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/DurTest.php b/tests/Feature/DurTest.php index e432aeb25..96f55f878 100644 --- a/tests/Feature/DurTest.php +++ b/tests/Feature/DurTest.php @@ -3,7 +3,6 @@ namespace Tests\Feature; use Config; - use App\Models\Dur; use Tests\TestCase; use App\Models\Team; @@ -37,13 +36,12 @@ use Database\Seeders\PublicationHasToolSeeder; use Database\Seeders\ProgrammingLanguageSeeder; use Database\Seeders\DurHasDatasetVersionSeeder; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\PublicationHasDatasetVersionSeeder; class DurTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } @@ -88,12 +86,13 @@ public function setUp(): void DurHasDatasetVersionSeeder::class, ]); } + /** * Get All Data Use Registers with success * * @return void */ - public function test_get_all_dur_with_success(): void + public function test_v1_get_all_dur_with_success(): void { $response = $this->json('GET', self::TEST_URL, [], $this->header); @@ -709,12 +708,19 @@ public function test_download_dur_table_with_success(): void 'notification_type' => 'applicationSubmitted', 'message' => 'Some message here', 'email' => null, - 'user_id' => 3, + 'user_id' => User::all()->random()->id, 'opt_in' => 1, 'enabled' => 1, ], $this->header, ); + + $responseNotification->assertStatus(Config::get('statuscodes.STATUS_CREATED.code')) + ->assertJsonStructure([ + 'message', + 'data', + ]); + $contentNotification = $responseNotification->decodeResponseJson(); $notificationID = $contentNotification['data']; @@ -763,7 +769,7 @@ public function test_download_dur_table_with_success(): void 'lastname' => 'Lastname', 'email' => 'firstname.lastname.123456789@test.com', 'password' => 'Passw@rd1!', - 'sector_id' => 1, + 'sector_id' => Sector::all()->random()->id, 'organisation' => 'Test Organisation', 'bio' => 'Test Biography', 'domain' => 'https://testdomain.com', @@ -818,8 +824,6 @@ public function test_download_dur_table_with_success(): void $this->header, ); - // dd($responseDownload->decodeResponseJson()); - $content = $responseDownload->streamedContent(); $this->assertMatchesRegularExpression('/Non-Gateway Datasets/', $content); } diff --git a/tests/Feature/EmailServiceTest.php b/tests/Feature/EmailServiceTest.php index 7797e2107..2b2597fef 100644 --- a/tests/Feature/EmailServiceTest.php +++ b/tests/Feature/EmailServiceTest.php @@ -3,20 +3,18 @@ namespace Tests\Feature; use Tests\TestCase; - use App\Jobs\SendEmailJob; use App\Models\EmailTemplate; use Illuminate\Support\Facades\Bus; - use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Mail; use Database\Seeders\EmailTemplateSeeder; use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class EmailServiceTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use WithFaker; public function setUp(): void @@ -30,12 +28,6 @@ public function setUp(): void Bus::fake(); } - public function tearDown(): void - { - Bus::fake(); - parent::tearDown(); - } - public function test_dispatch_email_job() { Mail::fake(); diff --git a/tests/Feature/EmailTemplateTest.php b/tests/Feature/EmailTemplateTest.php index 1f1a6ad40..ed2336bc8 100644 --- a/tests/Feature/EmailTemplateTest.php +++ b/tests/Feature/EmailTemplateTest.php @@ -5,14 +5,12 @@ use App\Models\EmailTemplate; use Tests\TestCase; use Database\Seeders\EmailTemplateSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class EmailTemplateTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/EnquiryThreadTest.php b/tests/Feature/EnquiryThreadTest.php index 5d1e4b721..d9a8b7763 100644 --- a/tests/Feature/EnquiryThreadTest.php +++ b/tests/Feature/EnquiryThreadTest.php @@ -10,15 +10,13 @@ use Database\Seeders\EnquiryThreadSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; - -use Illuminate\Foundation\Testing\RefreshDatabase; - +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Tests\TestCase; use Tests\Traits\MockExternalApis; class EnquiryThreadTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/FeatureTest.php b/tests/Feature/FeatureTest.php index 2f9a5d42c..85294f17f 100644 --- a/tests/Feature/FeatureTest.php +++ b/tests/Feature/FeatureTest.php @@ -5,15 +5,13 @@ use Config; use Tests\TestCase; use Database\Seeders\FeatureSeeder; - use Tests\Traits\MockExternalApis; - use App\Models\Feature as FeatureModel; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class FeatureTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/FederationTest.php b/tests/Feature/FederationTest.php index b50972d78..975529146 100644 --- a/tests/Feature/FederationTest.php +++ b/tests/Feature/FederationTest.php @@ -5,19 +5,17 @@ use Config; use Tests\TestCase; use App\Models\Federation; - use App\Http\Enums\TeamMemberOf; - use App\Models\TeamHasFederation; use Tests\Traits\MockExternalApis; use Database\Seeders\MinimalUserSeeder; use App\Models\FederationHasNotification; use Database\Seeders\EmailTemplateSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class FederationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/FilterTest.php b/tests/Feature/FilterTest.php index 890c4bbc9..02bc2a89c 100644 --- a/tests/Feature/FilterTest.php +++ b/tests/Feature/FilterTest.php @@ -2,17 +2,17 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Tests\Traits\MockExternalApis; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\FilterSeeder; class FilterTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/FormHydrationTest.php b/tests/Feature/FormHydrationTest.php index 229888fa4..fb74fec65 100644 --- a/tests/Feature/FormHydrationTest.php +++ b/tests/Feature/FormHydrationTest.php @@ -3,11 +3,9 @@ namespace Tests\Feature; use Config; - use Tests\TestCase; use App\Models\Team; use App\Models\Dataset; - use App\Models\DatasetVersion; use Tests\Traits\Authorization; use App\Http\Enums\TeamMemberOf; @@ -17,13 +15,12 @@ use Database\Seeders\MinimalUserSeeder; use Database\Seeders\TeamHasUserSeeder; use MetadataManagementController as MMC; - use Database\Seeders\DatasetVersionSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class FormHydrationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; protected $header = []; diff --git a/tests/Feature/HubspotTest.php b/tests/Feature/HubspotTest.php index ad4e8dc4f..1ee91efa8 100644 --- a/tests/Feature/HubspotTest.php +++ b/tests/Feature/HubspotTest.php @@ -9,7 +9,7 @@ class HubspotTest extends TestCase { - protected function setUp(): void + public function setUp(): void { parent::setUp(); diff --git a/tests/Feature/JwtControllerTest.php b/tests/Feature/JwtControllerTest.php index 62c1bbedc..bee414d3a 100644 --- a/tests/Feature/JwtControllerTest.php +++ b/tests/Feature/JwtControllerTest.php @@ -7,11 +7,11 @@ use Tests\Traits\MockExternalApis; use App\Http\Controllers\JwtController; use Database\Seeders\MinimalUserSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class JwtControllerTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/KeywordTest.php b/tests/Feature/KeywordTest.php index 65c8edbe0..0f9711c31 100644 --- a/tests/Feature/KeywordTest.php +++ b/tests/Feature/KeywordTest.php @@ -4,16 +4,14 @@ use Config; use Tests\TestCase; - use Tests\Traits\MockExternalApis; - use Database\Seeders\KeywordSeeder; use Database\Seeders\MinimalUserSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class KeywordTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/LibraryTest.php b/tests/Feature/LibraryTest.php index 22194b9ae..7f095fcfe 100644 --- a/tests/Feature/LibraryTest.php +++ b/tests/Feature/LibraryTest.php @@ -9,12 +9,12 @@ use Database\Seeders\DatasetSeeder; use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\MinimalUserSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Tests\Traits\MockExternalApis; class LibraryTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/LicenseTest.php b/tests/Feature/LicenseTest.php index c9b04bb96..1c6779de9 100644 --- a/tests/Feature/LicenseTest.php +++ b/tests/Feature/LicenseTest.php @@ -7,11 +7,11 @@ use Tests\Traits\MockExternalApis; use Database\Seeders\LicenseSeeder; use Database\Seeders\MinimalUserSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class LicenseTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/LogoutTest.php b/tests/Feature/LogoutTest.php index a1adeb0d3..270d6605c 100644 --- a/tests/Feature/LogoutTest.php +++ b/tests/Feature/LogoutTest.php @@ -4,11 +4,11 @@ use Tests\TestCase; use Tests\Traits\Authorization; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class LogoutTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; public const USERS_URL = '/api/v1/users'; diff --git a/tests/Feature/MetadataManagementTest.php b/tests/Feature/MetadataManagementTest.php index a104b2348..a4037986f 100644 --- a/tests/Feature/MetadataManagementTest.php +++ b/tests/Feature/MetadataManagementTest.php @@ -11,11 +11,11 @@ use Database\Seeders\DatasetVersionSeeder; use Tests\Traits\MockExternalApis; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class MetadataManagementTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/NotificationTest.php b/tests/Feature/NotificationTest.php index 737cfbfab..eb66a632e 100644 --- a/tests/Feature/NotificationTest.php +++ b/tests/Feature/NotificationTest.php @@ -2,19 +2,17 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\NotificationSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class NotificationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/CollectionHasDatasetVersionObserverTest.php b/tests/Feature/Observers/CollectionHasDatasetVersionObserverTest.php index fbbd53a0b..0a7c1eac4 100644 --- a/tests/Feature/Observers/CollectionHasDatasetVersionObserverTest.php +++ b/tests/Feature/Observers/CollectionHasDatasetVersionObserverTest.php @@ -12,13 +12,13 @@ use Database\Seeders\MinimalUserSeeder; use App\Models\CollectionHasDatasetVersion; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use App\Observers\CollectionHasDatasetVersionObserver; use Config; class CollectionHasDatasetVersionObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/CollectionObserverTest.php b/tests/Feature/Observers/CollectionObserverTest.php index 174ad3d08..2ef83ed9d 100644 --- a/tests/Feature/Observers/CollectionObserverTest.php +++ b/tests/Feature/Observers/CollectionObserverTest.php @@ -11,12 +11,12 @@ use App\Observers\CollectionObserver; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use ElasticClientController as ECC; class CollectionObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/DatasetObserverTest.php b/tests/Feature/Observers/DatasetObserverTest.php index 53aca6d3c..ce3cd36ff 100644 --- a/tests/Feature/Observers/DatasetObserverTest.php +++ b/tests/Feature/Observers/DatasetObserverTest.php @@ -11,11 +11,11 @@ use Tests\Traits\MockExternalApis; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/DatasetVersionObserverTest.php b/tests/Feature/Observers/DatasetVersionObserverTest.php index 78843fefe..abe5861ee 100644 --- a/tests/Feature/Observers/DatasetVersionObserverTest.php +++ b/tests/Feature/Observers/DatasetVersionObserverTest.php @@ -11,11 +11,11 @@ use Database\Seeders\MinimalUserSeeder; use App\Observers\DatasetVersionObserver; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetVersionObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/DurHasDatasetVersionObserverTest.php b/tests/Feature/Observers/DurHasDatasetVersionObserverTest.php index e8756ba16..68371177b 100644 --- a/tests/Feature/Observers/DurHasDatasetVersionObserverTest.php +++ b/tests/Feature/Observers/DurHasDatasetVersionObserverTest.php @@ -28,11 +28,11 @@ use Database\Seeders\ProgrammingPackageSeeder; use App\Observers\DurHasDatasetVersionObserver; use Database\Seeders\ProgrammingLanguageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DurHasDatasetVersionObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/DurObserverTest.php b/tests/Feature/Observers/DurObserverTest.php index 935757e12..60d41de7c 100644 --- a/tests/Feature/Observers/DurObserverTest.php +++ b/tests/Feature/Observers/DurObserverTest.php @@ -29,11 +29,11 @@ use Database\Seeders\CollectionHasUserSeeder; use Database\Seeders\ProgrammingPackageSeeder; use Database\Seeders\ProgrammingLanguageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DurObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/PublicationHasDatasetVersionObserverTest.php b/tests/Feature/Observers/PublicationHasDatasetVersionObserverTest.php index 1ab11c96d..b98c663a6 100644 --- a/tests/Feature/Observers/PublicationHasDatasetVersionObserverTest.php +++ b/tests/Feature/Observers/PublicationHasDatasetVersionObserverTest.php @@ -15,12 +15,12 @@ use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\SpatialCoverageSeeder; use App\Models\PublicationHasDatasetVersion; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use App\Observers\PublicationHasDatasetVersionObserver; class PublicationHasDatasetVersionObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/PublicationObserverTest.php b/tests/Feature/Observers/PublicationObserverTest.php index 709911362..c9772ddb4 100644 --- a/tests/Feature/Observers/PublicationObserverTest.php +++ b/tests/Feature/Observers/PublicationObserverTest.php @@ -11,11 +11,11 @@ use App\Observers\PublicationObserver; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class PublicationObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/Observers/TeamObserverTest.php b/tests/Feature/Observers/TeamObserverTest.php index 25e007d7e..ad5d263ea 100644 --- a/tests/Feature/Observers/TeamObserverTest.php +++ b/tests/Feature/Observers/TeamObserverTest.php @@ -10,11 +10,11 @@ use Tests\Traits\MockExternalApis; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class TeamObserverTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/PermissionTest.php b/tests/Feature/PermissionTest.php index 8f16642e4..f3febf3a3 100644 --- a/tests/Feature/PermissionTest.php +++ b/tests/Feature/PermissionTest.php @@ -6,14 +6,12 @@ use Tests\TestCase; use App\Models\Permission; use Database\Seeders\PermissionSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class PermissionTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/ProgrammingLanguageTest.php b/tests/Feature/ProgrammingLanguageTest.php index bb46c2117..4e886d3d1 100644 --- a/tests/Feature/ProgrammingLanguageTest.php +++ b/tests/Feature/ProgrammingLanguageTest.php @@ -2,19 +2,17 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\ProgrammingLanguageSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ProgrammingLanguageTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/ProgrammingPackageTest.php b/tests/Feature/ProgrammingPackageTest.php index 51acdfc21..d21ad92f0 100644 --- a/tests/Feature/ProgrammingPackageTest.php +++ b/tests/Feature/ProgrammingPackageTest.php @@ -2,19 +2,17 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\ProgrammingPackageSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ProgrammingPackageTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/PublicationTest.php b/tests/Feature/PublicationTest.php index 38a109f8b..1697cf7b1 100644 --- a/tests/Feature/PublicationTest.php +++ b/tests/Feature/PublicationTest.php @@ -16,19 +16,16 @@ use Database\Seeders\MinimalUserSeeder; use Database\Seeders\PublicationSeeder; use Database\Seeders\TeamHasUserSeeder; - use Database\Seeders\TypeCategorySeeder; - use Database\Seeders\DatasetVersionSeeder; - use App\Models\PublicationHasDatasetVersion; use Database\Seeders\PublicationHasToolSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\PublicationHasDatasetVersionSeeder; class PublicationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/QuestionBankTest.php b/tests/Feature/QuestionBankTest.php index 86c11fca1..9f4c319cb 100644 --- a/tests/Feature/QuestionBankTest.php +++ b/tests/Feature/QuestionBankTest.php @@ -2,7 +2,7 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use App\Models\QuestionBank; use App\Models\QuestionBankVersion; @@ -11,15 +11,13 @@ use Database\Seeders\TeamSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\QuestionBankSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Illuminate\Support\Facades\DB; class QuestionBankTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/RegisterTest.php b/tests/Feature/RegisterTest.php index 3cb5501ee..27a63fcf5 100644 --- a/tests/Feature/RegisterTest.php +++ b/tests/Feature/RegisterTest.php @@ -7,11 +7,11 @@ use App\Models\User; use Database\Seeders\SectorSeeder; use Illuminate\Support\Facades\Http; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class RegisterTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; public const TEST_URL = '/api/v1/register'; diff --git a/tests/Feature/ReviewTest.php b/tests/Feature/ReviewTest.php index 528a4c45c..03d0f5b87 100644 --- a/tests/Feature/ReviewTest.php +++ b/tests/Feature/ReviewTest.php @@ -12,17 +12,15 @@ use Tests\Traits\MockExternalApis; use Database\Seeders\LicenseSeeder; use Database\Seeders\CategorySeeder; - use Database\Seeders\MinimalUserSeeder; - use Database\Seeders\TypeCategorySeeder; use Illuminate\Foundation\Testing\WithFaker; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ReviewTest extends TestCase { use WithFaker; - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/RoleTest.php b/tests/Feature/RoleTest.php index 1548e41eb..b0ada75d4 100644 --- a/tests/Feature/RoleTest.php +++ b/tests/Feature/RoleTest.php @@ -8,14 +8,12 @@ use Database\Seeders\RoleSeeder; use App\Models\Role; use App\Models\RoleHasPermission; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class RoleTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/SavedSearchTest.php b/tests/Feature/SavedSearchTest.php index 8424bbbcb..8fdcec989 100644 --- a/tests/Feature/SavedSearchTest.php +++ b/tests/Feature/SavedSearchTest.php @@ -7,15 +7,13 @@ use Database\Seeders\FilterSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SavedSearchSeeder; - use Tests\Traits\Authorization; use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class SavedSearchTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/SearchTest.php b/tests/Feature/SearchTest.php index e4f17a209..9331907ee 100644 --- a/tests/Feature/SearchTest.php +++ b/tests/Feature/SearchTest.php @@ -32,13 +32,13 @@ use Database\Seeders\ProgrammingLanguageSeeder; use Database\Seeders\CollectionHasKeywordSeeder; use Database\Seeders\DatasetVersionHasToolSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\CollectionHasDatasetVersionSeeder; use Database\Seeders\DatasetVersionHasDatasetVersionSeeder; class SearchTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; @@ -241,7 +241,7 @@ public function test_datasets_search_with_success(): void $metadata = $response['data'][0]['metadata']; $this->assertTrue(isset($metadata['additional']['containsTissue'])); - if(version_compare(Config::get('metadata.GWDM.version'), "2.0", ">=")) { + if (version_compare(Config::get('metadata.GWDM.version'), "2.0", ">=")) { $this->assertTrue(isset($metadata['accessibility']['access']['accessServiceCategory'])); } $this->assertTrue(isset($metadata['additional']['hasTechnicalMetadata'])); diff --git a/tests/Feature/SectorTest.php b/tests/Feature/SectorTest.php index 847c205e8..b6b5db181 100644 --- a/tests/Feature/SectorTest.php +++ b/tests/Feature/SectorTest.php @@ -2,19 +2,17 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SectorSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class SectorTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/TagTest.php b/tests/Feature/TagTest.php index e80123536..b3c2aa5dc 100644 --- a/tests/Feature/TagTest.php +++ b/tests/Feature/TagTest.php @@ -5,14 +5,12 @@ use App\Models\Tag; use Tests\TestCase; use Database\Seeders\TagSeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class TagTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/TeamNotificationTest.php b/tests/Feature/TeamNotificationTest.php index f04c957d1..98fc3b03a 100644 --- a/tests/Feature/TeamNotificationTest.php +++ b/tests/Feature/TeamNotificationTest.php @@ -6,14 +6,12 @@ use Tests\TestCase; use App\Http\Enums\TeamMemberOf; use App\Models\TeamHasNotification; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class TeamNotificationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/TeamTest.php b/tests/Feature/TeamTest.php index 70f43ebab..99a631bde 100644 --- a/tests/Feature/TeamTest.php +++ b/tests/Feature/TeamTest.php @@ -2,7 +2,7 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Tests\Traits\MockExternalApis; @@ -11,12 +11,12 @@ use App\Models\Team; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use MetadataManagementController as MMC; class TeamTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/TeamUserTest.php b/tests/Feature/TeamUserTest.php index 965cb4ce4..b271fd246 100644 --- a/tests/Feature/TeamUserTest.php +++ b/tests/Feature/TeamUserTest.php @@ -12,13 +12,12 @@ use Database\Seeders\SectorSeeder; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\EmailTemplateSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; - +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Tests\Traits\MockExternalApis; class TeamUserTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis{ setUp as commonSetUp; diff --git a/tests/Feature/ToolIntegrationTest.php b/tests/Feature/ToolIntegrationTest.php index 9abe40f4c..5f87b0222 100644 --- a/tests/Feature/ToolIntegrationTest.php +++ b/tests/Feature/ToolIntegrationTest.php @@ -4,10 +4,8 @@ use Config; use Tests\TestCase; - use App\Models\Tool; use ReflectionClass; - use App\Models\License; use App\Models\Permission; use App\Models\ToolHasTag; @@ -16,7 +14,6 @@ use Database\Seeders\DurSeeder; use Database\Seeders\TagSeeder; use Database\Seeders\ToolSeeder; - use Tests\Traits\MockExternalApis; use App\Models\ToolHasTypeCategory; use Database\Seeders\DatasetSeeder; @@ -26,7 +23,6 @@ use Database\Seeders\DurHasToolSeeder; use Database\Seeders\ToolHasTagSeeder; use Database\Seeders\ApplicationSeeder; - use Database\Seeders\MinimalUserSeeder; use Database\Seeders\PublicationSeeder; use App\Models\ApplicationHasPermission; @@ -40,11 +36,11 @@ use App\Http\Controllers\Api\V1\ToolController; use Database\Seeders\ProgrammingLanguageSeeder; use Database\Seeders\PublicationHasDatasetVersionSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ToolIntegrationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/ToolTest.php b/tests/Feature/ToolTest.php index 897cc5692..9bf3cdfc3 100644 --- a/tests/Feature/ToolTest.php +++ b/tests/Feature/ToolTest.php @@ -46,13 +46,12 @@ use App\Http\Controllers\Api\V1\ToolController; use Database\Seeders\ProgrammingLanguageSeeder; use Database\Seeders\DatasetVersionHasToolSeeder; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\PublicationHasDatasetVersionSeeder; class ToolTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/TypeCategoryTest.php b/tests/Feature/TypeCategoryTest.php index 38069f2ea..2beada0cc 100644 --- a/tests/Feature/TypeCategoryTest.php +++ b/tests/Feature/TypeCategoryTest.php @@ -2,19 +2,17 @@ namespace Tests\Feature; -// use Illuminate\Foundation\Testing\RefreshDatabase; +// use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Config; use Tests\TestCase; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\TypeCategorySeeder; - use Tests\Traits\MockExternalApis; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class TypeCategoryTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/UpdateLicensesTest.php b/tests/Feature/UpdateLicensesTest.php index 4b9475e98..520c2e6cf 100644 --- a/tests/Feature/UpdateLicensesTest.php +++ b/tests/Feature/UpdateLicensesTest.php @@ -6,11 +6,11 @@ use Tests\TestCase; use Database\Seeders\LicenseSeeder; use Illuminate\Support\Facades\Http; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class UpdateLicensesTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; public function setUp(): void { diff --git a/tests/Feature/UploadTest.php b/tests/Feature/UploadTest.php index 70d755101..38032baeb 100644 --- a/tests/Feature/UploadTest.php +++ b/tests/Feature/UploadTest.php @@ -3,7 +3,6 @@ namespace Tests\Feature; use App\Models\Dur; - use Tests\TestCase; use App\Models\Team; use App\Models\Upload; @@ -12,24 +11,21 @@ use App\Models\DataAccessApplication; use App\Models\QuestionBank; use Tests\Traits\Authorization; - use Illuminate\Http\UploadedFile; use Tests\Traits\MockExternalApis; use Database\Seeders\DatasetSeeder; use Database\Seeders\CollectionSeeder; use Database\Seeders\MinimalUserSeeder; - - use Database\Seeders\DatasetVersionSeeder; use Database\Seeders\SpatialCoverageSeeder; use Database\Seeders\CollectionHasUserSeeder; use Database\Seeders\QuestionBankSeeder; use Database\Seeders\DataAccessApplicationSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class UploadTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/UserOrganisationTest.php b/tests/Feature/UserOrganisationTest.php index 7a31506b3..02b9ed129 100644 --- a/tests/Feature/UserOrganisationTest.php +++ b/tests/Feature/UserOrganisationTest.php @@ -7,11 +7,11 @@ use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SectorSeeder; use Tests\Traits\Authorization; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class UserOrganisationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; public const TEST_URL = '/api/v1/users/organisations'; diff --git a/tests/Feature/UserRoleTest.php b/tests/Feature/UserRoleTest.php index bd0716bc9..89ad783f8 100644 --- a/tests/Feature/UserRoleTest.php +++ b/tests/Feature/UserRoleTest.php @@ -8,11 +8,11 @@ use Database\Seeders\SectorSeeder; // use Illuminate\Foundation\Testing\WithFaker; use Database\Seeders\MinimalUserSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class UserRoleTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; protected $header = []; diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php index 0d9c172a9..40eee12ca 100644 --- a/tests/Feature/UserTest.php +++ b/tests/Feature/UserTest.php @@ -10,11 +10,11 @@ use Illuminate\Support\Facades\Http; // use Illuminate\Foundation\Testing\WithFaker; use Database\Seeders\MinimalUserSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class UserTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; public const TEST_URL = '/api/v1/users'; diff --git a/tests/Feature/V2/CollectionTest.php b/tests/Feature/V2/CollectionTest.php index 9ed3a8b3b..5553d8679 100644 --- a/tests/Feature/V2/CollectionTest.php +++ b/tests/Feature/V2/CollectionTest.php @@ -31,15 +31,14 @@ use Database\Seeders\CollectionHasUserSeeder; use Database\Seeders\CollectionHasKeywordSeeder; use Database\Seeders\DurHasDatasetVersionSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; - +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\CollectionHasPublicationSeeder; use Database\Seeders\CollectionHasDatasetVersionSeeder; use Database\Seeders\PublicationHasDatasetVersionSeeder; class CollectionTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/V2/DatasetTest.php b/tests/Feature/V2/DatasetTest.php index 7f32dfbd8..b217cd9fb 100644 --- a/tests/Feature/V2/DatasetTest.php +++ b/tests/Feature/V2/DatasetTest.php @@ -5,21 +5,21 @@ use Config; use Tests\TestCase; use App\Models\Dataset; -use App\Models\DatasetVersion; use App\Models\NamedEntities; +use App\Models\DatasetVersion; use Illuminate\Support\Carbon; +use App\Jobs\LinkageExtraction; use Tests\Traits\Authorization; use App\Http\Enums\TeamMemberOf; use Tests\Traits\MockExternalApis; +use Illuminate\Support\Facades\Queue; use Database\Seeders\MinimalUserSeeder; use Database\Seeders\SpatialCoverageSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Illuminate\Support\Facades\Queue; -use App\Jobs\LinkageExtraction; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class DatasetTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; @@ -41,6 +41,8 @@ class DatasetTest extends TestCase public function setUp(): void { + parent::setUp(); + $this->commonSetUp(); Dataset::flushEventListeners(); @@ -80,8 +82,9 @@ public function setUp(): void * * @return void */ - public function test_get_all_datasets_with_success(): void + public function test_v2_get_all_datasets_with_success(): void { + // $this->setUp(); $response = $this->json('GET', self::TEST_URL_DATASET_V2, [], $this->headerNonAdmin); $response->assertJsonStructure([ 'current_page', diff --git a/tests/Feature/V2/PublicationV2Test.php b/tests/Feature/V2/PublicationV2Test.php index 35b3cf515..06521be95 100644 --- a/tests/Feature/V2/PublicationV2Test.php +++ b/tests/Feature/V2/PublicationV2Test.php @@ -16,21 +16,18 @@ use Database\Seeders\LicenseSeeder; use Database\Seeders\CategorySeeder; use Database\Seeders\MinimalUserSeeder; - use Database\Seeders\PublicationSeeder; - use Database\Seeders\TeamHasUserSeeder; - use Database\Seeders\TypeCategorySeeder; use Database\Seeders\DatasetVersionSeeder; use App\Models\PublicationHasDatasetVersion; use Database\Seeders\PublicationHasToolSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\PublicationHasDatasetVersionSeeder; class PublicationV2Test extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Feature/V2/ToolV2Test.php b/tests/Feature/V2/ToolV2Test.php index 72752eb6f..b6ec2fe86 100644 --- a/tests/Feature/V2/ToolV2Test.php +++ b/tests/Feature/V2/ToolV2Test.php @@ -46,15 +46,14 @@ use Database\Seeders\ProgrammingPackageSeeder; use Database\Seeders\PublicationHasToolSeeder; use App\Http\Controllers\Api\V1\ToolController; - use Database\Seeders\ProgrammingLanguageSeeder; use Database\Seeders\DatasetVersionHasToolSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; use Database\Seeders\PublicationHasDatasetVersionSeeder; class ToolV2Test extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; use MockExternalApis { setUp as commonSetUp; diff --git a/tests/Feature/ValidationTest.php b/tests/Feature/ValidationTest.php index 86aaddd4f..96ca431a6 100644 --- a/tests/Feature/ValidationTest.php +++ b/tests/Feature/ValidationTest.php @@ -4,11 +4,11 @@ use Tests\TestCase; use Tests\Traits\Authorization; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ValidationTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; public const TEST_URL = '/api/v1/features'; diff --git a/tests/TestCase.php b/tests/TestCase.php index 2932d4a69..adc1dbb75 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,9 +2,19 @@ namespace Tests; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Bus; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { use CreatesApplication; + + + public function tearDown(): void + { + Bus::fake(); + DB::rollBack(); + parent::tearDown(); + } } diff --git a/tests/Traits/MockExternalApis.php b/tests/Traits/MockExternalApis.php index bf4d0161b..2e90eb6de 100644 --- a/tests/Traits/MockExternalApis.php +++ b/tests/Traits/MockExternalApis.php @@ -5,15 +5,12 @@ use Config; use Http\Mock\Client; use Nyholm\Psr7\Response; - - -use Database\Seeders\SectorSeeder; -use App\Jobs\LinkageExtraction; use App\Jobs\TermExtraction; - -use Illuminate\Support\Facades\Queue; +use App\Jobs\LinkageExtraction; +use Database\Seeders\SectorSeeder; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Mail; +use Illuminate\Support\Facades\Queue; use MetadataManagementController as MMC; trait MockExternalApis @@ -1129,7 +1126,7 @@ public function setUp(): void $metadata = json_decode($dataset, true)["metadata"]; //mock translating alternative schemas via traser - just give it a new GWDM metadata - if(!array_key_exists("required", $metadata) || (!is_null($inputSchema) && $inputSchema !== 'GWDM')) { + if (!array_key_exists("required", $metadata) || (!is_null($inputSchema) && $inputSchema !== 'GWDM')) { $metadata = $this->getMetadata(); } return [ diff --git a/tests/Unit/AliasReplyScannerTest.php b/tests/Unit/AliasReplyScannerTest.php index cec1cd87a..ac8e770bd 100644 --- a/tests/Unit/AliasReplyScannerTest.php +++ b/tests/Unit/AliasReplyScannerTest.php @@ -7,7 +7,6 @@ use Tests\TestCase; use App\Models\Role; use App\Models\Team; - use Webklex\PHPIMAP\Message; use AliasReplyScanner as ARS; use App\Models\EnquiryThread; @@ -16,24 +15,19 @@ use Database\Seeders\TeamSeeder; use Database\Seeders\UserSeeder; use Tests\Traits\MockExternalApis; - - use Database\Seeders\PermissionSeeder; - use Database\Seeders\TeamHasUserSeeder; -use Database\Seeders\EnquiryThreadSeeder; use Database\Seeders\EmailTemplateSeeder; +use Database\Seeders\EnquiryThreadSeeder; use Database\Seeders\EnquiryMessageSeeder; use Database\Seeders\TeamUserHasRoleSeeder; - - use App\Exceptions\AliasReplyScannerException; use Webklex\PHPIMAP\Support\MessageCollection; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class AliasReplyScannerTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; @@ -108,6 +102,7 @@ public function test_it_can_get_find_a_thread_from_an_alias(): void $this->assertSame(array_keys($response->toArray()), [ 'id', 'user_id', + 'team_ids', 'project_title', 'unique_key', 'is_dar_dialogue', @@ -116,7 +111,6 @@ public function test_it_can_get_find_a_thread_from_an_alias(): void 'is_general_enquiry', 'is_feasibility_enquiry', 'is_dar_review', - 'team_ids', ]); $this->assertEquals($response->id, $thread->id); diff --git a/tests/Unit/CohortUserExpiryTest.php b/tests/Unit/CohortUserExpiryTest.php index f128d31dc..a164581ea 100644 --- a/tests/Unit/CohortUserExpiryTest.php +++ b/tests/Unit/CohortUserExpiryTest.php @@ -3,22 +3,20 @@ namespace Tests\Unit; use Tests\TestCase; - use App\Models\Permission; use App\Models\CohortRequest; use Illuminate\Support\Carbon; use Tests\Traits\MockExternalApis; use Illuminate\Support\Facades\Mail; - use Database\Seeders\PermissionSeeder; use Database\Seeders\MinimalUserSeeder; -use App\Models\CohortRequestHasPermission; use Database\Seeders\EmailTemplateSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use App\Models\CohortRequestHasPermission; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class CohortUserExpiryTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MockExternalApis { setUp as commonSetUp; } diff --git a/tests/Unit/EmailServiceTest.php b/tests/Unit/EmailServiceTest.php index fba55c28e..7ffa7f10f 100644 --- a/tests/Unit/EmailServiceTest.php +++ b/tests/Unit/EmailServiceTest.php @@ -3,16 +3,15 @@ namespace Tests\Unit; use App\Mail\Email; -use App\Models\EmailTemplate; - use Tests\TestCase; -use Database\Seeders\EmailTemplateSeeder; -use Illuminate\Foundation\Testing\RefreshDatabase; +use App\Models\EmailTemplate; use Illuminate\Support\Facades\Http; +use Database\Seeders\EmailTemplateSeeder; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class EmailServiceTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; public function setUp(): void { diff --git a/tests/Unit/EnquiriesManagementControllerTest.php b/tests/Unit/EnquiriesManagementControllerTest.php index 0500fddc8..76444af18 100644 --- a/tests/Unit/EnquiriesManagementControllerTest.php +++ b/tests/Unit/EnquiriesManagementControllerTest.php @@ -2,22 +2,19 @@ namespace Tests\Unit; -use EnquiriesManagementController as EMC; - use Tests\TestCase; - +use App\Models\Role; use App\Models\Team; use App\Models\User; -use App\Models\Role; use App\Models\TeamHasUser; use App\Models\TeamUserHasRole; use Database\Seeders\MinimalUserSeeder; - -use Illuminate\Foundation\Testing\RefreshDatabase; +use EnquiriesManagementController as EMC; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class EnquiriesManagementControllerTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; public function setUp(): void { diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php index f5c1ed796..634da1d3a 100644 --- a/tests/Unit/ExampleTest.php +++ b/tests/Unit/ExampleTest.php @@ -4,11 +4,11 @@ use Tests\TestCase; use Tests\Traits\Authorization; -use Illuminate\Foundation\Testing\RefreshDatabase; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class ExampleTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use Authorization; public function setUp(): void diff --git a/tests/Unit/MetadataRelationshipTest.php b/tests/Unit/MetadataRelationshipTest.php index df8245b86..11b218c47 100644 --- a/tests/Unit/MetadataRelationshipTest.php +++ b/tests/Unit/MetadataRelationshipTest.php @@ -2,25 +2,22 @@ namespace Tests\Unit; +use Tests\TestCase; use App\Models\Dataset; use App\Models\DatasetVersion; -use App\Models\DatasetVersionHasDatasetVersion; - use Database\Seeders\RoleSeeder; use Database\Seeders\TeamSeeder; use Database\Seeders\UserSeeder; use Database\Seeders\PermissionSeeder; +use App\Http\Traits\MetadataVersioning; use Database\Seeders\TeamHasUserSeeder; use Database\Seeders\TeamUserHasRoleSeeder; - -use Tests\TestCase; -use Illuminate\Foundation\Testing\RefreshDatabase; - -use App\Http\Traits\MetadataVersioning; +use App\Models\DatasetVersionHasDatasetVersion; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class MetadataRelationshipTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; use MetadataVersioning; public function setUp(): void diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php index b082db9dd..54dfcdbb1 100644 --- a/tests/Unit/UserTest.php +++ b/tests/Unit/UserTest.php @@ -2,14 +2,13 @@ namespace Tests\Unit; -use App\Models\User; - use Tests\TestCase; -use Illuminate\Foundation\Testing\RefreshDatabase; +use App\Models\User; +use Plannr\Laravel\FastRefreshDatabase\Traits\FastRefreshDatabase; class UserTest extends TestCase { - use RefreshDatabase; + use FastRefreshDatabase; public function test_that_user_emails_are_unique() {