Updated to v1.5.2

This commit is contained in:
Henry Whitaker
2020-06-17 18:33:53 +01:00
parent 248151bbb1
commit 7d0681e77b
421 changed files with 17754 additions and 50070 deletions

View File

@@ -10,21 +10,26 @@ use Illuminate\Support\Facades\Validator;
class BackupController extends Controller
{
public function backup()
public function backup(Request $request)
{
$data = BackupHelper::backup();
$timestamp = new DateTime();
$timestamp = $timestamp->format('Y-m-d_H:i:s');
$name = 'speedtest_backup_' . $timestamp . '.json';
Storage::disk('local')->put($name, $data);
$validator = Validator::make($request->all(), [ 'format' => 'in:json,csv' ]);
if($validator->fails()) {
return response()->json([
'method' => 'backup data',
'error' => $validator->errors(),
], 422);
}
return Storage::disk('local')->download($name);
$filename = BackupHelper::backup($request->format);
return Storage::disk('local')->download($filename);
}
public function restore(Request $request)
{
$rule = [
'data' => [ 'required', 'array' ],
'data' => [ 'required' ],
'format' => [ 'required', 'in:json,csv' ]
];
$validator = Validator::make($request->all(), $rule);
@@ -35,10 +40,14 @@ class BackupController extends Controller
], 422);
}
BackupHelper::restore($request->data);
return response()->json([
'method' => 'restore data from backup',
], 200);
if(BackupHelper::restore($request->data, $request->format) != false) {
return response()->json([
'method' => 'restore data from backup',
], 200);
} else {
return response()->json([
'method' => 'incorrect backup format',
], 422);
}
}
}