From 0ce95f8c519c5c47473a0ec093d02087edc98a7d Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Sun, 30 Nov 2025 12:15:15 +0100
Subject: [PATCH 1/2] Remove collection of emails for self-registered users

---
 webapp/migrations/Version20251130111340.php   | 31 +++++++++++++++++++
 webapp/src/Controller/API/UserController.php  |  1 -
 .../Test/SelfRegisteredUserFixture.php        |  1 -
 webapp/src/Entity/User.php                    | 17 ----------
 4 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 webapp/migrations/Version20251130111340.php

diff --git a/webapp/migrations/Version20251130111340.php b/webapp/migrations/Version20251130111340.php
new file mode 100644
index 0000000000..6e2e9d4139
--- /dev/null
+++ b/webapp/migrations/Version20251130111340.php
@@ -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;
+    }
+}
diff --git a/webapp/src/Controller/API/UserController.php b/webapp/src/Controller/API/UserController.php
index e3135ce267..4dcbb59e38 100644
--- a/webapp/src/Controller/API/UserController.php
+++ b/webapp/src/Controller/API/UserController.php
@@ -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);
diff --git a/webapp/src/DataFixtures/Test/SelfRegisteredUserFixture.php b/webapp/src/DataFixtures/Test/SelfRegisteredUserFixture.php
index 6cfc8b48fa..1bf214fd3e 100644
--- a/webapp/src/DataFixtures/Test/SelfRegisteredUserFixture.php
+++ b/webapp/src/DataFixtures/Test/SelfRegisteredUserFixture.php
@@ -15,7 +15,6 @@ public function load(ObjectManager $manager): void
         $user
             ->setUsername('selfregister')
             ->setName('selfregistered user for example team')
-            ->setEmail('electronic@mail.tld')
             ->setPlainPassword('demo')
             ->setTeam($manager->getRepository(Team::class)->findOneBy(['name' => 'exteam']))
             ->addUserRole($manager->getRepository(Role::class)->findOneBy(['dj_role' => 'team']));
diff --git a/webapp/src/Entity/User.php b/webapp/src/Entity/User.php
index e829805659..527a106503 100644
--- a/webapp/src/Entity/User.php
+++ b/webapp/src/Entity/User.php
@@ -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,
@@ -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;

From a7e73a16b3740de5bc45f52decddc0453ad497f8 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Sun, 30 Nov 2025 13:14:48 +0100
Subject: [PATCH 2/2] Alternative, don't make it for new installs

---
 webapp/migrations/Version20190803123217.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/migrations/Version20190803123217.php b/webapp/migrations/Version20190803123217.php
index 3adaacdf0e..eca9f8a875 100644
--- a/webapp/migrations/Version20190803123217.php
+++ b/webapp/migrations/Version20190803123217.php
@@ -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',