Skip to content

Rename userId to actorId in AuditRecord #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2025
Merged

Rename userId to actorId in AuditRecord #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/Entity/AuditRecord.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Entity/AuditRecordRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
], [
Expand Down