Merge branch 'main' of https://github.com/weni-ai/rapidpro-apps into …

…develop

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [2.8.1] - 2024-04-10
+- Endpoint to list flows with pagination
+- Add option to send delete in flow activity
+
 ## [2.8.0] - 2024-03-27
 - Change recent activities to EDA
 - Endpoint to delete chats sector

weni/activities/apps.py

@@ -1,9 +1,12 @@
 from django.apps import AppConfig
+from django.conf import settings
 
 
 class ActivitiesConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "weni.activities"
 
     def ready(self) -> None:
-        from weni.activities import signals  # noqa: F401
+        if not settings.TESTING:
+            from weni.activities import signals  # noqa: F401
+

weni/activities/signals.py

@@ -10,26 +10,37 @@
 
 
 def create_recent_activity(instance: models.Model, created: bool, delete=None):
-    routing_key = ""
     if instance.is_active:
+        rabbitmq_publisher = RabbitmqPublisher()
         if delete:
             action = "DELETE"
-            routing_key = "flow-delete"
-        else:
-            action = "CREATE" if created else "UPDATE"
-        rabbitmq_publisher = RabbitmqPublisher()
-        rabbitmq_publisher.send_message(
+            rabbitmq_publisher.send_message(
             body=dict(
                 action=action,
                 entity=instance.__class__.__name__.upper(),
                 entity_name=getattr(instance, "name", None),
+                entity_uuid=str(instance.uuid),
+                project_uuid=str(instance.org.project.project_uuid),
                 user=instance.modified_by.email,
                 flow_organization=str(instance.org.uuid),
             ),
             exchange="recent-activities.topic",
-            routing_key=routing_key,
+            routing_key="flow-delete",
         )
-
+        else:
+            action = "CREATE" if created else "UPDATE"
+            rabbitmq_publisher.send_message(
+                body=dict(
+                    action=action,
+                    entity=instance.__class__.__name__.upper(),
+                    entity_name=getattr(instance, "name", None),
+                    project_uuid=str(instance.org.project.project_uuid),
+                    user=instance.modified_by.email,
+                    flow_organization=str(instance.org.uuid),
+                ),
+                exchange="recent-activities.topic",
+                routing_key="",
+            )
 
 @receiver(post_save, sender=Channel)
 def channel_recent_activity_signal(sender, instance: Channel, created: bool, **kwargs):

weni/internal/flows/serializers.py

@@ -8,6 +8,7 @@
 
 class FlowSerializer(serializers.Serializer):
     project = weni_fields.ProjectUUIDRelatedField(required=True, write_only=True)
+    flow_name = serializers.CharField(required=False, write_only=True)
     sample_flow = serializers.JSONField(required=False, write_only=True)
     uuid = serializers.UUIDField(read_only=True)
     name = serializers.CharField(read_only=True)

weni/internal/flows/views.py

@@ -8,9 +8,14 @@
 from temba.flows.models import Flow
 
 
+class FlowPagination(PageNumberPagination):
+    page_size_query_param = "page_size"
+    max_page_size = 20
+
+
 class FlowViewSet(CreateModelMixin, InternalGenericViewSet, ListModelMixin):
     serializer_class = FlowSerializer
-    pagination_class = PageNumberPagination
+    pagination_class = FlowPagination
 
     def get_queryset(self):
         serializer = self.get_serializer(data=self.request.query_params.dict())
@@ -21,8 +26,12 @@ def get_queryset(self):
             is_active=True,
         ).exclude(is_archived=True)
 
+        flow_name = serializer.validated_data.get("flow_name")
+        if flow_name:
+            queryset = queryset.filter(name__icontains=flow_name)
+
         if queryset:
-            return self.paginate_queryset(queryset)  
+            return queryset
 
         raise NotFound()