Skip to content

Commit 592b8f2

Browse files
codedmonkeycodedmonkey
committed
Update Version entity with metadata entities integration
Signed-off-by: Tim Goudriaan <tim@codedmonkey.com>
1 parent 75154af commit 592b8f2

File tree

15 files changed

+224
-97
lines changed

15 files changed

+224
-97
lines changed

‎migrations/Version20260120114538.php‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ public function up(Schema $schema): void
1818
{
1919
$this->createMetadataTables();
2020
$this->fillMetadataTables();
21+
$this->addCurrentMetadataColumnToVersionTable();
22+
$this->updateVersionTableColumns();
2123
}
2224

2325
public function down(Schema $schema): void
2426
{
27+
$this->revertVersionTableColumns();
28+
$this->dropCurrentMetadataColumnFromVersionTable();
2529
$this->fillVersionTables();
2630
$this->dropMetadataTables();
2731
}
@@ -292,6 +296,106 @@ private function fillMetadataTables(): void
292296
}
293297
}
294298

299+
private function addCurrentMetadataColumnToVersionTable(): void
300+
{
301+
$this->addSql(<<<'SQL'
302+
ALTER TABLE version ADD current_metadata_id INT DEFAULT NULL
303+
SQL);
304+
$this->addSql(<<<'SQL'
305+
ALTER TABLE
306+
version
307+
ADD
308+
CONSTRAINT FK_BF1CD3C3624A4280 FOREIGN KEY (current_metadata_id) REFERENCES metadata (id)
309+
SQL);
310+
$this->addSql(<<<'SQL'
311+
CREATE UNIQUE INDEX UNIQ_BF1CD3C3624A4280 ON version (current_metadata_id)
312+
SQL);
313+
314+
$this->addSql(<<<'SQL'
315+
UPDATE version
316+
SET current_metadata_id = metadata.id
317+
FROM metadata
318+
WHERE metadata.version_id = version.id
319+
SQL);
320+
}
321+
322+
private function updateVersionTableColumns(): void
323+
{
324+
$this->addSql(<<<'SQL'
325+
DROP INDEX pkg_ver_idx
326+
SQL);
327+
$this->addSql(<<<'SQL'
328+
ALTER TABLE version RENAME COLUMN name TO package_name
329+
SQL);
330+
$this->addSql(<<<'SQL'
331+
ALTER TABLE version RENAME COLUMN version TO name
332+
SQL);
333+
$this->addSql(<<<'SQL'
334+
ALTER TABLE version RENAME COLUMN normalized_version TO normalized_name
335+
SQL);
336+
$this->addSql(<<<'SQL'
337+
CREATE UNIQUE INDEX package_version_idx ON version (package_id, normalized_name)
338+
SQL);
339+
340+
$this->addSql(<<<'SQL'
341+
ALTER TABLE version DROP CONSTRAINT fk_bf1cd3c3f44cabff
342+
SQL);
343+
$this->addSql(<<<'SQL'
344+
ALTER TABLE version ALTER package_id SET NOT NULL
345+
SQL);
346+
$this->addSql(<<<'SQL'
347+
ALTER TABLE
348+
version
349+
ADD
350+
CONSTRAINT FK_BF1CD3C3F44CABFF FOREIGN KEY (package_id) REFERENCES package (id) ON DELETE CASCADE NOT DEFERRABLE
351+
SQL);
352+
}
353+
354+
private function revertVersionTableColumns(): void
355+
{
356+
$this->addSql(<<<'SQL'
357+
DROP INDEX package_version_idx
358+
SQL);
359+
$this->addSql(<<<'SQL'
360+
ALTER TABLE version RENAME COLUMN name TO version
361+
SQL);
362+
$this->addSql(<<<'SQL'
363+
ALTER TABLE version RENAME COLUMN normalized_name TO normalized_version
364+
SQL);
365+
$this->addSql(<<<'SQL'
366+
ALTER TABLE version RENAME COLUMN package_name TO name
367+
SQL);
368+
$this->addSql(<<<'SQL'
369+
CREATE UNIQUE INDEX pkg_ver_idx ON version (package_id, normalized_version)
370+
SQL);
371+
372+
$this->addSql(<<<'SQL'
373+
ALTER TABLE version DROP CONSTRAINT FK_BF1CD3C3F44CABFF
374+
SQL);
375+
$this->addSql(<<<'SQL'
376+
ALTER TABLE version ALTER package_id DROP NOT NULL
377+
SQL);
378+
$this->addSql(<<<'SQL'
379+
ALTER TABLE
380+
version
381+
ADD
382+
CONSTRAINT fk_bf1cd3c3f44cabff FOREIGN KEY (package_id) REFERENCES package (id) NOT DEFERRABLE INITIALLY IMMEDIATE
383+
SQL);
384+
}
385+
386+
private function dropCurrentMetadataColumnFromVersionTable(): void
387+
{
388+
$this->addSql(<<<'SQL'
389+
ALTER TABLE version DROP CONSTRAINT FK_BF1CD3C3624A4280
390+
SQL);
391+
$this->addSql(<<<'SQL'
392+
DROP INDEX UNIQ_BF1CD3C3624A4280
393+
SQL);
394+
$this->addSql(<<<'SQL'
395+
ALTER TABLE version DROP current_metadata_id
396+
SQL);
397+
}
398+
295399
private function fillVersionTables(): void
296400
{
297401
$this->addSql(<<<'SQL'

‎src/Controller/ApiController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function packageDistribution(Request $request, string $reference, string
128128
throw $this->createNotFoundException();
129129
}
130130

131-
if (null === $version = $this->versionRepository->findOneByNormalizedVersion($package, $versionName)) {
131+
if (null === $version = $this->versionRepository->findOneByNormalizedVersionName($package, $versionName)) {
132132
throw $this->createNotFoundException();
133133
}
134134

‎src/Doctrine/Entity/Metadata.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Metadata extends TrackedEntity
8888
#[ORM\Column(nullable: true)]
8989
private ?\DateTimeImmutable $releasedAt = null;
9090

91-
#[ORM\ManyToOne(targetEntity: Version::class)]
91+
#[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'metadata')]
9292
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
9393
private Version $version;
9494

‎src/Doctrine/Entity/Package.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function getVersion(string $normalizedVersion): ?Version
276276
if (!isset($this->cachedVersions)) {
277277
$this->cachedVersions = [];
278278
foreach ($this->getVersions() as $version) {
279-
$this->cachedVersions[strtolower($version->getNormalizedVersion())] = $version;
279+
$this->cachedVersions[strtolower($version->getNormalizedName())] = $version;
280280
}
281281
}
282282

@@ -419,25 +419,25 @@ public function getActiveVersions(): array
419419
$activePrereleaseVersions = [];
420420

421421
foreach ($this->getSortedVersions() as $version) {
422-
if ('stable' !== VersionParser::parseStability($version->getNormalizedVersion())) {
422+
if ('stable' !== VersionParser::parseStability($version->getNormalizedName())) {
423423
continue;
424424
}
425425

426-
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersion());
426+
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedName());
427427

428428
if ('0' === $majorVersion) {
429429
$prereleaseVersion = "$majorVersion.$minorVersion";
430430

431431
$activePrereleaseVersions[$prereleaseVersion] ??= $version;
432-
if (version_compare($version->getNormalizedVersion(), $activePrereleaseVersions[$prereleaseVersion]->getNormalizedVersion(), '>')) {
432+
if (version_compare($version->getNormalizedName(), $activePrereleaseVersions[$prereleaseVersion]->getNormalizedName(), '>')) {
433433
$activePrereleaseVersions[$prereleaseVersion] = $version;
434434
}
435435

436436
continue;
437437
}
438438

439439
$activeVersions[$majorVersion] ??= $version;
440-
if (version_compare($version->getNormalizedVersion(), $activeVersions[$majorVersion]->getNormalizedVersion(), '>')) {
440+
if (version_compare($version->getNormalizedName(), $activeVersions[$majorVersion]->getNormalizedName(), '>')) {
441441
$activeVersions[$majorVersion] = $version;
442442
}
443443
}
@@ -447,34 +447,34 @@ public function getActiveVersions(): array
447447

448448
// Find newer unstable releases of active versions
449449
foreach ($this->getSortedVersions() as $version) {
450-
if (in_array(VersionParser::parseStability($version->getNormalizedVersion()), ['stable', 'dev'], true)) {
450+
if (in_array(VersionParser::parseStability($version->getNormalizedName()), ['stable', 'dev'], true)) {
451451
continue;
452452
}
453453

454-
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersion());
454+
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedName());
455455

456456
$developmentVersion = "$majorVersion.$minorVersion";
457457

458458
if ('0' === $majorVersion) {
459-
if (isset($activePrereleaseVersions[$developmentVersion]) && !version_compare($version->getNormalizedVersion(), $activePrereleaseVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
459+
if (isset($activePrereleaseVersions[$developmentVersion]) && !version_compare($version->getNormalizedName(), $activePrereleaseVersions[$developmentVersion]->getNormalizedName(), '>')) {
460460
continue;
461461
}
462462

463463
$activePrereleaseDevelopmentVersions[$developmentVersion] ??= $version;
464-
if (version_compare($version->getNormalizedVersion(), $activePrereleaseDevelopmentVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
464+
if (version_compare($version->getNormalizedName(), $activePrereleaseDevelopmentVersions[$developmentVersion]->getNormalizedName(), '>')) {
465465
$activePrereleaseDevelopmentVersions[$developmentVersion] = $version;
466466
}
467467

468468
continue;
469469
}
470470

471-
if (isset($activeVersions[$majorVersion]) && !version_compare($version->getNormalizedVersion(), $activeVersions[$majorVersion]->getNormalizedVersion(), '>')) {
471+
if (isset($activeVersions[$majorVersion]) && !version_compare($version->getNormalizedName(), $activeVersions[$majorVersion]->getNormalizedName(), '>')) {
472472
continue;
473473
}
474474

475475
$activeDevelopmentVersions[$developmentVersion] ??= $version;
476-
if (version_compare($version->getNormalizedVersion(), $activeDevelopmentVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
477-
$activeDevelopmentVersions[$version->getNormalizedVersion()] = $version;
476+
if (version_compare($version->getNormalizedName(), $activeDevelopmentVersions[$developmentVersion]->getNormalizedName(), '>')) {
477+
$activeDevelopmentVersions[$version->getNormalizedName()] = $version;
478478
}
479479
}
480480

@@ -514,7 +514,7 @@ public function getHistoricalVersions(): array
514514
public function getDevVersions(): array
515515
{
516516
return array_filter($this->getSortedVersions(), static function (Version $version) {
517-
if (str_ends_with($version->getNormalizedVersion(), '.9999999-dev')) {
517+
if (str_ends_with($version->getNormalizedName(), '.9999999-dev')) {
518518
return true;
519519
}
520520

@@ -531,13 +531,13 @@ public function getDevVersions(): array
531531
*/
532532
public function getDevBranchVersions(): array
533533
{
534-
return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedVersion(), 'dev-'));
534+
return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedName(), 'dev-'));
535535
}
536536

537537
public static function sortVersions(Version $a, Version $b): int
538538
{
539-
$aVersion = $a->getNormalizedVersion();
540-
$bVersion = $b->getNormalizedVersion();
539+
$aVersion = $a->getNormalizedName();
540+
$bVersion = $b->getNormalizedName();
541541

542542
// use branch alias for sorting if one is provided
543543
if (isset($a->getExtra()['branch-alias'][$aVersion])) {
@@ -562,7 +562,7 @@ public static function sortVersions(Version $a, Version $b): int
562562
if ($aVersion === $bVersion) {
563563
// make sure sort is stable
564564
if ($a->getReleasedAt() === $b->getReleasedAt()) {
565-
return $a->getNormalizedVersion() <=> $b->getNormalizedVersion();
565+
return $a->getNormalizedName() <=> $b->getNormalizedName();
566566
}
567567

568568
return $b->getReleasedAt() > $a->getReleasedAt() ? 1 : -1;

0 commit comments

Comments
 (0)