Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion webapp/migrations/Version20190803123217.php
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@ protected function createTables()
`userid` int(4) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Unique ID',
`username` varchar(255) NOT NULL COMMENT 'User login name',
`name` varchar(255) NOT NULL COMMENT 'Name',
`email` varchar(255) DEFAULT NULL COMMENT 'Email address',
`last_login` decimal(32,9) unsigned DEFAULT NULL COMMENT 'Time of last successful login',
`first_login` decimal(32,9) unsigned DEFAULT NULL COMMENT 'Time of first login',
`last_ip_address` varchar(255) DEFAULT NULL COMMENT 'Last IP address of successful login',
Expand Down
31 changes: 31 additions & 0 deletions webapp/migrations/Version20251130111340.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

final class Version20251130111340 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}

public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE user DROP email');
}

public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE user ADD email VARCHAR(255) DEFAULT NULL COMMENT \'Email address\'');
}

public function isTransactional(): bool
{
return false;
}
}
1 change: 0 additions & 1 deletion webapp/src/Controller/API/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ protected function addOrUpdateUser(AddUser $addUser, Request $request): Response
$user
->setUsername($addUser->username)
->setName($addUser->name)
->setEmail($addUser->email)
->setIpAddress($addUser->ip)
->setPlainPassword($addUser->password)
->setEnabled($addUser->enabled ?? true);
Expand Down
1 change: 0 additions & 1 deletion webapp/src/DataFixtures/Test/SelfRegisteredUserFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public function load(ObjectManager $manager): void
$user
->setUsername('selfregister')
->setName('selfregistered user for example team')
->setEmail('[email protected]')
->setPlainPassword('demo')
->setTeam($manager->getRepository(Team::class)->findOneBy(['name' => 'exteam']))
->addUserRole($manager->getRepository(Role::class)->findOneBy(['dj_role' => 'team']));
Expand Down
17 changes: 0 additions & 17 deletions webapp/src/Entity/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ class User extends BaseApiEntity implements
#[ORM\Column(options: ['comment' => 'Name'])]
private string $name = '';

#[ORM\Column(nullable: true, options: ['comment' => 'Email address'])]
#[Assert\Email]
#[OA\Property(nullable: true)]
#[Serializer\Groups([ARC::GROUP_NONSTRICT])]
private ?string $email = null;

#[ORM\Column(
type: 'decimal',
precision: 32,
Expand Down Expand Up @@ -217,17 +211,6 @@ public function getShortDescription(): string
return $this->getName();
}

public function setEmail(?string $email): User
{
$this->email = $email;
return $this;
}

public function getEmail(): ?string
{
return $this->email;
}

public function setLastLogin(string|float|null $lastLogin): User
{
$this->last_login = $lastLogin;
Expand Down
Loading