hamedandClaude Opus 5
2e0888e0ef
Phase 3 of the tenant-marking series. The same concept was written four ways, and the Doctrine filter arriving in phase 4 keys on the field name — so the tables using a different spelling would have been skipped silently, which is exactly the leak this work exists to prevent. - discount_rules: owner_type/owner_id renamed to entity_type/entity_id. Pure rename, no data moves. - doctor_secretaries: owner_type plus a nullable clinic_id replaced by the shared pair. The environment now comes from the clinic argument alone, so the inconsistent combination (owner_type='clinic', clinic_id=NULL) can no longer be constructed, and the redundant constructor parameter is gone. - user_active_context: added db_type, so resolving an environment is one lookup instead of "try clinics, then try doctors". Filled from the type already present in available_contexts. - entity_type is VARCHAR(10) in all twenty tenant tables; four of them were 20. Behaviour change, the only one in this series: the doctor_secretaries unique key went from (doctor_id, secretary_id, owner_type) to (doctor_id, secretary_id, entity_type, entity_id). With clinic_id outside the key, one secretary could not be assigned to the same doctor in two clinics — the second row collided on owner_type='clinic'. The duplicate check in SecretaryController had the same blind spot and would have rejected the request before the database saw it; both are fixed together. Correcting an assumption from the phase-3 plan: mobile_verification_otp.entity_type really is a tenant pair. NotificationMobileController validates the target against ['doctor','clinic'] and stores that entity's id, so the column was normalised with the rest rather than treated as unrelated. TenantOwnedTrait gained assignTenantPair() for callers that resolved the pair as scalars and hold no entity — building an EntityContext from scalars would produce one where isClinic() is true but ->clinic is null, breaking consumers silently. tests/ApiTestCase::createUser now retries on a duplicate mobile. db_test is never reset and already holds ~38k users, so the 9-digit random draw collided often enough to fail unrelated tests a few percent of runs. Tests: 830 passing. PHPStan reports no new errors on the changed files. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
83 lines
3.5 KiB
PHP
83 lines
3.5 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace DoctrineMigrations;
|
|
|
|
use Doctrine\DBAL\Schema\Schema;
|
|
use Doctrine\Migrations\AbstractMigration;
|
|
|
|
/**
|
|
* Phase 3 of the tenant-marking series: doctor_secretaries kept the tenant as
|
|
* owner_type plus a nullable clinic_id, and its unique key covered only
|
|
* (doctor_id, secretary_id, owner_type). With clinic_id outside the key, the
|
|
* same secretary could not be assigned to the same doctor in two clinics — the
|
|
* second row collided on owner_type = 'clinic'. Folding the pair into the key
|
|
* fixes that, and is the one deliberate behaviour change in this series.
|
|
*
|
|
* Statements run through $this->connection so the guards can sit between the
|
|
* backfill and the NOT NULL change; addSql() would defer them to the end.
|
|
*/
|
|
final class Version20260728080516 extends AbstractMigration
|
|
{
|
|
public function getDescription(): string
|
|
{
|
|
return 'Replace doctor_secretaries.owner_type with the shared tenant pair and widen its unique key';
|
|
}
|
|
|
|
public function up(Schema $schema): void
|
|
{
|
|
$this->connection->executeStatement(
|
|
'ALTER TABLE doctor_secretaries ADD entity_type VARCHAR(10) NULL, ADD entity_id INT NULL'
|
|
);
|
|
|
|
// A row claiming the clinic environment without a clinic is data we cannot
|
|
// interpret; stop and let a human decide rather than guessing an owner.
|
|
$broken = $this->connection->fetchFirstColumn(
|
|
"SELECT id FROM doctor_secretaries WHERE owner_type = 'clinic' AND clinic_id IS NULL"
|
|
);
|
|
$this->abortIf(
|
|
$broken !== [],
|
|
'Inconsistent doctor_secretaries rows (owner_type=clinic, clinic_id NULL): ' . implode(',', $broken)
|
|
);
|
|
|
|
$this->connection->executeStatement(
|
|
"UPDATE doctor_secretaries
|
|
SET entity_type = owner_type,
|
|
entity_id = IF(owner_type = 'clinic', clinic_id, doctor_id)"
|
|
);
|
|
|
|
$remaining = (int) $this->connection->fetchOne(
|
|
'SELECT COUNT(*) FROM doctor_secretaries WHERE entity_type IS NULL OR entity_id IS NULL'
|
|
);
|
|
$this->abortIf($remaining > 0, "Backfill left {$remaining} doctor_secretaries rows without a tenant.");
|
|
|
|
$this->connection->executeStatement(
|
|
'ALTER TABLE doctor_secretaries MODIFY entity_type VARCHAR(10) NOT NULL, MODIFY entity_id INT NOT NULL'
|
|
);
|
|
|
|
// Replacement key first, so the table is never without uniqueness cover.
|
|
$this->connection->executeStatement(
|
|
'CREATE UNIQUE INDEX uniq_doctor_secretary_scope
|
|
ON doctor_secretaries (doctor_id, secretary_id, entity_type, entity_id)'
|
|
);
|
|
$this->connection->executeStatement('DROP INDEX idx_doctor_secretary_scope ON doctor_secretaries');
|
|
$this->connection->executeStatement('ALTER TABLE doctor_secretaries DROP owner_type');
|
|
}
|
|
|
|
public function down(Schema $schema): void
|
|
{
|
|
$this->addSql("ALTER TABLE doctor_secretaries ADD owner_type VARCHAR(10) DEFAULT 'doctor' NOT NULL");
|
|
$this->addSql('UPDATE doctor_secretaries SET owner_type = entity_type');
|
|
$this->addSql('CREATE UNIQUE INDEX idx_doctor_secretary_scope ON doctor_secretaries (doctor_id, secretary_id, owner_type)');
|
|
$this->addSql('DROP INDEX uniq_doctor_secretary_scope ON doctor_secretaries');
|
|
$this->addSql('ALTER TABLE doctor_secretaries DROP entity_type, DROP entity_id');
|
|
}
|
|
|
|
/** DDL on MariaDB commits implicitly; wrapping up() in a transaction would be a lie. */
|
|
public function isTransactional(): bool
|
|
{
|
|
return false;
|
|
}
|
|
}
|