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>
65 lines
2.2 KiB
PHP
65 lines
2.2 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: user_active_context stored only a
|
|
* db_uuid, which forced every environment lookup to try clinics first and fall
|
|
* back to doctors. db_type records which of the two the uuid addresses.
|
|
*
|
|
* Backfilled by matching the uuid against both tables. Rows whose uuid no longer
|
|
* resolves are deleted rather than guessed: this table is a cache of "the last
|
|
* environment the user picked", and losing a row simply sends the resolver back
|
|
* to its role fallback — the same state a brand-new user is in. This is the only
|
|
* migration in the series allowed to delete rows.
|
|
*/
|
|
final class Version20260728080955 extends AbstractMigration
|
|
{
|
|
public function getDescription(): string
|
|
{
|
|
return 'Record whether user_active_context.db_uuid points at a doctor or a clinic';
|
|
}
|
|
|
|
public function up(Schema $schema): void
|
|
{
|
|
$this->connection->executeStatement(
|
|
'ALTER TABLE user_active_context ADD db_type VARCHAR(10) NULL'
|
|
);
|
|
|
|
$this->connection->executeStatement(
|
|
"UPDATE user_active_context uac JOIN clinics c ON c.uuid = uac.db_uuid SET uac.db_type = 'clinic'"
|
|
);
|
|
$this->connection->executeStatement(
|
|
"UPDATE user_active_context uac JOIN doctors d ON d.uuid = uac.db_uuid
|
|
SET uac.db_type = 'doctor' WHERE uac.db_type IS NULL"
|
|
);
|
|
|
|
$orphans = (int) $this->connection->executeStatement(
|
|
'DELETE FROM user_active_context WHERE db_type IS NULL'
|
|
);
|
|
if ($orphans > 0) {
|
|
$this->write("Dropped {$orphans} active-context rows whose db_uuid no longer resolves.");
|
|
}
|
|
|
|
$this->connection->executeStatement(
|
|
'ALTER TABLE user_active_context MODIFY db_type VARCHAR(10) NOT NULL'
|
|
);
|
|
}
|
|
|
|
public function down(Schema $schema): void
|
|
{
|
|
$this->addSql('ALTER TABLE user_active_context DROP db_type');
|
|
}
|
|
|
|
/** DDL on MariaDB commits implicitly; wrapping up() in a transaction would be a lie. */
|
|
public function isTransactional(): bool
|
|
{
|
|
return false;
|
|
}
|
|
}
|