@@ -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 | } |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | $csv_header = true; |
16 | 16 | |
17 | 17 | // Read csv |
18 | - $file = fopen( storage_path( 'app/' . $import->file ), 'r' ); |
|
18 | + $file = fopen(storage_path('app/'.$import->file), 'r'); |
|
19 | 19 | |
20 | 20 | // Processed csv rows |
21 | 21 | $processed_row = 1; |
22 | 22 | |
23 | 23 | // Go over csv data line by line |
24 | - while ( $csv_line = fgetcsv( $file ) ) { |
|
24 | + while ($csv_line = fgetcsv($file)) { |
|
25 | 25 | |
26 | - if ( $csv_header ) { |
|
26 | + if ($csv_header) { |
|
27 | 27 | |
28 | 28 | // Skip csv header |
29 | 29 | $csv_header = false; |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | } else { |
32 | 32 | |
33 | 33 | // Drop ignore columns |
34 | - $data = array_combine( $import->model_map, $csv_line ); |
|
35 | - unset( $data[''] ); |
|
34 | + $data = array_combine($import->model_map, $csv_line); |
|
35 | + unset($data['']); |
|
36 | 36 | |
37 | 37 | // Call user callback with data |
38 | - if ( $callback( $data ) ) { |
|
38 | + if ($callback($data)) { |
|
39 | 39 | |
40 | 40 | // If successful -> update imported rows |
41 | 41 | $import->row_imported = $import->row_imported + 1; |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | // Close csv file |
55 | - fclose( $file ); |
|
55 | + fclose($file); |
|
56 | 56 | |
57 | 57 | // Update import as done |
58 | 58 | $import->completed_at = Carbon::now(); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | public function handle() |
38 | 38 | { |
39 | 39 | // Custom file path |
40 | - $file_path = date( 'Y/m' ); |
|
40 | + $file_path = date('Y/m'); |
|
41 | 41 | |
42 | 42 | // Export instance assign to variable |
43 | 43 | $export = $this->export; |
@@ -47,19 +47,19 @@ discard block |
||
47 | 47 | $export->save(); |
48 | 48 | |
49 | 49 | // Create export file |
50 | - $excel = Excel::create( 'export-' . date( 'dmYhis' ), function($excel) use ($export) { |
|
50 | + $excel = Excel::create('export-'.date('dmYhis'), function($excel) use ($export) { |
|
51 | 51 | |
52 | 52 | // Create new sheet |
53 | - $excel->sheet( 'export', function($sheet) use ($export) { |
|
53 | + $excel->sheet('export', function($sheet) use ($export) { |
|
54 | 54 | |
55 | 55 | // Retrive data in chunk |
56 | - $export->query->chunk( 10, function($data) use ($export, $sheet) { |
|
56 | + $export->query->chunk(10, function($data) use ($export, $sheet) { |
|
57 | 57 | |
58 | 58 | // Process chunk data |
59 | - foreach ( $data as $row ) { |
|
59 | + foreach ($data as $row) { |
|
60 | 60 | |
61 | 61 | // Append row to sheet |
62 | - $sheet->appendRow( $row->toArray() ); |
|
62 | + $sheet->appendRow($row->toArray()); |
|
63 | 63 | |
64 | 64 | } |
65 | 65 | |
@@ -71,10 +71,10 @@ discard block |
||
71 | 71 | |
72 | 72 | }); |
73 | 73 | |
74 | - })->store( $this->export->type, storage_path( 'app/exports/' . $file_path ), true ); |
|
74 | + })->store($this->export->type, storage_path('app/exports/'.$file_path), true); |
|
75 | 75 | |
76 | 76 | // Update export data |
77 | - $export->file = $file_path . '/' . $excel['file']; |
|
77 | + $export->file = $file_path.'/'.$excel['file']; |
|
78 | 78 | $export->completed_at = Carbon::now(); |
79 | 79 | $export->save(); |
80 | 80 |
@@ -16,90 +16,90 @@ |
||
16 | 16 | |
17 | 17 | class ExportTest extends TestCase |
18 | 18 | { |
19 | - use RefreshDatabase; |
|
19 | + use RefreshDatabase; |
|
20 | 20 | |
21 | - protected $export; |
|
21 | + protected $export; |
|
22 | 22 | |
23 | - protected function setUp () |
|
24 | - { |
|
25 | - parent::setUp(); |
|
23 | + protected function setUp () |
|
24 | + { |
|
25 | + parent::setUp(); |
|
26 | 26 | |
27 | - Route::middleware('web')->group(function() { |
|
27 | + Route::middleware('web')->group(function() { |
|
28 | 28 | |
29 | - Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']); |
|
29 | + Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']); |
|
30 | 30 | |
31 | - Route::get( '/export/{id}/download', [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
31 | + Route::get( '/export/{id}/download', [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
32 | 32 | |
33 | - }); |
|
33 | + }); |
|
34 | 34 | |
35 | - Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls'); |
|
35 | + Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls'); |
|
36 | 36 | |
37 | - $this->export = ModelExport::create([ |
|
38 | - 'file' => 'test.xls', |
|
39 | - 'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(), |
|
40 | - 'type' => 'xls' |
|
41 | - ]); |
|
42 | - } |
|
37 | + $this->export = ModelExport::create([ |
|
38 | + 'file' => 'test.xls', |
|
39 | + 'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(), |
|
40 | + 'type' => 'xls' |
|
41 | + ]); |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * @test |
|
46 | - */ |
|
47 | - public function data_export_initiated_and_dispatched() |
|
48 | - { |
|
49 | - Queue::fake(); |
|
44 | + /** |
|
45 | + * @test |
|
46 | + */ |
|
47 | + public function data_export_initiated_and_dispatched() |
|
48 | + { |
|
49 | + Queue::fake(); |
|
50 | 50 | |
51 | - $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' ); |
|
51 | + $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' ); |
|
52 | 52 | |
53 | - $this->assertInstanceOf( ModelExport::class, $export ); |
|
53 | + $this->assertInstanceOf( ModelExport::class, $export ); |
|
54 | 54 | |
55 | - Queue::assertPushedOn('exporting', ExportJob::class); |
|
56 | - } |
|
55 | + Queue::assertPushedOn('exporting', ExportJob::class); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @test |
|
60 | - */ |
|
61 | - public function see_export_progress_page() |
|
62 | - { |
|
63 | - $response = $this->get('/ticket/export/' . $this->export->id); |
|
58 | + /** |
|
59 | + * @test |
|
60 | + */ |
|
61 | + public function see_export_progress_page() |
|
62 | + { |
|
63 | + $response = $this->get('/ticket/export/' . $this->export->id); |
|
64 | 64 | |
65 | - $response->assertStatus(200); |
|
65 | + $response->assertStatus(200); |
|
66 | 66 | |
67 | - $response->assertSee('Export'); |
|
68 | - } |
|
67 | + $response->assertSee('Export'); |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * @test |
|
72 | - */ |
|
73 | - public function check_export_progress_ajax() |
|
74 | - { |
|
75 | - $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress'); |
|
70 | + /** |
|
71 | + * @test |
|
72 | + */ |
|
73 | + public function check_export_progress_ajax() |
|
74 | + { |
|
75 | + $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress'); |
|
76 | 76 | |
77 | - $response->assertStatus(200); |
|
77 | + $response->assertStatus(200); |
|
78 | 78 | |
79 | - $response->assertJsonFragment( ['status' => 200] ); |
|
79 | + $response->assertJsonFragment( ['status' => 200] ); |
|
80 | 80 | |
81 | - $response->assertJsonFragment( ['progress'] ); |
|
82 | - } |
|
81 | + $response->assertJsonFragment( ['progress'] ); |
|
82 | + } |
|
83 | 83 | |
84 | - /** |
|
85 | - * @test |
|
86 | - */ |
|
87 | - public function try_download_exported_file() |
|
88 | - { |
|
89 | - $response = $this->get('/export/' . $this->export->id . '/download'); |
|
84 | + /** |
|
85 | + * @test |
|
86 | + */ |
|
87 | + public function try_download_exported_file() |
|
88 | + { |
|
89 | + $response = $this->get('/export/' . $this->export->id . '/download'); |
|
90 | 90 | |
91 | - $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"'); |
|
91 | + $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"'); |
|
92 | 92 | |
93 | - $response->assertStatus(200); |
|
94 | - } |
|
93 | + $response->assertStatus(200); |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * @test |
|
98 | - */ |
|
99 | - public function fail_download_exported_file() |
|
100 | - { |
|
101 | - $response = $this->get('/export/987654321/download'); |
|
96 | + /** |
|
97 | + * @test |
|
98 | + */ |
|
99 | + public function fail_download_exported_file() |
|
100 | + { |
|
101 | + $response = $this->get('/export/987654321/download'); |
|
102 | 102 | |
103 | - $response->assertStatus(404); |
|
104 | - } |
|
103 | + $response->assertStatus(404); |
|
104 | + } |
|
105 | 105 | } |
@@ -20,23 +20,23 @@ discard block |
||
20 | 20 | |
21 | 21 | protected $export; |
22 | 22 | |
23 | - protected function setUp () |
|
23 | + protected function setUp() |
|
24 | 24 | { |
25 | 25 | parent::setUp(); |
26 | 26 | |
27 | 27 | Route::middleware('web')->group(function() { |
28 | 28 | |
29 | - Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']); |
|
29 | + Route::get('/ticket/export/{id}', ['as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']); |
|
30 | 30 | |
31 | - Route::get( '/export/{id}/download', [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
31 | + Route::get('/export/{id}/download', ['as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
32 | 32 | |
33 | 33 | }); |
34 | 34 | |
35 | - Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls'); |
|
35 | + Storage::putFileAs('exports', new File(storage_path('test/test.csv')), 'test.xls'); |
|
36 | 36 | |
37 | 37 | $this->export = ModelExport::create([ |
38 | 38 | 'file' => 'test.xls', |
39 | - 'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(), |
|
39 | + 'query' => \App\Models\User::select(['name', 'email', 'created_at'])->getModel(), |
|
40 | 40 | 'type' => 'xls' |
41 | 41 | ]); |
42 | 42 | } |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | { |
49 | 49 | Queue::fake(); |
50 | 50 | |
51 | - $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' ); |
|
51 | + $export = Export::export(\App\Models\User::select(['name', 'email', 'created_at']), 'xls'); |
|
52 | 52 | |
53 | - $this->assertInstanceOf( ModelExport::class, $export ); |
|
53 | + $this->assertInstanceOf(ModelExport::class, $export); |
|
54 | 54 | |
55 | 55 | Queue::assertPushedOn('exporting', ExportJob::class); |
56 | 56 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function see_export_progress_page() |
62 | 62 | { |
63 | - $response = $this->get('/ticket/export/' . $this->export->id); |
|
63 | + $response = $this->get('/ticket/export/'.$this->export->id); |
|
64 | 64 | |
65 | 65 | $response->assertStatus(200); |
66 | 66 | |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function check_export_progress_ajax() |
74 | 74 | { |
75 | - $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress'); |
|
75 | + $response = $this->json('GET', '/export/'.$this->export->id.'/progress'); |
|
76 | 76 | |
77 | 77 | $response->assertStatus(200); |
78 | 78 | |
79 | - $response->assertJsonFragment( ['status' => 200] ); |
|
79 | + $response->assertJsonFragment(['status' => 200]); |
|
80 | 80 | |
81 | - $response->assertJsonFragment( ['progress'] ); |
|
81 | + $response->assertJsonFragment(['progress']); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function try_download_exported_file() |
88 | 88 | { |
89 | - $response = $this->get('/export/' . $this->export->id . '/download'); |
|
89 | + $response = $this->get('/export/'.$this->export->id.'/download'); |
|
90 | 90 | |
91 | - $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"'); |
|
91 | + $response->assertHeader('content-disposition', 'attachment; filename="test.xls"'); |
|
92 | 92 | |
93 | 93 | $response->assertStatus(200); |
94 | 94 | } |
@@ -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 | ]; |
@@ -3,12 +3,12 @@ |
||
3 | 3 | Route::middleware('web')->group(function() { |
4 | 4 | |
5 | 5 | // Ajax GET import progress |
6 | -Route::get( config( 'import.import_progress.url' ), [ 'as' => config( 'import.import_progress.name' ), 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
6 | +Route::get(config('import.import_progress.url'), ['as' => config('import.import_progress.name'), 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
7 | 7 | |
8 | 8 | // Ajax GET export progress |
9 | -Route::get( config( 'export.export_progress.url' ), [ 'as' => config( 'export.export_progress.name' ), 'uses' => 'Ladybirdweb\ImportExport\Export@returnExportProgress']); |
|
9 | +Route::get(config('export.export_progress.url'), ['as' => config('export.export_progress.name'), 'uses' => 'Ladybirdweb\ImportExport\Export@returnExportProgress']); |
|
10 | 10 | |
11 | 11 | // GET export download |
12 | -Route::get( config( 'export.export_download.url' ), [ 'as' => config( 'export.export_download.name' ), 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
12 | +Route::get(config('export.export_download.url'), ['as' => config('export.export_download.name'), 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
13 | 13 | |
14 | 14 | }); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | // Store file path and model class to db |
19 | 19 | $import = ModelImport::create([ |
20 | 20 | 'file' => $path, |
21 | - 'file_rows' => count( file( storage_path( 'app/' . $path ) ) ) - 1, |
|
21 | + 'file_rows' => count(file(storage_path('app/'.$path))) - 1, |
|
22 | 22 | 'db_cols' => $columns |
23 | 23 | ]); |
24 | 24 | |
@@ -33,28 +33,28 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function getImport($id) |
35 | 35 | { |
36 | - return ModelImport::findOrFail( $id ); |
|
36 | + return ModelImport::findOrFail($id); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function getImportFileData($id, $rows = 5) |
40 | 40 | { |
41 | 41 | // Get import instance |
42 | - $import = $this->getImport( $id ); |
|
42 | + $import = $this->getImport($id); |
|
43 | 43 | |
44 | 44 | // Read 5 rows from csv |
45 | 45 | $read_line = 1; |
46 | 46 | |
47 | - $file = fopen( storage_path( 'app/' . $import->file ), 'r' ); |
|
47 | + $file = fopen(storage_path('app/'.$import->file), 'r'); |
|
48 | 48 | |
49 | - while ( $csv_line = fgetcsv( $file ) ) { |
|
49 | + while ($csv_line = fgetcsv($file)) { |
|
50 | 50 | $csv_data[] = $csv_line; |
51 | 51 | |
52 | - if ( $read_line > $rows ) break; |
|
52 | + if ($read_line > $rows) break; |
|
53 | 53 | |
54 | 54 | $read_line++; |
55 | 55 | } |
56 | 56 | |
57 | - fclose( $file ); |
|
57 | + fclose($file); |
|
58 | 58 | |
59 | 59 | return $csv_data; |
60 | 60 | } |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | $data['progress'] = round(($import->row_processed / $import->file_rows) * 100); |
108 | 108 | |
109 | 109 | // If progress completed return successful imported rows count |
110 | - if ( $data['progress'] == 100 ) { |
|
110 | + if ($data['progress'] == 100) { |
|
111 | 111 | $data['imported'] = $import->row_imported; |
112 | 112 | } |
113 | 113 | |
114 | - return response()->json( $data ); |
|
114 | + return response()->json($data); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | public function removeImport($id) |
125 | 125 | { |
126 | 126 | // Get import instance |
127 | - $import = $this->getImport( $id ); |
|
127 | + $import = $this->getImport($id); |
|
128 | 128 | |
129 | 129 | // Remove a import from db |
130 | 130 | return $import->delete(); |
@@ -49,7 +49,9 @@ |
||
49 | 49 | while ( $csv_line = fgetcsv( $file ) ) { |
50 | 50 | $csv_data[] = $csv_line; |
51 | 51 | |
52 | - if ( $read_line > $rows ) break; |
|
52 | + if ( $read_line > $rows ) { |
|
53 | + break; |
|
54 | + } |
|
53 | 55 | |
54 | 56 | $read_line++; |
55 | 57 | } |
@@ -15,110 +15,110 @@ |
||
15 | 15 | |
16 | 16 | class ImportTest extends TestCase |
17 | 17 | { |
18 | - use RefreshDatabase; |
|
18 | + use RefreshDatabase; |
|
19 | 19 | |
20 | - protected $import; |
|
20 | + protected $import; |
|
21 | 21 | |
22 | - protected function getPackageProviders($app) |
|
23 | - { |
|
24 | - return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
25 | - } |
|
22 | + protected function getPackageProviders($app) |
|
23 | + { |
|
24 | + return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
25 | + } |
|
26 | 26 | |
27 | - protected function setUp () |
|
28 | - { |
|
29 | - parent::setUp(); |
|
27 | + protected function setUp () |
|
28 | + { |
|
29 | + parent::setUp(); |
|
30 | 30 | |
31 | - $this->loadMigrationsFrom(__DIR__ . '/database/migrations'); |
|
31 | + $this->loadMigrationsFrom(__DIR__ . '/database/migrations'); |
|
32 | 32 | |
33 | - Route::middleware('web')->group(function() { |
|
33 | + Route::middleware('web')->group(function() { |
|
34 | 34 | |
35 | - Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
36 | - |
|
37 | - }); |
|
38 | - |
|
39 | - Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv'); |
|
40 | - |
|
41 | - $this->import = ModelImport::create([ |
|
42 | - 'file' => 'imports/test.csv', |
|
43 | - 'file_rows' => 104, |
|
44 | - 'db_cols' => [ 'name', 'email', 'password'], |
|
45 | - 'model_map' => ['email', 'name', 'password'] |
|
46 | - ]); |
|
47 | - } |
|
48 | - |
|
49 | - /** |
|
50 | - * @test |
|
51 | - */ |
|
52 | - public function create_new_import_success() |
|
53 | - { |
|
54 | - $import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']); |
|
55 | - |
|
56 | - $this->assertInstanceOf(ModelImport::class, $import); |
|
57 | - } |
|
58 | - |
|
59 | - /** |
|
60 | - * @test |
|
61 | - */ |
|
62 | - public function fetch_import() |
|
63 | - { |
|
64 | - $import = Import::getImport($this->import->id); |
|
65 | - |
|
66 | - $this->assertInstanceOf(ModelImport::class, $import); |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * @test |
|
71 | - */ |
|
72 | - public function get_few_rows_from_uploaded_file() |
|
73 | - { |
|
74 | - $csv_data = Import::getImportFileData($this->import->id); |
|
75 | - |
|
76 | - $this->assertInternalType( 'array', $csv_data ); |
|
77 | - } |
|
78 | - |
|
79 | - /** |
|
80 | - * @test |
|
81 | - */ |
|
82 | - public function store_data_map_with_csv_cols() |
|
83 | - { |
|
84 | - $import = Import::setDataMap(['email', 'name', 'password'], $this->import->id); |
|
85 | - |
|
86 | - $this->assertInstanceOf(ModelImport::class, $import); |
|
87 | - } |
|
88 | - |
|
89 | - /** |
|
90 | - * @test |
|
91 | - */ |
|
92 | - public function sucess_to_dispatch_given_job_class() |
|
93 | - { |
|
94 | - $import = $id = $this->import; |
|
95 | - |
|
96 | - Queue::fake(); |
|
97 | - |
|
98 | - Import::dispatchImportJob( FakeJob::class, $import ); |
|
99 | - |
|
100 | - Queue::assertPushedOn('importing', FakeJob::class); |
|
101 | - } |
|
102 | - |
|
103 | - /** |
|
104 | - * @test |
|
105 | - */ |
|
106 | - public function check_import_progress() |
|
107 | - { |
|
108 | - $response = $this->json( 'GET', '/import/1/progress' ); |
|
109 | - |
|
110 | - $response->assertStatus(200); |
|
111 | - |
|
112 | - $response->assertJsonFragment( ['status' => 200] ); |
|
113 | - |
|
114 | - $response->assertJsonFragment( ['progress'] ); |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * @test |
|
119 | - */ |
|
120 | - public function remove_import() |
|
121 | - { |
|
122 | - $this->assertTrue(Import::removeImport($this->import->id)); |
|
123 | - } |
|
35 | + Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
36 | + |
|
37 | + }); |
|
38 | + |
|
39 | + Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv'); |
|
40 | + |
|
41 | + $this->import = ModelImport::create([ |
|
42 | + 'file' => 'imports/test.csv', |
|
43 | + 'file_rows' => 104, |
|
44 | + 'db_cols' => [ 'name', 'email', 'password'], |
|
45 | + 'model_map' => ['email', 'name', 'password'] |
|
46 | + ]); |
|
47 | + } |
|
48 | + |
|
49 | + /** |
|
50 | + * @test |
|
51 | + */ |
|
52 | + public function create_new_import_success() |
|
53 | + { |
|
54 | + $import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']); |
|
55 | + |
|
56 | + $this->assertInstanceOf(ModelImport::class, $import); |
|
57 | + } |
|
58 | + |
|
59 | + /** |
|
60 | + * @test |
|
61 | + */ |
|
62 | + public function fetch_import() |
|
63 | + { |
|
64 | + $import = Import::getImport($this->import->id); |
|
65 | + |
|
66 | + $this->assertInstanceOf(ModelImport::class, $import); |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * @test |
|
71 | + */ |
|
72 | + public function get_few_rows_from_uploaded_file() |
|
73 | + { |
|
74 | + $csv_data = Import::getImportFileData($this->import->id); |
|
75 | + |
|
76 | + $this->assertInternalType( 'array', $csv_data ); |
|
77 | + } |
|
78 | + |
|
79 | + /** |
|
80 | + * @test |
|
81 | + */ |
|
82 | + public function store_data_map_with_csv_cols() |
|
83 | + { |
|
84 | + $import = Import::setDataMap(['email', 'name', 'password'], $this->import->id); |
|
85 | + |
|
86 | + $this->assertInstanceOf(ModelImport::class, $import); |
|
87 | + } |
|
88 | + |
|
89 | + /** |
|
90 | + * @test |
|
91 | + */ |
|
92 | + public function sucess_to_dispatch_given_job_class() |
|
93 | + { |
|
94 | + $import = $id = $this->import; |
|
95 | + |
|
96 | + Queue::fake(); |
|
97 | + |
|
98 | + Import::dispatchImportJob( FakeJob::class, $import ); |
|
99 | + |
|
100 | + Queue::assertPushedOn('importing', FakeJob::class); |
|
101 | + } |
|
102 | + |
|
103 | + /** |
|
104 | + * @test |
|
105 | + */ |
|
106 | + public function check_import_progress() |
|
107 | + { |
|
108 | + $response = $this->json( 'GET', '/import/1/progress' ); |
|
109 | + |
|
110 | + $response->assertStatus(200); |
|
111 | + |
|
112 | + $response->assertJsonFragment( ['status' => 200] ); |
|
113 | + |
|
114 | + $response->assertJsonFragment( ['progress'] ); |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * @test |
|
119 | + */ |
|
120 | + public function remove_import() |
|
121 | + { |
|
122 | + $this->assertTrue(Import::removeImport($this->import->id)); |
|
123 | + } |
|
124 | 124 | } |
@@ -24,24 +24,24 @@ discard block |
||
24 | 24 | return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
25 | 25 | } |
26 | 26 | |
27 | - protected function setUp () |
|
27 | + protected function setUp() |
|
28 | 28 | { |
29 | 29 | parent::setUp(); |
30 | 30 | |
31 | - $this->loadMigrationsFrom(__DIR__ . '/database/migrations'); |
|
31 | + $this->loadMigrationsFrom(__DIR__.'/database/migrations'); |
|
32 | 32 | |
33 | 33 | Route::middleware('web')->group(function() { |
34 | 34 | |
35 | - Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
35 | + Route::get('/import/{id}/progress', ['as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
36 | 36 | |
37 | 37 | }); |
38 | 38 | |
39 | - Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv'); |
|
39 | + Storage::putFileAs('imports', new File(storage_path('test/test.csv')), 'test.csv'); |
|
40 | 40 | |
41 | 41 | $this->import = ModelImport::create([ |
42 | 42 | 'file' => 'imports/test.csv', |
43 | 43 | 'file_rows' => 104, |
44 | - 'db_cols' => [ 'name', 'email', 'password'], |
|
44 | + 'db_cols' => ['name', 'email', 'password'], |
|
45 | 45 | 'model_map' => ['email', 'name', 'password'] |
46 | 46 | ]); |
47 | 47 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | */ |
52 | 52 | public function create_new_import_success() |
53 | 53 | { |
54 | - $import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']); |
|
54 | + $import = Import::createImport('imports/test.csv', ['name', 'email', 'password']); |
|
55 | 55 | |
56 | 56 | $this->assertInstanceOf(ModelImport::class, $import); |
57 | 57 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | $csv_data = Import::getImportFileData($this->import->id); |
75 | 75 | |
76 | - $this->assertInternalType( 'array', $csv_data ); |
|
76 | + $this->assertInternalType('array', $csv_data); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | Queue::fake(); |
97 | 97 | |
98 | - Import::dispatchImportJob( FakeJob::class, $import ); |
|
98 | + Import::dispatchImportJob(FakeJob::class, $import); |
|
99 | 99 | |
100 | 100 | Queue::assertPushedOn('importing', FakeJob::class); |
101 | 101 | } |
@@ -105,13 +105,13 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function check_import_progress() |
107 | 107 | { |
108 | - $response = $this->json( 'GET', '/import/1/progress' ); |
|
108 | + $response = $this->json('GET', '/import/1/progress'); |
|
109 | 109 | |
110 | 110 | $response->assertStatus(200); |
111 | 111 | |
112 | - $response->assertJsonFragment( ['status' => 200] ); |
|
112 | + $response->assertJsonFragment(['status' => 200]); |
|
113 | 113 | |
114 | - $response->assertJsonFragment( ['progress'] ); |
|
114 | + $response->assertJsonFragment(['progress']); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |