ladybirdweb / import-export

tests/ImportTest.php

Indentation +98 added lines, -98 removed lines

@@ -15,54 +15,54 @@ 
 
 class ImportTest extends TestCase
 {
-	use RefreshDatabase;
+    use RefreshDatabase;
 
-	protected $import;
+    protected $import;
 
-	protected function setUp ()
-	{
-	    parent::setUp();
+    protected function setUp ()
+    {
+        parent::setUp();
 
-	    Route::middleware('web')->group(function() {
+        Route::middleware('web')->group(function() {
 
-		    Route::get('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@showImportForm'] );
-		    Route::post('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@uploadImportFile'] );
+            Route::get('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@showImportForm'] );
+            Route::post('ticket/import', ['as' => 'ticket.import', 'uses' => 'Ladybirdweb\ImportExport\Import@uploadImportFile'] );
 
-			Route::get('/ticket/import/{id}/map', [ 'as' => 'ticket.import.show.map', 'uses' => 'Ladybirdweb\ImportExport\Import@showColumnsMapForm']);
-			Route::post('/ticket/import/{id}', [ 'as' => 'ticket.import.map', 'uses' => 'Ladybirdweb\ImportExport\Import@storeColumnsMap']);
+            Route::get('/ticket/import/{id}/map', [ 'as' => 'ticket.import.show.map', 'uses' => 'Ladybirdweb\ImportExport\Import@showColumnsMapForm']);
+            Route::post('/ticket/import/{id}', [ 'as' => 'ticket.import.map', 'uses' => 'Ladybirdweb\ImportExport\Import@storeColumnsMap']);
 
-			Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
+            Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']);
 
-		});
+        });
 
-		Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv');
+        Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv');
 
-		$this->import = ModelImport::create([
-			'file' => 'imports/test.csv',
-			'file_rows' => 104,
-			'db_cols' => [ 'name', 'email', 'password'],
-			'model_map' => ['email', 'name', 'password']
-		]);
-	}
+        $this->import = ModelImport::create([
+            'file' => 'imports/test.csv',
+            'file_rows' => 104,
+            'db_cols' => [ 'name', 'email', 'password'],
+            'model_map' => ['email', 'name', 'password']
+        ]);
+    }
 
-	/**
-	* @test
-	*/
-	public function see_import_form()
-	{
-		Import::setUploadRoute('ticket.import');
+    /**
+     * @test
+     */
+    public function see_import_form()
+    {
+        Import::setUploadRoute('ticket.import');
 
-		$response = $this->get('ticket/import');
+        $response = $this->get('ticket/import');
 
-		$response->assertSee( 'importer' );
-	}
+        $response->assertSee( 'importer' );
+    }
 
-	/**
-	* @test
-	*/
-	public function try_file_upload()
-	{
-		Storage::fake('file');
+    /**
+     * @test
+     */
+    public function try_file_upload()
+    {
+        Storage::fake('file');
 
         $response = $this->json( 'POST', '/ticket/import', [
             'file' => UploadedFile::fake()->create('file.csv', 100)
@@ -71,14 +71,14 @@ 
         $response->assertStatus(200);
 
         $response->assertJsonFragment( ['status' => 'ready'] );
-	}
+    }
 
-	/**
-	* @test
-	*/
-	public function fail_file_upload()
-	{
-		Storage::fake('file');
+    /**
+     * @test
+     */
+    public function fail_file_upload()
+    {
+        Storage::fake('file');
 
         $response = $this->json( 'POST', '/ticket/import', [
             'file' => UploadedFile::fake()->image('file.jpg')
@@ -89,81 +89,81 @@ 
         $response->assertJsonFragment( ['status' => 'failed'] );
 
         $this->assertArrayHasKey( 'errors', Import::getImportErrors() );
-	}
+    }
 
-	/**
-	* @test
-	*/
-	public function map_data_with_csv_cols()
-	{
-		Import::setImportMapRoute('ticket.import.map');
+    /**
+     * @test
+     */
+    public function map_data_with_csv_cols()
+    {
+        Import::setImportMapRoute('ticket.import.map');
 
-		$id = $this->import->id;
+        $id = $this->import->id;
 
-		$response = $this->get('/ticket/import/' . $id . '/map');
+        $response = $this->get('/ticket/import/' . $id . '/map');
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertSee( 'Confirm Import' );
-	}
+        $response->assertSee( 'Confirm Import' );
+    }
 
-	/**
-	* @test
-	*/
-	public function store_data_map_with_csv_cols()
-	{
-		$id = $this->import->id;
+    /**
+     * @test
+     */
+    public function store_data_map_with_csv_cols()
+    {
+        $id = $this->import->id;
 
-		$response = $this->post( '/ticket/import/' . $id, [
-			'db_column' => ['email', 'name', 'password']
-		] );
+        $response = $this->post( '/ticket/import/' . $id, [
+            'db_column' => ['email', 'name', 'password']
+        ] );
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertSessionMissing( 'errors' );
-	}
+        $response->assertSessionMissing( 'errors' );
+    }
 
-	/**
-	* @test
-	*/
-	public function store_data_map_with_csv_cols_failed_validation()
-	{
-		$id = $this->import->id;
+    /**
+     * @test
+     */
+    public function store_data_map_with_csv_cols_failed_validation()
+    {
+        $id = $this->import->id;
 
-		$response = $this->post( '/ticket/import/' . $id, [
-			'db_column' => ['name', 'name', 'name']
-		] );
+        $response = $this->post( '/ticket/import/' . $id, [
+            'db_column' => ['name', 'name', 'name']
+        ] );
 
-		$response->assertStatus(302);
+        $response->assertStatus(302);
 
-		$response->assertSessionHas( 'errors' );
-	}
+        $response->assertSessionHas( 'errors' );
+    }
 
-	/**
-	* @test
-	*/
-	public function sucess_to_dispatch_given_job_class()
-	{
-		$import = $id = $this->import;
+    /**
+     * @test
+     */
+    public function sucess_to_dispatch_given_job_class()
+    {
+        $import = $id = $this->import;
 
-		Queue::fake();
+        Queue::fake();
 
-		Import::dispatchImportJob( FakeJob::class, $import );
+        Import::dispatchImportJob( FakeJob::class, $import );
 
-		Queue::assertPushedOn('importing', FakeJob::class);
-	}
+        Queue::assertPushedOn('importing', FakeJob::class);
+    }
 
-	/**
-	* @test
-	*/
-	public function check_import_progress()
-	{
-		$response = $this->json( 'GET', '/import/1/progress' );
+    /**
+     * @test
+     */
+    public function check_import_progress()
+    {
+        $response = $this->json( 'GET', '/import/1/progress' );
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertJsonFragment( ['status' => 200] );
+        $response->assertJsonFragment( ['status' => 200] );
 
-		$response->assertJsonFragment( ['progress'] );
-	}
+        $response->assertJsonFragment( ['progress'] );
+    }
 }

tests/ExportTest.php

Indentation +62 added lines, -62 removed lines

@@ -16,90 +16,90 @@
 
 class ExportTest extends TestCase
 {
-	use RefreshDatabase;
+    use RefreshDatabase;
 
-	protected $export;
+    protected $export;
 
-	protected function setUp ()
-	{
-	    parent::setUp();
+    protected function setUp ()
+    {
+        parent::setUp();
 
-	    Route::middleware('web')->group(function() {
+        Route::middleware('web')->group(function() {
 
-			Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']);
+            Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']);
 
-			Route::get( '/export/{id}/download',  [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
+            Route::get( '/export/{id}/download',  [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']);
 
-		});
+        });
 
-		Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls');
+        Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls');
 
-		$this->export = ModelExport::create([
-			'file' => 'test.xls',
-			'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(),
-			'type' => 'xls'
-		]);
-	}
+        $this->export = ModelExport::create([
+            'file' => 'test.xls',
+            'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(),
+            'type' => 'xls'
+        ]);
+    }
 
-	/**
-	* @test
-	*/
-	public function data_export_initiated_and_dispatched()
-	{
-		Queue::fake();
+    /**
+     * @test
+     */
+    public function data_export_initiated_and_dispatched()
+    {
+        Queue::fake();
 
-		$export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' );
+        $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' );
 
-		$this->assertInstanceOf( ModelExport::class, $export );
+        $this->assertInstanceOf( ModelExport::class, $export );
 
-		Queue::assertPushedOn('exporting', ExportJob::class);
-	}
+        Queue::assertPushedOn('exporting', ExportJob::class);
+    }
 
-	/**
-	* @test
-	*/
-	public function see_export_progress_page()
-	{
-		$response =  $this->get('/ticket/export/' . $this->export->id);
+    /**
+     * @test
+     */
+    public function see_export_progress_page()
+    {
+        $response =  $this->get('/ticket/export/' . $this->export->id);
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertSee('Export');
-	}
+        $response->assertSee('Export');
+    }
 
-	/**
-	* @test
-	*/
-	public function check_export_progress_ajax()
-	{
-		$response = $this->json( 'GET', '/export/' . $this->export->id . '/progress');
+    /**
+     * @test
+     */
+    public function check_export_progress_ajax()
+    {
+        $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress');
 
-		$response->assertStatus(200);
+        $response->assertStatus(200);
 
-		$response->assertJsonFragment( ['status' => 200] );
+        $response->assertJsonFragment( ['status' => 200] );
 
-		$response->assertJsonFragment( ['progress'] );
-	}
+        $response->assertJsonFragment( ['progress'] );
+    }
 
-	/**
-	* @test
-	*/
-	public function try_download_exported_file()
-	{
-		$response = $this->get('/export/' . $this->export->id . '/download');
+    /**
+     * @test
+     */
+    public function try_download_exported_file()
+    {
+        $response = $this->get('/export/' . $this->export->id . '/download');
 
-		$response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"');
+        $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"');
 
-		$response->assertStatus(200);
-	}
+        $response->assertStatus(200);
+    }
 
-	/**
-	* @test
-	*/
-	public function fail_download_exported_file()
-	{
-		$response = $this->get('/export/' . rand(1, 100) . '/download');
+    /**
+     * @test
+     */
+    public function fail_download_exported_file()
+    {
+        $response = $this->get('/export/' . rand(1, 100) . '/download');
 
-		$response->assertStatus(404);
-	}
+        $response->assertStatus(404);
+    }
 }

tests/ImportExportLogTest.php

Indentation +33 added lines, -33 removed lines

@@ -11,49 +11,49 @@
 
 class ImportExportLogTest extends TestCase
 {
-	use RefreshDatabase;
+    use RefreshDatabase;
 
-	protected $import;
+    protected $import;
 
-	protected function setUp ()
-	{
-	    parent::setUp();
+    protected function setUp ()
+    {
+        parent::setUp();
 
-		$this->import = Import::create([
-			'file' => 'imports/import-1530262997.csv',
-			'file_rows' => 104,
-			'db_cols' => [ 'name', 'email', 'password'],
-			'model_map' => ['email', 'name', 'password']
-		]);
-	}
+        $this->import = Import::create([
+            'file' => 'imports/import-1530262997.csv',
+            'file_rows' => 104,
+            'db_cols' => [ 'name', 'email', 'password'],
+            'model_map' => ['email', 'name', 'password']
+        ]);
+    }
 
-	/**
-	* @test
-	*/
-	public function save_new_log()
-	{
-		$import = $this->import;
+    /**
+     * @test
+     */
+    public function save_new_log()
+    {
+        $import = $this->import;
 
-		$result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' );
+        $result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' );
 
-		$this->assertInstanceOf( ModelImportExportLog::class, $result );
-	}
+        $this->assertInstanceOf( ModelImportExportLog::class, $result );
+    }
 
-	/**
-	* @test
-	*/
-	public function get_saved_logs()
-	{
-		$import = $this->import;
+    /**
+     * @test
+     */
+    public function get_saved_logs()
+    {
+        $import = $this->import;
 
-		$log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' );
+        $log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' );
 
-		$log_in_db = ImportExportLog::getLogs( $log->id );
+        $log_in_db = ImportExportLog::getLogs( $log->id );
 
-		$this->assertInternalType( 'array', $log_in_db );
+        $this->assertInternalType( 'array', $log_in_db );
 
-		$this->assertArrayHasKey( 'data', $log_in_db[0] );
+        $this->assertArrayHasKey( 'data', $log_in_db[0] );
 
-		$this->assertArrayHasKey( 'message', $log_in_db[0] );
-	}
+        $this->assertArrayHasKey( 'message', $log_in_db[0] );
+    }
 }

src/Models/ImportExportLog.php

Indentation +29 added lines, -29 removed lines

@@ -10,23 +10,23 @@ 
 
 
     /**
-    * Relationship with import model
-    *
-    * @return void
-    */
+     * Relationship with import model
+     *
+     * @return void
+     */
     public function import()
     {
-    	return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class );
+        return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class );
     }
 
 
     /**
-    * Model Map accessor
-    *
-    * Unserialize data while retriving.
-    * @param $value
-    * @return string
-    */
+     * Model Map accessor
+     *
+     * Unserialize data while retriving.
+     * @param $value
+     * @return string
+     */
     public function getDataAttribute($value)
     {
         return unserialize( $value );
@@ -34,12 +34,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize data while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize data while storing.
+     * @param $value
+     * @return void
+     */
     public function setDataAttribute($value)
     {
         $this->attributes['data'] = serialize( $value );
@@ -47,12 +47,12 @@ 
 
 
     /**
-    * Model Map accessor
-    *
-    * Unserialize message while retriving.
-    * @param $value
-    * @return string
-    */
+     * Model Map accessor
+     *
+     * Unserialize message while retriving.
+     * @param $value
+     * @return string
+     */
     public function getMessageAttribute($value)
     {
         return unserialize( $value );
@@ -60,12 +60,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize message while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize message while storing.
+     * @param $value
+     * @return void
+     */
     public function setMessageAttribute($value)
     {
         $this->attributes['message'] = serialize( $value );

src/Models/Export.php

Indentation +12 added lines, -12 removed lines

@@ -9,12 +9,12 @@ 
     protected $fillable = [ 'file', 'type', 'query', 'result_rows'];
 
     /**
-    * Query accessor
-    *
-    * Unserialize query while retriving.
-    * @param $value
-    * @return string
-    */
+     * Query accessor
+     *
+     * Unserialize query while retriving.
+     * @param $value
+     * @return string
+     */
     public function getQueryAttribute($value)
     {
         return unserialize( $value );
@@ -22,12 +22,12 @@ 
 
 
     /**
-    * Query mulator
-    *
-    * Serialize query while storing.
-    * @param $value
-    * @return void
-    */
+     * Query mulator
+     *
+     * Serialize query while storing.
+     * @param $value
+     * @return void
+     */
     public function setQueryAttribute($value)
     {
         $this->attributes['query'] = serialize( $value );

src/Models/Import.php

Indentation +30 added lines, -30 removed lines

@@ -6,27 +6,27 @@ 
 
 class Import extends Model
 {
-	protected $fillable = ['file', 'file_rows', 'db_cols', 'row_processed'];
+    protected $fillable = ['file', 'file_rows', 'db_cols', 'row_processed'];
 
 
     /**
-    * Relationship with import export log model
-    *
-    * @return void
-    */
+     * Relationship with import export log model
+     *
+     * @return void
+     */
     public function importLogs()
     {
-    	return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' );
+        return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' );
     }
 
 
     /**
-    * Model Map accessor
-    *
-    * Unserialize model map while retriving.
-    * @param $value
-    * @return string
-    */
+     * Model Map accessor
+     *
+     * Unserialize model map while retriving.
+     * @param $value
+     * @return string
+     */
     public function getModelMapAttribute($value)
     {
         return unserialize( $value );
@@ -34,12 +34,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize model map while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize model map while storing.
+     * @param $value
+     * @return void
+     */
     public function setModelMapAttribute($value)
     {
         $this->attributes['model_map'] = serialize( $value );
@@ -47,12 +47,12 @@ 
 
 
     /**
-    * DB cols accessor
-    *
-    * Unserialize model map while retriving.
-    * @param $value
-    * @return string
-    */
+     * DB cols accessor
+     *
+     * Unserialize model map while retriving.
+     * @param $value
+     * @return string
+     */
     public function getDbColsAttribute($value)
     {
         return unserialize( $value );
@@ -60,12 +60,12 @@ 
 
 
     /**
-    * Model Map mulator
-    *
-    * Serialize model map while storing.
-    * @param $value
-    * @return void
-    */
+     * Model Map mulator
+     *
+     * Serialize model map while storing.
+     * @param $value
+     * @return void
+     */
     public function setDbColsAttribute($value)
     {
         $this->attributes['db_cols'] = serialize( $value );

src/ImportExportLog.php

Indentation +13 added lines, -13 removed lines

@@ -7,20 +7,20 @@
 class ImportExportLog
 {
     
-	public function logImportError(Import $import, $data, $message)
-	{
-		// Create new log
-		return $import->importLogs()->create([
-			'data' => $data,
-			'message' => $message,
-		]);
-	}
+    public function logImportError(Import $import, $data, $message)
+    {
+        // Create new log
+        return $import->importLogs()->create([
+            'data' => $data,
+            'message' => $message,
+        ]);
+    }
 
 
-	public function getLogs($id)
-	{
-		// Get all logs of a import or export process
-		return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray();
-	}
+    public function getLogs($id)
+    {
+        // Get all logs of a import or export process
+        return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray();
+    }
 
 }

src/Export.php

Indentation +13 added lines, -13 removed lines

@@ -9,24 +9,24 @@ 
 class Export
 {
 	
-	public function export(Builder $query, $ext = 'xls')
-	{
-		// Create new export
-		$export = new ModelExport;
+    public function export(Builder $query, $ext = 'xls')
+    {
+        // Create new export
+        $export = new ModelExport;
 
-		$export->type = $ext;
-		$export->query = $query->getModel();
+        $export->type = $ext;
+        $export->query = $query->getModel();
 
-		$export->save();
+        $export->save();
 
-		ExportJob::dispatch( $export )->onQueue( 'exporting' );
+        ExportJob::dispatch( $export )->onQueue( 'exporting' );
 
-		return $export;
-	}
+        return $export;
+    }
 
 
 
-	public function showExportStatus($id)
+    public function showExportStatus($id)
     {
         // Map export instance
         $export = ModelExport::findOrFail( $id );
@@ -50,11 +50,11 @@ 
 
         if ( $export->result_rows > 0 ) {
 
-        	$data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 );
+            $data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 );
 
         } else {
 
-        	$data['progress'] = 0;
+            $data['progress'] = 0;
 
         }
 

src/ImportHandler.php

Indentation +10 added lines, -10 removed lines

@@ -8,10 +8,10 @@ 
 class ImportHandler
 {
 	
-	function process(Import $import, callable $callback)
-	{
+    function process(Import $import, callable $callback)
+    {
 
-		// CSV header row show be excluded
+        // CSV header row show be excluded
         $csv_header = true;
 
         // Read csv
@@ -30,21 +30,21 @@ 
 
             } else {
 
-            	// Drop ignore columns
+                // Drop ignore columns
                 $data = array_combine( $import->model_map, $csv_line );
                 unset( $data[''] );
 
                 // Call user callback with data
                 if ( $callback( $data ) ) {
 
-                	// If successful -> update imported rows
-                	$import->row_imported = $import->row_imported + 1;
+                    // If successful -> update imported rows
+                    $import->row_imported = $import->row_imported + 1;
 
                 }
 
-				// Update porcessed rows
-	            $import->row_processed = $processed_row;
-	            $import->save();
+                // Update porcessed rows
+                $import->row_processed = $processed_row;
+                $import->save();
 
                 $processed_row++;
             }
@@ -58,5 +58,5 @@ 
         $import->completed_at = Carbon::now();
         $import->save();
 
-	}
+    }
 }