Merge pull request #372 from pythoncanarias/issue#371

Nuevo campo de email de socio, obligatorio y único

Author: euribates

apps/api/views.py

@@ -135,7 +135,7 @@ def serializer_staff(position):
         'position': position.get_position_display(),
         'first_name': position.member.user.first_name,
         'last_name': position.member.user.last_name,
-        'email': position.member.user.email,
+        'email': position.member.email,
     }
 
 

…rs/migrations/0022_auto_20210613_2114.py …rs/migrations/0022_auto_20210604_1031.pyapps/members/migrations/0022_auto_20210613_2114.py renamed to apps/members/migrations/0022_auto_20210604_1031.py apps/members/migrations/0022_auto_20210613_2114.py renamed to apps/members/migrations/0022_auto_20210604_1031.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2021-06-13 20:14
+# Generated by Django 2.2.20 on 2021-06-04 10:31
 
 from django.db import migrations
 

apps/members/migrations/0023_member_email.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2021-09-22 18:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0022_auto_20210604_1031'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='member',
+            name='email',
+            field=models.EmailField(blank=True, default='', max_length=320),
+        ),
+    ]

apps/members/migrations/0024_copy_member_email_from_user_model.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.2.24 on 2021-09-22 18:45
+
+from django.db import migrations
+
+
+def get_email_from_user(apps, schema_editor):
+    Member = apps.get_model('members', 'Member')
+    for member in Member.objects.all():
+        member.email = member.user.email
+        member.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0023_member_email'),
+    ]
+
+    operations = [
+        migrations.RunPython(get_email_from_user)
+    ]

apps/members/migrations/0025_email_mandatory_and_unique.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2021-09-22 18:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0024_copy_member_email_from_user_model'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='member',
+            name='email',
+            field=models.EmailField(max_length=320, unique=True),
+        ),
+    ]

apps/members/models.py

@@ -28,6 +28,11 @@ class Meta:
     is_founder = models.BooleanField(default=False)
     is_honorary = models.BooleanField(default=False)
     remarks = models.CharField(max_length=512, blank=True)
+    email = models.EmailField(
+        max_length=320,
+        unique=True,
+        blank=False,
+        )
 
     @classmethod
     def load_from_username(cls, username):
@@ -42,10 +47,6 @@ def load_from_username(cls, username):
     def full_name(self):
         return self.user.first_name + ' ' + self.user.last_name
 
-    @property
-    def email(self):
-        return self.user.email
-
     @property
     def member_id(self):
         return self.id

apps/members/templates/members/profile.html

@@ -12,7 +12,7 @@ <h3 class="panel-heading">Datos personales</h3>
         <tr> <th>Username</th> <td><code>{{ member.user.username }}</code></td> </tr>
         <tr> <th>Nombre</th> <td>{{ member.user.first_name }}</td> </tr>
         <tr> <th>Apellidos</th> <td>{{ member.user.last_name }}</td> </tr>
-        <tr> <th>Email</th> <td>{{ member.user.email }}</td> </tr>
+        <tr> <th>Email</th> <td>{{ member.email }}</td> </tr>
       </table>
     </div>
   </nav>

apps/notices/tasks.py

@@ -35,7 +35,7 @@ def create_notice_message(notice):
     msg = Mail(
         from_email=Email(organization.email, organization.name),
         subject=subject,
-        to_email=Email(member.user.email),
+        to_email=Email(member.email),
         content=Content('text/html', as_markdown(body)),
     )
     return msg
@@ -44,7 +44,7 @@ def create_notice_message(notice):
 @job
 def task_send_notice(notice):
     # Preconditions
-    if not notice.member.user.email:
+    if not notice.member.email:
         print("El usuario no tiene asignado email")
         return
     msg = create_notice_message(notice)