Merge pull request #10 from kumasakatakashi/added-service-provider

Added service provider
kumasakatakashi · Jun 25, 2019 · e8e0d6e · e8e0d6e
2 parents 4fe211c + d8dd962
commit e8e0d6e
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 12 deletions.
diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
@@ -6,10 +6,20 @@
 use Illuminate\Support\Facades\Storage;
 use App\Http\Requests\UploadImageRequest;
 use App\Http\Requests\DetectImageRequest;
-use App\Support\Api\GoogleVisionApi;
+use App\Services\OcrService;
 
 class ImageController extends Controller
 {
+    /**
+     * @var App\Services\OcrServiceContract
+     */
+    protected $ocrService;
+
+    public function __construct(OcrService $ocrService)
+    {
+        $this->ocrService = $ocrService;
+    }
+
     public function index()
     {
         return view('image.index');
@@ -38,9 +48,8 @@ public function detect(DetectImageRequest $request)
     {
         $filepath = $request->input('filepath');
 
-        // OCR実行 by GoogleVisionAPI
-        $api = new GoogleVisionApi();
-        $text = $api->document_text_detection($filepath);
+        // OCR実行
+        $text = $this->ocrService->detect($filepath);
 
         return view('image.index')->with([
             'filepath' => $filepath,

diff --git a/app/Providers/ServiceBindServiceProvider.php b/app/Providers/ServiceBindServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class ServiceBindServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->singleton(
+            \App\Services\OcrService::class,
+            \App\Services\Impl\OcrServiceViaGoogle::class
+        );
+    }
+
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+}
diff --git a/app/Services/Impl/OcrServiceViaGoogle.php b/app/Services/Impl/OcrServiceViaGoogle.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Services\Impl;
+
+use App\Services\OcrService;
+use App\Support\Api\GoogleVisionApi;
+
+class OcrServiceViaGoogle implements OcrService
+{
+    /**
+     * @var App\Support\Api\GoogleVisionApi
+     */
+    private $api;
+
+    public function __construct() {
+        $this->api = new GoogleVisionApi();
+    }
+
+    /**
+     * 
+     * @see App\Services\OcrServiceContract
+     * @param string $image_path
+     * @return string result_text
+     */
+    public function detect(string $image_path) {
+        $text = $this->api->document_text_detection($image_path);
+        return $text;
+    }
+}
diff --git a/app/Services/OcrService.php b/app/Services/OcrService.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Services;
+
+interface OcrService
+{
+    public function detect(string $image_path);
+}
diff --git a/config/app.php b/config/app.php
@@ -176,6 +176,7 @@
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
+        App\Providers\ServiceBindServiceProvider::class,
     ],
 
     /*

diff --git a/tests/Http/Controllers/ImageControllerTest.php b/tests/Http/Controllers/ImageControllerTest.php
@@ -41,15 +41,16 @@ public function testUpload()
     public function testDetect()
     {
         // テスト用にValidator(ファイル存在チェック)をモック化
+        // inputの結果をstringで何かしら値を返す必要がある。
+        // detectメソッドのタイプヒンティングに
+        // stringを指定しており、nullが渡るとエラーになるため
         $mock_request = m::mock('overload:\App\Http\Requests\DetectImageRequest');
-        $mock_request->shouldReceive('input')
-                ->once();
-
-        $mock_googleapi = m::mock('overload:\App\Support\Api\GoogleVisionApi');
-        $mock_googleapi->shouldReceive('document_text_detection')
-                ->once()
-                ->with(\Mockery::any())
-                ->andReturn('test');
+        $mock_request->shouldReceive('input')->once()->andReturn('/path/test.jpg');
+
+        // ダミーのサービスクラスへ切り替え
+        \App::singleton(\App\Services\OcrService::class, function (){
+            return new OcrServiceDummy();
+        });
 
         $response = $this->post('detect', [
             'filepath' => '/path/to/test.jpg',
@@ -60,3 +61,10 @@ public function testDetect()
         $response->assertViewHas('result_text');
     }
 }
+
+class OcrServiceDummy implements \App\Services\OcrService
+{
+    public function detect(string $image_path) {
+        return 'ダミーです';
+    }
+}