From 6d0ca4e75af9cd1821bd91617cf6409c9c9cfd76 Mon Sep 17 00:00:00 2001 From: Steven Rombauts Date: Thu, 9 Oct 2025 16:00:42 +0200 Subject: [PATCH] Rename `userId` to `actorId` in `AuditRecord` --- src/Entity/AuditRecord.php | 18 +++++++++--------- src/Entity/AuditRecordRepository.php | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Entity/AuditRecord.php b/src/Entity/AuditRecord.php index ab130482c..ec26462a3 100644 --- a/src/Entity/AuditRecord.php +++ b/src/Entity/AuditRecord.php @@ -40,7 +40,7 @@ private function __construct( #[ORM\Column(type: Types::JSON)] public readonly array $attributes, #[ORM\Column(nullable: true)] - public readonly ?int $userId = null, + public readonly ?int $actorId = null, #[ORM\Column(nullable: true)] public readonly ?string $vendor = null, #[ORM\Column(nullable: true)] @@ -50,26 +50,26 @@ private function __construct( $this->datetime = new \DateTimeImmutable(); } - public static function packageCreated(Package $package, ?User $user): self + public static function packageCreated(Package $package, ?User $actor): self { - return new self(AuditRecordType::PackageCreated, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($user)], $user?->getId(), $package->getVendor(), $package->getId()); + return new self(AuditRecordType::PackageCreated, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($actor)], $actor?->getId(), $package->getVendor(), $package->getId()); } - public static function packageDeleted(Package $package, ?User $user): self + public static function packageDeleted(Package $package, ?User $actor): self { - return new self(AuditRecordType::PackageDeleted, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($user, 'automation')], $user?->getId(), $package->getVendor(), $package->getId()); + return new self(AuditRecordType::PackageDeleted, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($actor, 'automation')], $actor?->getId(), $package->getVendor(), $package->getId()); } - public static function canonicalUrlChange(Package $package, ?User $user, string $oldRepository): self + public static function canonicalUrlChange(Package $package, ?User $actor, string $oldRepository): self { - return new self(AuditRecordType::CanonicalUrlChange, ['name' => $package->getName(), 'repository_from' => $oldRepository, 'repository_to' => $package->getRepository(), 'actor' => self::getUserData($user)], $user?->getId(), $package->getVendor(), $package->getId()); + return new self(AuditRecordType::CanonicalUrlChange, ['name' => $package->getName(), 'repository_from' => $oldRepository, 'repository_to' => $package->getRepository(), 'actor' => self::getUserData($actor)], $actor?->getId(), $package->getVendor(), $package->getId()); } - public static function versionDeleted(Version $version, ?User $user): self + public static function versionDeleted(Version $version, ?User $actor): self { $package = $version->getPackage(); - return new self(AuditRecordType::VersionDeleted, ['name' => $package->getName(), 'version' => $version->getVersion(), 'actor' => self::getUserData($user, 'automation')], $user?->getId(), $package->getVendor(), $package->getId()); + return new self(AuditRecordType::VersionDeleted, ['name' => $package->getName(), 'version' => $version->getVersion(), 'actor' => self::getUserData($actor, 'automation')], $actor?->getId(), $package->getVendor(), $package->getId()); } public static function versionReferenceChange(Version $version, ?string $oldSourceReference, ?string $oldDistReference): self diff --git a/src/Entity/AuditRecordRepository.php b/src/Entity/AuditRecordRepository.php index 7a83308cc..cc552b07b 100644 --- a/src/Entity/AuditRecordRepository.php +++ b/src/Entity/AuditRecordRepository.php @@ -55,7 +55,7 @@ public function insert(AuditRecord $record): void 'datetime' => $record->datetime, 'type' => $record->type->value, 'attributes' => $record->attributes, - 'userId' => $record->userId, + 'actorId' => $record->actorId, 'vendor' => $record->vendor, 'packageId' => $record->packageId, ], [