Created a class for opening a file resource

NdoleStudio · Oct 30, 2018 · cf82fa9 · cf82fa9
1 parent 58f8b3e
commit cf82fa9
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 33 deletions.
diff --git a/app/Jobs/TranscribeAudioFile.php b/app/Jobs/TranscribeAudioFile.php
@@ -3,14 +3,13 @@
 namespace App\Jobs;
 
 use App\Configurations\IbmWatsonConfiguration;
+use App\Services\FileOpenerService;
 use App\Traits\InteractsWithLocalFileSystem;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Bus\Dispatcher;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\Request;
 use Illuminate\Queue\InteractsWithQueue;
@@ -45,17 +44,16 @@ public function __construct(string $oldFilename, string $filename)
     /**
      * @param IbmWatsonConfiguration $ibmWatsonConfiguration
      * @param Client                 $httpClient
-     * @param FilesystemManager      $filesystemManager
      * @param Dispatcher             $commandDispatcher
+     * @param FileOpenerService      $fileOpenerService
      *
-     * @throws FileNotFoundException
      * @throws GuzzleException
      */
     public function handle(
         IbmWatsonConfiguration $ibmWatsonConfiguration,
         Client $httpClient,
-        FilesystemManager $filesystemManager,
-        Dispatcher $commandDispatcher
+        Dispatcher $commandDispatcher,
+        FileOpenerService $fileOpenerService
     ) {
         $response = $httpClient->request(
             Request::METHOD_POST,
@@ -68,7 +66,7 @@ public function handle(
                 'headers' => [
                     'Content-Type' => 'audio/flac',
                 ],
-                'body' => $filesystemManager->disk()->get($this->getFilePath($this->filename)),
+                'body' => $fileOpenerService->openForReading($this->getFilePath($this->filename)),
             ]
         );
 

diff --git a/app/Services/FileOpenerService.php b/app/Services/FileOpenerService.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Services;
+
+class FileOpenerService
+{
+    /**
+     * @param string $filename
+     *
+     * @return bool|resource
+     */
+    public function openForReading($filename)
+    {
+        return \fopen($filename, 'r');
+    }
+}
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Unit/Jobs/TranscribeAudioFileTest.php b/tests/Unit/Jobs/TranscribeAudioFileTest.php
@@ -5,10 +5,9 @@
 use App\Configurations\IbmWatsonConfiguration;
 use App\Jobs\ProcessTranscribedText;
 use App\Jobs\TranscribeAudioFile;
+use App\Services\FileOpenerService;
 use GuzzleHttp\Client;
 use Illuminate\Bus\Dispatcher;
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Http\Response;
 use PHPUnit_Framework_MockObject_MockObject;
 use Psr\Http\Message\MessageInterface;
@@ -40,28 +39,23 @@ class TranscribeAudioFileTest extends TestCase
      */
     private $httpClient;
 
-    /**
-     * @var FilesystemManager|PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fileSystemManager;
-
-    /**
-     * @var Filesystem|PHPUnit_Framework_MockObject_MockObject
-     */
-    private $filesystem;
-
     /**
      * @var Dispatcher|PHPUnit_Framework_MockObject_MockObject
      */
     private $commandDispatcher;
 
     /**
-     * @var StreamInterface
+     * @var StreamInterface|PHPUnit_Framework_MockObject_MockObject
      */
     private $streamInterface;
 
     /**
-     * @var Response
+     * @var FileOpenerService|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileOpenerService;
+
+    /**
+     * @var Response|PHPUnit_Framework_MockObject_MockObject
      */
     private $httpMessage;
 
@@ -74,8 +68,6 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->filesystem = $this->getMockForConcreteClass(Filesystem::class);
-
         $this->streamInterface = $this->getMockForConcreteClass(StreamInterface::class);
         $this->streamInterface
             ->method($this->methodName([$this->streamInterface, 'getContents']))
@@ -88,12 +80,9 @@ protected function setUp()
 
         $this->ibmWatsonConfiguration = $this->getMockForConcreteClass(IbmWatsonConfiguration::class);
 
-        $this->httpClient = $this->getMockForConcreteClass(Client::class);
+        $this->fileOpenerService = $this->getMockForConcreteClass(FileOpenerService::class);
 
-        $this->fileSystemManager = $this->getMockForConcreteClass(FilesystemManager::class);
-        $this->fileSystemManager
-            ->method($this->methodName([$this->fileSystemManager, 'disk']))
-            ->willReturn($this->filesystem);
+        $this->httpClient = $this->getMockForConcreteClass(Client::class);
 
         $this->commandDispatcher = $this->getMockForConcreteClass(Dispatcher::class);
 
@@ -110,8 +99,8 @@ public function test_that_the_command_transcribes_a_file_using_the_ibm_watson_co
         $this->SUT->handle(
             $this->ibmWatsonConfiguration,
             $this->httpClient,
-            $this->fileSystemManager,
-            $this->commandDispatcher
+            $this->commandDispatcher,
+            $this->fileOpenerService
         );
     }
 
@@ -129,8 +118,8 @@ public function test_that_the_command_calls_the_process_transcribed_text_command
         $this->SUT->handle(
             $this->ibmWatsonConfiguration,
             $this->httpClient,
-            $this->fileSystemManager,
-            $this->commandDispatcher
+            $this->commandDispatcher,
+            $this->fileOpenerService
         );
     }
 }