-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #684 from wri/release/xrayed-xylocarpus
[RELEASE] X-Rayed Xylocarpus
- Loading branch information
Showing
426 changed files
with
6,187 additions
and
15,401 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,3 +20,4 @@ swagger.json | |
| .php-cs-fixer.cache | ||
| .phpunit.result.cache | ||
| .DS_Store | ||
| /data | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
|
|
||
| namespace App\Console\Commands\OneOff; | ||
|
|
||
| use App\Models\V2\Demographics\DemographicEntry; | ||
| use Illuminate\Console\Command; | ||
|
|
||
| class FixDemographicNameType extends Command | ||
| { | ||
| /** | ||
| * The name and signature of the console command. | ||
| * | ||
| * @var string | ||
| */ | ||
| protected $signature = 'one-off:fix-demographic-name-type'; | ||
|
|
||
| /** | ||
| * The console command description. | ||
| * | ||
| * @var string | ||
| */ | ||
| protected $description = 'Moves several system-defined names from the name column to type in demographic_entities'; | ||
|
|
||
| protected const UPDATED_MAPPINGS = [ | ||
| DemographicEntry::GENDER => DemographicEntry::GENDERS, | ||
| DemographicEntry::AGE => DemographicEntry::AGES, | ||
| DemographicEntry::CASTE => DemographicEntry::CASTES, | ||
| ]; | ||
|
|
||
| /** | ||
| * Execute the console command. | ||
| */ | ||
| public function handle() | ||
| { | ||
| foreach (self::UPDATED_MAPPINGS as $type => $subtypes) { | ||
| foreach ($subtypes as $subtype) { | ||
| $this->info("Updating subtype mapping [type=$type, subtype=$subtype]"); | ||
| DemographicEntry::withTrashed() | ||
| ->where(['type' => $type, 'name' => $subtype]) | ||
| ->update(['subtype' => $subtype, 'name' => null, 'updated_at' => 'now()']); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
|
|
||
| namespace App\Console\Commands\OneOff; | ||
|
|
||
| use App\Console\Commands\Traits\Abortable; | ||
| use App\Console\Commands\Traits\AbortException; | ||
| use App\Models\V2\Demographics\Demographic; | ||
| use Illuminate\Console\Command; | ||
|
|
||
| class FixDuplicateWorkdays extends Command | ||
| { | ||
| use Abortable; | ||
|
|
||
| /** | ||
| * The name and signature of the console command. | ||
| * | ||
| * @var string | ||
| */ | ||
| protected $signature = 'one-off:fix-duplicate-workdays'; | ||
|
|
||
| /** | ||
| * The console command description. | ||
| * | ||
| * @var string | ||
| */ | ||
| protected $description = 'Fixes instances of duplicated Workdays'; | ||
|
|
||
| /** | ||
| * Execute the console command. | ||
| */ | ||
| public function handle() | ||
| { | ||
| $this->executeAbortableScript(function () { | ||
| # Find all instances of workdays that are duplicated across the same type, id and collection. | ||
| $dupes = Demographic::select('demographical_type', 'demographical_id', 'collection') | ||
| ->type(Demographic::WORKDAY_TYPE) | ||
| ->groupBy('demographical_type', 'demographical_id', 'collection') | ||
| ->havingRaw('count(*) > ?', [1]) | ||
| ->get(); | ||
|
|
||
| $errors = []; | ||
| foreach ($dupes as $dupe) { | ||
| try { | ||
| $this->removeDuplicates($dupe); | ||
| } catch (AbortException $e) { | ||
| $errors[] = $e; | ||
| } | ||
| } | ||
|
|
||
| $this->info("Completed processing {$dupes->count()} duplicated workdays\n\n"); | ||
|
|
||
| if (count($errors) > 0) { | ||
| $this->warn('Entries that were not resolved: '); | ||
| foreach ($errors as $error) { | ||
| $this->warn($error->getMessage()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * @throws AbortException | ||
| */ | ||
| private function removeDuplicates($dupe) | ||
| { | ||
| $workdays = Demographic::where([ | ||
| 'demographical_type' => $dupe->demographical_type, | ||
| 'demographical_id' => $dupe->demographical_id, | ||
| 'type' => Demographic::WORKDAY_TYPE, | ||
| 'collection' => $dupe->collection, | ||
| ])->get(); | ||
|
|
||
| $type = explode('\\', $dupe->demographical_type); | ||
| $params = json_encode([ | ||
| 'type' => array_pop($type), | ||
| 'id' => $dupe->demographical_id, | ||
| 'uuid' => $workdays->first()->demographical->uuid, | ||
| 'collection' => $dupe->collection, | ||
| ]); | ||
| $this->assert( | ||
| $workdays->map(fn ($w) => $w->visible)->unique()->count() == 1, | ||
| "Visible not identical: $params" | ||
| ); | ||
| $this->assert( | ||
| $workdays->map(fn ($w) => $w->description)->unique()->count() == 1, | ||
| "Description not identical: $params" | ||
| ); | ||
|
|
||
| // Some of these workdays have had updates. This check makes sure that either all the demographics have the | ||
| // same updated stamp (meaning that none have been updated, or they were all updated together), or that if | ||
| // there is something updated, the first one on the list is the most recently updated one, as we would expect. | ||
| $mostRecentUpdated = $workdays->sortBy('updated_at')->last(); | ||
| $numberUpdatedDates = $workdays->map(fn ($w) => $w->updated_at)->unique()->count(); | ||
| $this->assert($numberUpdatedDates == 1 || $mostRecentUpdated == $workdays->first(), "First is not the most recently updated: $params"); | ||
|
|
||
| // If we made it through the checks above, it's considered safe to delete all the workdays after the first one. | ||
| $this->info("Removing dupes: [$dupe->demographical_type, $dupe->demographical_id, $dupe->collection]"); | ||
| foreach ($workdays->slice(1) as $workday) { | ||
| $workday->entries()->delete(); | ||
| $workday->delete(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.