@@ -10,23 +10,23 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * Relationship with import model |
|
| 14 | - * |
|
| 15 | - * @return void |
|
| 16 | - */ |
|
| 13 | + * Relationship with import model |
|
| 14 | + * |
|
| 15 | + * @return void |
|
| 16 | + */ |
|
| 17 | 17 | public function import() |
| 18 | 18 | { |
| 19 | - return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class ); |
|
| 19 | + return $this->belongsTo( \Ladybirdweb\ImportExport\Models\Import::class ); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | - * Model Map accessor |
|
| 25 | - * |
|
| 26 | - * Unserialize data while retriving. |
|
| 27 | - * @param $value |
|
| 28 | - * @return string |
|
| 29 | - */ |
|
| 24 | + * Model Map accessor |
|
| 25 | + * |
|
| 26 | + * Unserialize data while retriving. |
|
| 27 | + * @param $value |
|
| 28 | + * @return string |
|
| 29 | + */ |
|
| 30 | 30 | public function getDataAttribute($value) |
| 31 | 31 | { |
| 32 | 32 | return unserialize( $value ); |
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * Model Map mulator |
|
| 38 | - * |
|
| 39 | - * Serialize data while storing. |
|
| 40 | - * @param $value |
|
| 41 | - * @return void |
|
| 42 | - */ |
|
| 37 | + * Model Map mulator |
|
| 38 | + * |
|
| 39 | + * Serialize data while storing. |
|
| 40 | + * @param $value |
|
| 41 | + * @return void |
|
| 42 | + */ |
|
| 43 | 43 | public function setDataAttribute($value) |
| 44 | 44 | { |
| 45 | 45 | $this->attributes['data'] = serialize( $value ); |
@@ -47,12 +47,12 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * Model Map accessor |
|
| 51 | - * |
|
| 52 | - * Unserialize message while retriving. |
|
| 53 | - * @param $value |
|
| 54 | - * @return string |
|
| 55 | - */ |
|
| 50 | + * Model Map accessor |
|
| 51 | + * |
|
| 52 | + * Unserialize message while retriving. |
|
| 53 | + * @param $value |
|
| 54 | + * @return string |
|
| 55 | + */ |
|
| 56 | 56 | public function getMessageAttribute($value) |
| 57 | 57 | { |
| 58 | 58 | return unserialize( $value ); |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * Model Map mulator |
|
| 64 | - * |
|
| 65 | - * Serialize message while storing. |
|
| 66 | - * @param $value |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 63 | + * Model Map mulator |
|
| 64 | + * |
|
| 65 | + * Serialize message while storing. |
|
| 66 | + * @param $value |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | 69 | public function setMessageAttribute($value) |
| 70 | 70 | { |
| 71 | 71 | $this->attributes['message'] = serialize( $value ); |
@@ -9,12 +9,12 @@ discard block |
||
| 9 | 9 | protected $fillable = [ 'file', 'type', 'query', 'result_rows']; |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | - * Query accessor |
|
| 13 | - * |
|
| 14 | - * Unserialize query while retriving. |
|
| 15 | - * @param $value |
|
| 16 | - * @return string |
|
| 17 | - */ |
|
| 12 | + * Query accessor |
|
| 13 | + * |
|
| 14 | + * Unserialize query while retriving. |
|
| 15 | + * @param $value |
|
| 16 | + * @return string |
|
| 17 | + */ |
|
| 18 | 18 | public function getQueryAttribute($value) |
| 19 | 19 | { |
| 20 | 20 | return unserialize( $value ); |
@@ -22,12 +22,12 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | - * Query mulator |
|
| 26 | - * |
|
| 27 | - * Serialize query while storing. |
|
| 28 | - * @param $value |
|
| 29 | - * @return void |
|
| 30 | - */ |
|
| 25 | + * Query mulator |
|
| 26 | + * |
|
| 27 | + * Serialize query while storing. |
|
| 28 | + * @param $value |
|
| 29 | + * @return void |
|
| 30 | + */ |
|
| 31 | 31 | public function setQueryAttribute($value) |
| 32 | 32 | { |
| 33 | 33 | $this->attributes['query'] = serialize( $value ); |
@@ -6,27 +6,27 @@ discard block |
||
| 6 | 6 | |
| 7 | 7 | class Import extends Model |
| 8 | 8 | { |
| 9 | - protected $fillable = ['file', 'file_rows', 'db_cols', 'row_processed']; |
|
| 9 | + protected $fillable = ['file', 'file_rows', 'db_cols', 'row_processed']; |
|
| 10 | 10 | |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * Relationship with import export log model |
|
| 14 | - * |
|
| 15 | - * @return void |
|
| 16 | - */ |
|
| 13 | + * Relationship with import export log model |
|
| 14 | + * |
|
| 15 | + * @return void |
|
| 16 | + */ |
|
| 17 | 17 | public function importLogs() |
| 18 | 18 | { |
| 19 | - return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' ); |
|
| 19 | + return $this->hasMany( \Ladybirdweb\ImportExport\Models\ImportExportLog::class, 'op_id' ); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | - * Model Map accessor |
|
| 25 | - * |
|
| 26 | - * Unserialize model map while retriving. |
|
| 27 | - * @param $value |
|
| 28 | - * @return string |
|
| 29 | - */ |
|
| 24 | + * Model Map accessor |
|
| 25 | + * |
|
| 26 | + * Unserialize model map while retriving. |
|
| 27 | + * @param $value |
|
| 28 | + * @return string |
|
| 29 | + */ |
|
| 30 | 30 | public function getModelMapAttribute($value) |
| 31 | 31 | { |
| 32 | 32 | return unserialize( $value ); |
@@ -34,12 +34,12 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * Model Map mulator |
|
| 38 | - * |
|
| 39 | - * Serialize model map while storing. |
|
| 40 | - * @param $value |
|
| 41 | - * @return void |
|
| 42 | - */ |
|
| 37 | + * Model Map mulator |
|
| 38 | + * |
|
| 39 | + * Serialize model map while storing. |
|
| 40 | + * @param $value |
|
| 41 | + * @return void |
|
| 42 | + */ |
|
| 43 | 43 | public function setModelMapAttribute($value) |
| 44 | 44 | { |
| 45 | 45 | $this->attributes['model_map'] = serialize( $value ); |
@@ -47,12 +47,12 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * DB cols accessor |
|
| 51 | - * |
|
| 52 | - * Unserialize model map while retriving. |
|
| 53 | - * @param $value |
|
| 54 | - * @return string |
|
| 55 | - */ |
|
| 50 | + * DB cols accessor |
|
| 51 | + * |
|
| 52 | + * Unserialize model map while retriving. |
|
| 53 | + * @param $value |
|
| 54 | + * @return string |
|
| 55 | + */ |
|
| 56 | 56 | public function getDbColsAttribute($value) |
| 57 | 57 | { |
| 58 | 58 | return unserialize( $value ); |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * Model Map mulator |
|
| 64 | - * |
|
| 65 | - * Serialize model map while storing. |
|
| 66 | - * @param $value |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 63 | + * Model Map mulator |
|
| 64 | + * |
|
| 65 | + * Serialize model map while storing. |
|
| 66 | + * @param $value |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | 69 | public function setDbColsAttribute($value) |
| 70 | 70 | { |
| 71 | 71 | $this->attributes['db_cols'] = serialize( $value ); |
@@ -7,20 +7,20 @@ |
||
| 7 | 7 | class ImportExportLog |
| 8 | 8 | { |
| 9 | 9 | |
| 10 | - public function logImportError(Import $import, $data, $message) |
|
| 11 | - { |
|
| 12 | - // Create new log |
|
| 13 | - return $import->importLogs()->create([ |
|
| 14 | - 'data' => $data, |
|
| 15 | - 'message' => $message, |
|
| 16 | - ]); |
|
| 17 | - } |
|
| 10 | + public function logImportError(Import $import, $data, $message) |
|
| 11 | + { |
|
| 12 | + // Create new log |
|
| 13 | + return $import->importLogs()->create([ |
|
| 14 | + 'data' => $data, |
|
| 15 | + 'message' => $message, |
|
| 16 | + ]); |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | 19 | |
| 20 | - public function getLogs($id) |
|
| 21 | - { |
|
| 22 | - // Get all logs of a import or export process |
|
| 23 | - return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray(); |
|
| 24 | - } |
|
| 20 | + public function getLogs($id) |
|
| 21 | + { |
|
| 22 | + // Get all logs of a import or export process |
|
| 23 | + return Import::findOrFail( $id )->importLogs()->get( [ 'data', 'message' ] )->toArray(); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | 26 | } |
@@ -9,24 +9,24 @@ discard block |
||
| 9 | 9 | class Export |
| 10 | 10 | { |
| 11 | 11 | |
| 12 | - public function export(Builder $query, $ext = 'xls') |
|
| 13 | - { |
|
| 14 | - // Create new export |
|
| 15 | - $export = new ModelExport; |
|
| 12 | + public function export(Builder $query, $ext = 'xls') |
|
| 13 | + { |
|
| 14 | + // Create new export |
|
| 15 | + $export = new ModelExport; |
|
| 16 | 16 | |
| 17 | - $export->type = $ext; |
|
| 18 | - $export->query = $query->getModel(); |
|
| 17 | + $export->type = $ext; |
|
| 18 | + $export->query = $query->getModel(); |
|
| 19 | 19 | |
| 20 | - $export->save(); |
|
| 20 | + $export->save(); |
|
| 21 | 21 | |
| 22 | - ExportJob::dispatch( $export )->onQueue( 'exporting' ); |
|
| 22 | + ExportJob::dispatch( $export )->onQueue( 'exporting' ); |
|
| 23 | 23 | |
| 24 | - return $export; |
|
| 25 | - } |
|
| 24 | + return $export; |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | |
| 29 | - public function showExportStatus($id) |
|
| 29 | + public function showExportStatus($id) |
|
| 30 | 30 | { |
| 31 | 31 | // Map export instance |
| 32 | 32 | $export = ModelExport::findOrFail( $id ); |
@@ -50,11 +50,11 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | if ( $export->result_rows > 0 ) { |
| 52 | 52 | |
| 53 | - $data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 ); |
|
| 53 | + $data['progress'] = round( ( $export->row_processed / $export->result_rows ) * 100 ); |
|
| 54 | 54 | |
| 55 | 55 | } else { |
| 56 | 56 | |
| 57 | - $data['progress'] = 0; |
|
| 57 | + $data['progress'] = 0; |
|
| 58 | 58 | |
| 59 | 59 | } |
| 60 | 60 | |
@@ -8,10 +8,10 @@ discard block |
||
| 8 | 8 | class ImportHandler |
| 9 | 9 | { |
| 10 | 10 | |
| 11 | - function process(Import $import, callable $callback) |
|
| 12 | - { |
|
| 11 | + function process(Import $import, callable $callback) |
|
| 12 | + { |
|
| 13 | 13 | |
| 14 | - // CSV header row show be excluded |
|
| 14 | + // CSV header row show be excluded |
|
| 15 | 15 | $csv_header = true; |
| 16 | 16 | |
| 17 | 17 | // Read csv |
@@ -30,21 +30,21 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | } else { |
| 32 | 32 | |
| 33 | - // Drop ignore columns |
|
| 33 | + // Drop ignore columns |
|
| 34 | 34 | $data = array_combine( $import->model_map, $csv_line ); |
| 35 | 35 | unset( $data[''] ); |
| 36 | 36 | |
| 37 | 37 | // Call user callback with data |
| 38 | 38 | if ( $callback( $data ) ) { |
| 39 | 39 | |
| 40 | - // If successful -> update imported rows |
|
| 41 | - $import->row_imported = $import->row_imported + 1; |
|
| 40 | + // If successful -> update imported rows |
|
| 41 | + $import->row_imported = $import->row_imported + 1; |
|
| 42 | 42 | |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - // Update porcessed rows |
|
| 46 | - $import->row_processed = $processed_row; |
|
| 47 | - $import->save(); |
|
| 45 | + // Update porcessed rows |
|
| 46 | + $import->row_processed = $processed_row; |
|
| 47 | + $import->save(); |
|
| 48 | 48 | |
| 49 | 49 | $processed_row++; |
| 50 | 50 | } |
@@ -58,5 +58,5 @@ discard block |
||
| 58 | 58 | $import->completed_at = Carbon::now(); |
| 59 | 59 | $import->save(); |
| 60 | 60 | |
| 61 | - } |
|
| 61 | + } |
|
| 62 | 62 | } |
@@ -3,13 +3,13 @@ |
||
| 3 | 3 | return [ |
| 4 | 4 | // Route for export process ajax |
| 5 | 5 | 'export_progress' => [ |
| 6 | - 'url' => '/export/{id}/progress', |
|
| 7 | - 'name' => 'ladybirdweb.export.ajax.progress' |
|
| 6 | + 'url' => '/export/{id}/progress', |
|
| 7 | + 'name' => 'ladybirdweb.export.ajax.progress' |
|
| 8 | 8 | ], |
| 9 | 9 | |
| 10 | 10 | // Route for download exported file |
| 11 | 11 | 'export_download' => [ |
| 12 | - 'url' => '/export/{id}/download', |
|
| 13 | - 'name' => 'ladybirdweb.export.download' |
|
| 12 | + 'url' => '/export/{id}/download', |
|
| 13 | + 'name' => 'ladybirdweb.export.download' |
|
| 14 | 14 | ] |
| 15 | 15 | ]; |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | return [ |
| 4 | 4 | // Route for import process ajax |
| 5 | 5 | 'import_progress' => [ |
| 6 | - 'url' => '/import/{id}/progress', |
|
| 7 | - 'name' => 'ladybirdweb.import.ajax.progress' |
|
| 6 | + 'url' => '/import/{id}/progress', |
|
| 7 | + 'name' => 'ladybirdweb.import.ajax.progress' |
|
| 8 | 8 | ] |
| 9 | 9 | ]; |
@@ -11,61 +11,61 @@ |
||
| 11 | 11 | |
| 12 | 12 | class ImportExportLogTest extends TestCase |
| 13 | 13 | { |
| 14 | - use RefreshDatabase; |
|
| 14 | + use RefreshDatabase; |
|
| 15 | 15 | |
| 16 | - protected $import; |
|
| 16 | + protected $import; |
|
| 17 | 17 | |
| 18 | - protected function getPackageProviders($app) |
|
| 19 | - { |
|
| 20 | - return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 21 | - } |
|
| 18 | + protected function getPackageProviders($app) |
|
| 19 | + { |
|
| 20 | + return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | 23 | protected function getEnvironmentSetUp($app) |
| 24 | 24 | { |
| 25 | 25 | $app['config']->set('database.default', 'testing'); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - protected function setUp () |
|
| 29 | - { |
|
| 30 | - parent::setUp(); |
|
| 28 | + protected function setUp () |
|
| 29 | + { |
|
| 30 | + parent::setUp(); |
|
| 31 | 31 | |
| 32 | - $this->artisan('migrate', ['--database' => 'testing']); |
|
| 32 | + $this->artisan('migrate', ['--database' => 'testing']); |
|
| 33 | 33 | |
| 34 | - $this->import = Import::create([ |
|
| 35 | - 'file' => 'imports/import-1530262997.csv', |
|
| 36 | - 'file_rows' => 104, |
|
| 37 | - 'db_cols' => [ 'name', 'email', 'password'], |
|
| 38 | - 'model_map' => ['email', 'name', 'password'] |
|
| 39 | - ]); |
|
| 40 | - } |
|
| 34 | + $this->import = Import::create([ |
|
| 35 | + 'file' => 'imports/import-1530262997.csv', |
|
| 36 | + 'file_rows' => 104, |
|
| 37 | + 'db_cols' => [ 'name', 'email', 'password'], |
|
| 38 | + 'model_map' => ['email', 'name', 'password'] |
|
| 39 | + ]); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @test |
|
| 44 | - */ |
|
| 45 | - public function save_new_log() |
|
| 46 | - { |
|
| 47 | - $import = $this->import; |
|
| 42 | + /** |
|
| 43 | + * @test |
|
| 44 | + */ |
|
| 45 | + public function save_new_log() |
|
| 46 | + { |
|
| 47 | + $import = $this->import; |
|
| 48 | 48 | |
| 49 | - $result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 49 | + $result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 50 | 50 | |
| 51 | - $this->assertInstanceOf( ModelImportExportLog::class, $result ); |
|
| 52 | - } |
|
| 51 | + $this->assertInstanceOf( ModelImportExportLog::class, $result ); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @test |
|
| 56 | - */ |
|
| 57 | - public function get_saved_logs() |
|
| 58 | - { |
|
| 59 | - $import = $this->import; |
|
| 54 | + /** |
|
| 55 | + * @test |
|
| 56 | + */ |
|
| 57 | + public function get_saved_logs() |
|
| 58 | + { |
|
| 59 | + $import = $this->import; |
|
| 60 | 60 | |
| 61 | - $log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 61 | + $log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 62 | 62 | |
| 63 | - $log_in_db = ImportExportLog::getLogs( $log->id ); |
|
| 63 | + $log_in_db = ImportExportLog::getLogs( $log->id ); |
|
| 64 | 64 | |
| 65 | - $this->assertInternalType( 'array', $log_in_db ); |
|
| 65 | + $this->assertInternalType( 'array', $log_in_db ); |
|
| 66 | 66 | |
| 67 | - $this->assertArrayHasKey( 'data', $log_in_db[0] ); |
|
| 67 | + $this->assertArrayHasKey( 'data', $log_in_db[0] ); |
|
| 68 | 68 | |
| 69 | - $this->assertArrayHasKey( 'message', $log_in_db[0] ); |
|
| 70 | - } |
|
| 69 | + $this->assertArrayHasKey( 'message', $log_in_db[0] ); |
|
| 70 | + } |
|
| 71 | 71 | } |