Fix seed imports

Author: DaneEveritt

app/Services/Eggs/Sharing/EggImporterService.php

@@ -76,7 +76,16 @@ public function __construct(
     public function handle(UploadedFile $file, int $nest): Egg
     {
         if ($file->getError() !== UPLOAD_ERR_OK || ! $file->isFile()) {
-            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
+            throw new InvalidFileUploadException(
+                sprintf(
+                    'The selected file ["%s"] was not in a valid format to import. (is_file: %s is_valid: %s err_code: %s err: %s)',
+                    $file->getFilename(),
+                    $file->isFile() ? 'true' : 'false',
+                    $file->isValid() ? 'true' : 'false',
+                    $file->getError(),
+                    $file->getErrorMessage()
+                )
+            );
         }
 
         $parsed = json_decode($file->openFile()->fread($file->getSize()));

app/Services/Eggs/Sharing/EggUpdateImporterService.php

@@ -57,7 +57,16 @@ public function __construct(
     public function handle(int $egg, UploadedFile $file)
     {
         if ($file->getError() !== UPLOAD_ERR_OK || ! $file->isFile()) {
-            throw new InvalidFileUploadException(trans('exceptions.nest.importer.file_error'));
+            throw new InvalidFileUploadException(
+                sprintf(
+                    'The selected file ["%s"] was not in a valid format to import. (is_file: %s is_valid: %s err_code: %s err: %s)',
+                    $file->getFilename(),
+                    $file->isFile() ? 'true' : 'false',
+                    $file->isValid() ? 'true' : 'false',
+                    $file->getError(),
+                    $file->getErrorMessage()
+                )
+            );
         }
 
         $parsed = json_decode($file->openFile()->fread($file->getSize()));

database/seeds/EggSeeder.php

@@ -112,14 +112,15 @@ private function parseEggFiles(Nest $nest)
         $files = $this->filesystem->allFiles(database_path('seeds/eggs/' . kebab_case($nest->name)));
 
         $this->command->alert('Updating Eggs for Nest: ' . $nest->name);
-        collect($files)->each(function ($file) use ($nest) {
+        Collection::make($files)->each(function ($file) use ($nest) {
             /* @var \Symfony\Component\Finder\SplFileInfo $file */
             $decoded = json_decode($file->getContents());
             if (json_last_error() !== JSON_ERROR_NONE) {
-                return $this->command->error('JSON decode exception for ' . $file->getFilename() . ': ' . json_last_error_msg());
+                $this->command->error('JSON decode exception for ' . $file->getFilename() . ': ' . json_last_error_msg());
+                return;
             }
 
-            $file = new UploadedFile($file->getPathname(), $file->getFilename(), 'application/json', $file->getSize());
+            $file = new UploadedFile($file->getPathname(), $file->getFilename(), 'application/json');
 
             try {
                 $egg = $this->repository->setColumns('id')->findFirstWhere([
@@ -130,11 +131,11 @@ private function parseEggFiles(Nest $nest)
 
                 $this->updateImporterService->handle($egg->id, $file);
 
-                return $this->command->info('Updated ' . $decoded->name);
+                $this->command->info('Updated ' . $decoded->name);
             } catch (RecordNotFoundException $exception) {
                 $this->importerService->handle($file, $nest->id);
 
-                return $this->command->comment('Created ' . $decoded->name);
+                $this->command->comment('Created ' . $decoded->name);
             }
         });