Merge 5b3aa90 into 0e4e8b4

app/Console/Kernel.php

@@ -26,7 +26,6 @@ class Kernel extends ConsoleKernel
         \Ushahidi\Console\Command\ApikeySet::class,
         \Ushahidi\Console\Command\ConfigSet::class,
         \Ushahidi\Console\Command\ConfigGet::class,
-        \Ushahidi\Console\Command\Import::class,
         \Ushahidi\Console\Command\UserCreate::class,
         \Ushahidi\Console\Command\UserDelete::class,
         \Ushahidi\Console\Command\Notification::class,

app/Http/Controllers/API/CSV/CSVController.php

@@ -3,6 +3,7 @@
 namespace Ushahidi\App\Http\Controllers\API\CSV;
 
 use Ushahidi\App\Http\Controllers\API\MediaController;
+use Illuminate\Http\Request;
 
 /**
  * Ushahidi API CSV Controller
@@ -18,4 +19,21 @@ protected function getResource()
     {
         return 'csv';
     }
+
+    public function import(Request $request)
+    {
+        /**
+         * Step two of import.
+         * Support all line endings without manually specifying it
+         * (primarily added because of OS9 line endings which do not work by default )
+         */
+        ini_set('auto_detect_line_endings', 1);
+
+        $this->usecase = $this->usecaseFactory
+            ->get($this->getResource(), 'import')
+            ->setIdentifiers($this->getRouteParams($request));
+            ;
+
+        return $this->prepResponse($this->executeUsecase($request), $request);
+    }
 }

app/Jobs/ImportPostsJob.php

@@ -0,0 +1,34 @@
+<?php
+ namespace Ushahidi\App\Jobs;
+
+use Ushahidi\Core\Usecase\CSV\ImportCSVPostsUsecase;
+use Ushahidi\Core\Entity\ExportJob;
+use Ushahidi\Core\Entity\ExportJobRepository;
+use Illuminate\Support\Facades\Log;
+
+class ImportPostsJob extends Job
+{
+    protected $csvId;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($csvId)
+    {
+        $this->csvId = $csvId;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle(ImportCSVPostsUsecase $usecase)
+    {
+        $usecase->setIdentifiers(['id' => $this->csvId]);
+
+        $results = $usecase->interact();
+    }
+}

app/Providers/AppServiceProvider.php

@@ -84,6 +84,11 @@ public function registerServicesFromAura()
             return service('tool.verifier');
         });
 
+        $this->app->singleton(\Ushahidi\Core\Usecase\CSV\ImportCSVPostsUsecase::class, function ($app) {
+            // Just return it from AuraDI
+            return service('usecase.csv.importposts');
+        });
+
         $this->app->singleton(\Ushahidi\Core\Usecase\Export\Job\PostCount::class, function ($app) {
             return service('factory.usecase')
                     // Override action

composer.json

@@ -33,8 +33,6 @@
         "ext-mbstring": "*",
         "league/csv": "~7.1@dev",
         "laravel/lumen-framework": "5.5.*",
-        "ddeboer/data-import": "dev-master",
-        "symfony/property-access": "~2.5",
         "league/event": "^2.2@dev",
         "beheh/flaps": "dev-master",
         "doctrine/cache": "^1.6.2",

routes/csv.php

@@ -10,5 +10,5 @@
         'middleware' => ['auth:api', 'scope:csv', 'expiration']
     ]);
 
-    $router->post('/{id}/import', 'CSVImportController@store');
+    $router->post('/{id}/import', 'CSVController@import');
 });

src/App/AppConfig.php

@@ -178,7 +178,6 @@ public function define(Container $di)
         $di->params['Ushahidi\Factory\ValidatorFactory']['map']['posts'] = [
             'create' => $di->lazyNew(\Ushahidi\App\Validator\Post\Create::class),
             'update' => $di->lazyNew(\Ushahidi\App\Validator\Post\Update::class),
-            'import' => $di->lazyNew(\Ushahidi\App\Validator\Post\Import::class),
             'export' => $di->lazyNew(\Ushahidi\App\Validator\Post\Export::class),
             'webhook-update' => $di->lazyNew(\Ushahidi\App\Validator\Post\Create::class),
         ];
@@ -753,7 +752,6 @@ public function define(Container $di)
             'repo' => $di->lazyGet('repository.post')
         ];
 
-        $di->set('transformer.mapping', $di->lazyNew(\Ushahidi\App\Transformer\MappingTransformer::class));
         $di->set('transformer.csv', $di->lazyNew(\Ushahidi\App\Transformer\CSVPostTransformer::class));
         // Post repo for mapping transformer
         $di->setters[\Ushahidi\App\Transformer\CSVPostTransformer::class]['setRepo'] =
@@ -800,9 +798,6 @@ public function define(Container $di)
         // Add Lock Listener
         $di->setters[\Ushahidi\App\Repository\Post\LockRepository::class]['setEvent'] = 'LockBroken';
 
-        $di->setters[\Ushahidi\Core\Usecase\ImportUsecase::class]['setEvent'] = 'ImportPosts';
-        $di->setters[\Ushahidi\Core\Usecase\ImportUsecase::class]['setListener'] =
-            $di->lazyNew(\Ushahidi\App\Listener\Import::class);
         /**
          * HXL block
          */