Merge branch 'dev' into main

Author: A7640S

Mapapi/migrations/0006_discussionmessage.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.7 on 2025-02-27 17:27
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Mapapi', '0005_user_is_verified_user_otp_user_otp_expiration_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DiscussionMessage',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('message', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('collaboration', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='Mapapi.collaboration')),
+                ('incident', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='Mapapi.incident')),
+                ('sender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

Mapapi/migrations/0007_auto_20250303_0923.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.7 on 2025-03-03 09:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Mapapi', '0006_discussionmessage'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='Collaboration',
+            name='motivation',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='Collaboration',
+            name='other_option',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='Collaboration',
+            name='status',
+            field=models.CharField(max_length=20, default='pending'),
+        ),
+    ]

Mapapi/migrations/0008_discussionmessage_recipient.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.7 on 2025-03-03 11:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Mapapi', '0007_auto_20250303_0923'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='discussionmessage',
+            name='recipient',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='received_messages', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

Mapapi/migrations/0009_alter_collaboration_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2025-03-03 11:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Mapapi', '0008_discussionmessage_recipient'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='collaboration',
+            unique_together={('incident', 'user')},
+        ),
+    ]

Mapapi/migrations/0010_organisationtag.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2025-05-09 17:03
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Mapapi', '0009_alter_collaboration_unique_together'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OrganisationTag',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('incident_type', models.CharField(max_length=255)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='incident_preferences', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

Mapapi/models.py

@@ -186,7 +186,7 @@ def generate_otp(self):
         self.save()
 
     def send_verification_email(self):
-        verification_link = f"mapactionapp://verify-email/{self.verification_token}"
+        verification_link = f"https://api.map-action.com/MapApi/web_verify-email/{self.verification_token}"
         context = {"verification_link": verification_link}
         subject = "Vérification de votre compte"
         template_name = "emails/verification_email.html"
@@ -427,6 +427,8 @@ class Collaboration(models.Model):
     other_option = models.CharField(max_length=255, blank=True, null=True) 
     status = models.CharField(max_length=20, default='pending')
 
+    class Meta:
+        unique_together = (("incident", "user"),)
     def __str__(self):
         return f"Collaboration on {self.incident} by {self.user}"
 
@@ -483,3 +485,18 @@ class UserAction(models.Model):
 
     def __str__(self):
         return self.action
+    
+class DiscussionMessage(models.Model):
+    incident = models.ForeignKey('Incident', on_delete=models.CASCADE)
+    collaboration = models.ForeignKey(Collaboration, on_delete=models.CASCADE)
+    sender = models.ForeignKey(User, on_delete=models.CASCADE)
+    message = models.TextField()
+    created_at = models.DateTimeField(auto_now_add=True)
+    recipient = models.ForeignKey(User, on_delete=models.CASCADE, related_name="received_messages", null=True, blank=True)
+    
+    def __str__(self):
+        return f"Message de {self.sender} le {self.created_at}"
+
+class OrganisationTag(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='incident_preferences')
+    incident_type = models.CharField(max_length=255)  

Mapapi/serializer.py

@@ -7,20 +7,20 @@
 from django.utils import timezone
 
 
-class UserSerializer(ModelSerializer):
-    class Meta:
-        model = User
-        exclude = (
-            'user_permissions', 'is_superuser', 'is_active', 'is_staff')
-
-    def create(self, validated_data):
-        zones = validated_data.pop('zones', None)
-        user = self.Meta.model(**validated_data)
-        user.set_password(validated_data['password'])
-        user.save()
-        if zones:
-            user.zones.set(zones)
-        return user
+# class UserSerializer(ModelSerializer):
+#     class Meta:
+#         model = User
+#         exclude = (
+#             'user_permissions', 'is_superuser', 'is_active', 'is_staff')
+
+#     def create(self, validated_data):
+#         zones = validated_data.pop('zones', None)
+#         user = self.Meta.model(**validated_data)
+#         user.set_password(validated_data['password'])
+#         user.save()
+#         if zones:
+#             user.zones.set(zones)
+#         return user
 
 
 class UserRegisterSerializer(serializers.ModelSerializer):
@@ -42,6 +42,36 @@ def create(self, validated_data):
         user.save()
         return user
 
+ 
+class UserSerializer(ModelSerializer):
+    incident_preferences = serializers.ListField(
+        child=serializers.CharField(),
+        write_only=True,
+        required=False
+    )
+
+    class Meta:
+        model = User
+        exclude = ('user_permissions', 'is_superuser', 'is_active', 'is_staff')
+
+    def create(self, validated_data):
+        zones = validated_data.pop('zones', None)
+        incident_preferences = validated_data.pop('incident_preferences', [])
+
+        user = self.Meta.model(**validated_data)
+        user.set_password(validated_data['password'])
+        user.save()
+
+        if zones:
+            user.zones.set(zones)
+
+
+        if user.user_type == "elu" and incident_preferences:
+            for incident_type in incident_preferences:
+                OrganisationTag.objects.create(user=user, incident_type=incident_type)
+
+        return user
+
 
 class UserEluSerializer(serializers.ModelSerializer):
     class Meta:
@@ -287,3 +317,14 @@ class UserActionSerializer(serializers.ModelSerializer):
     class Meta:
         model = UserAction
         fields = '__all__' 
+
+
+class DiscussionMessageSerializer(serializers.ModelSerializer):
+    sender = UserSerializer(read_only=True)
+    recipient = UserSerializer(read_only=True)
+    class Meta:
+        model = DiscussionMessage
+        fields = ['id', 'incident', 'collaboration', 'sender', 'message', 'created_at','recipient']
+        read_only_fields = ('sender', 'incident', 'collaboration','recipient')
+
+

Mapapi/signals.py

@@ -1,6 +1,6 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from .models import Collaboration, Notification
+from .models import Collaboration, Notification, User
 from .Send_mails import send_email
 import logging
 
@@ -46,4 +46,38 @@ def notify_organisation_on_collaboration(sender, instance, created, **kwargs):
                 logger.error(f"Erreur lors de l'envoi de l'email: {str(e)}")
         else:
             logger.error(f"Email non valide ou manquant pour l'utilisateur {user}. Collaboration annulée.")
-            instance.delete()  
+            instance.delete() 
+            
+             
+def notify_organisations_on_prediction(sender, instance, created, **kwargs):
+    if not created:
+        return
+
+    incident_type = instance.incident_type
+
+    # Organisations intéressées par ce type d'incident
+    matching_orgs = User.objects.filter(
+        user_type="elu",
+        incident_preferences__incident_type=incident_type
+    ).distinct()
+
+    for org in matching_orgs:
+        try:
+            context = {
+                'incident_type': incident_type,
+                'prediction_id': instance.id,
+                'incident_id': instance.incident_id,
+                'organisation': org.elu
+            }
+
+            send_email.delay(
+                subject=f"[MAP ACTION] Nouveau rapport : {incident_type}",
+                template_name='emails/incident_notification.html',
+                context=context,
+                to_email=org.email
+            )
+
+            logger.info(f"Email envoyé à {org.email} pour un nouvel incident de type {incident_type}.")
+
+        except Exception as e:
+            logger.error(f"Erreur lors de l'envoi d'une notification à {org.email} : {str(e)}")

Mapapi/urls.py

@@ -103,6 +103,8 @@
     path('decline/', DeclineCollaborationView.as_view(), name='decline-collaboration'),
     path('collaborations/accept/', AcceptCollaborationView.as_view(), name='accept-collaboration'),
     path('collaboration/<int:collaboration_id>/<str:action>/', HandleCollaborationRequestView.as_view(), name="handle_collaboration_request"),
+    path('discussion/<int:incident_id>/', DiscussionMessageView.as_view(), name='discussion'),
+
     # Search Incident
     path('Search/', IncidentSearchView.as_view(), name="search"),
     path('prediction/', PredictionView.as_view(), name="predicton"),