|
|
@ -49,9 +49,9 @@ class UpdateCovidData implements ShouldQueue |
|
|
$attr["tested"] = $data["tested"] ?? null; |
|
|
$attr["tested"] = $data["tested"] ?? null; |
|
|
$attr["created_at"] = Carbon::createFromFormat('Y-m-d\TH:i:s+', $data["lastUpdatedAtApify"]); |
|
|
$attr["created_at"] = Carbon::createFromFormat('Y-m-d\TH:i:s+', $data["lastUpdatedAtApify"]); |
|
|
$idx = Carbon::parse($data["lastUpdatedAtApify"])->format('Y-m-d'); |
|
|
$idx = Carbon::parse($data["lastUpdatedAtApify"])->format('Y-m-d'); |
|
|
if(!isset($data_arr[$idx])){ |
|
|
if (!isset($data_arr[$idx])) { |
|
|
$data_arr[$idx] = $attr; |
|
|
$data_arr[$idx] = $attr; |
|
|
}else if($attr["created_at"] > $data_arr[$idx]["created_at"]){ |
|
|
} else if ($attr["created_at"] > $data_arr[$idx]["created_at"]) { |
|
|
$data_arr[$idx]["infected"] == $attr["infected"] ?? $data_arr[$idx]["infected"]; |
|
|
$data_arr[$idx]["infected"] == $attr["infected"] ?? $data_arr[$idx]["infected"]; |
|
|
$data_arr[$idx]["deceased"] == $attr["deceased"] ?? $data_arr[$idx]["deceased"]; |
|
|
$data_arr[$idx]["deceased"] == $attr["deceased"] ?? $data_arr[$idx]["deceased"]; |
|
|
$data_arr[$idx]["recovered"] == $attr["recovered"] ?? $data_arr[$idx]["recovered"]; |
|
|
$data_arr[$idx]["recovered"] == $attr["recovered"] ?? $data_arr[$idx]["recovered"]; |
|
|
@ -63,7 +63,28 @@ class UpdateCovidData implements ShouldQueue |
|
|
dd($data, $e); |
|
|
dd($data, $e); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
foreach($data_arr as $attr){ |
|
|
$prevDate = null; |
|
|
|
|
|
$new_data_arr = []; |
|
|
|
|
|
foreach ($data_arr as $attr) { |
|
|
|
|
|
if ($prevDate != null) { |
|
|
|
|
|
$target = clone ($attr["created_at"]); |
|
|
|
|
|
$target->subDay(); |
|
|
|
|
|
while ($prevDate->format('Y-m-d') != $target->format('Y-m-d')) { |
|
|
|
|
|
$prevDate->addDay(); |
|
|
|
|
|
$newEntry = $attr; |
|
|
|
|
|
$newEntry["created_at"] = clone ($prevDate); |
|
|
|
|
|
$new_data_arr[$prevDate->format('Y-m-d')] = $newEntry; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
try { |
|
|
|
|
|
$new_data_arr[$attr["created_at"]->format('Y-m-d')] = $attr; |
|
|
|
|
|
$prevDate = $attr["created_at"]; |
|
|
|
|
|
} catch (\Exception $e) { |
|
|
|
|
|
dd($attr["created_at"], $e); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
foreach ($new_data_arr as $attr) { |
|
|
$d = new CovidData($attr); |
|
|
$d = new CovidData($attr); |
|
|
$d->save(); |
|
|
$d->save(); |
|
|
} |
|
|
} |
|
|
|