Skip to content

Commit

Permalink
Merge pull request #66 from dimagi/ce/notification-action
Browse files Browse the repository at this point in the history
add action to messaging notifications
  • Loading branch information
calellowitz authored Jan 3, 2025
2 parents 9c1f927 + 176b04b commit 778c995
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
7 changes: 7 additions & 0 deletions messaging/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
from messaging.models import Message


CCC_MESSAGE_ACTION = "ccc_message"


@dataclasses.dataclass
class MessageData:
usernames: List[str] = None
Expand Down Expand Up @@ -40,6 +43,7 @@ class MessageSerializer(serializers.ModelSerializer):
tag = serializers.SerializerMethodField()
nonce = serializers.SerializerMethodField()
message_id = serializers.SerializerMethodField()
action = serializers.SerializerMethodField()

class Meta:
model = Message
Expand All @@ -56,3 +60,6 @@ def get_nonce(self, obj):

def get_message_id(self, obj):
return str(obj.message_id)

def get_action(self, obj):
return CCC_MESSAGE_ACTION
14 changes: 11 additions & 3 deletions messaging/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@
from rest_framework.views import APIView

from messaging.models import Channel, Message, MessageDirection, MessageStatus, MessageServer
from messaging.serializers import SingleMessageSerializer, BulkMessageSerializer, MessageSerializer, \
MessageData
from messaging.serializers import (
CCC_MESSAGE_ACTION,
BulkMessageSerializer,
MessageData,
MessageSerializer,
SingleMessageSerializer
)
from messaging.task import make_request, send_messages_to_service_and_mark_status
from users.models import ConnectUser
from utils.rest_framework import ClientProtectedResourceAuth, MessagingServerAuth
Expand Down Expand Up @@ -176,7 +181,10 @@ def post(self, request, *args, **kwargs):
usernames=[channel.connect_user.username],
title="Channel created",
body="Please provide your consent to send/receive message.",
data={"keyUrl": server.key_url},
data={
"keyUrl": server.key_url,
"action": CCC_MESSAGE_ACTION,
},
)
# send fcm notification.
send_bulk_message(message)
Expand Down

0 comments on commit 778c995

Please sign in to comment.