fix some issues with message delete service (#30)

* fix some issues with message delete service

Author: oliverrahner

agrirouter/auth/response.py

@@ -57,7 +57,6 @@ def verify(self, public_key) -> None:
         finally:
             self._was_verified = True
 
-
     @staticmethod
     def decode_token(token: Union[str, bytes]) -> AuthorizationToken:
         if type(token) == str:

agrirouter/messaging/parameters/service.py

@@ -214,15 +214,15 @@ class FeedDeleteParameters(MessageParameters):
     def __init__(self,
                  *,
                  message_ids: list = None,
-                 receivers: list = None,
+                 senders: list = None,
                  validity_period: ValidityPeriod = None,
                  application_message_seq_no: int,
                  application_message_id: str,
                  team_set_context_id: str = None,
                  onboarding_response: BaseOnboardingResonse,
                  ):
         self.message_ids = message_ids if message_ids else []
-        self.receivers = receivers if receivers else []
+        self.senders = senders if senders else []
         self.validity_period = validity_period
         super(FeedDeleteParameters, self).__init__(
             application_message_seq_no=application_message_seq_no,
@@ -243,17 +243,17 @@ def add_message_ids(self, message_id):
     def extend_message_ids(self, message_ids):
         self.message_ids.extend(message_ids)
 
-    def get_receivers(self):
-        return deepcopy(self.receivers)
+    def get_senders(self):
+        return deepcopy(self.senders)
 
-    def set_receivers(self, receivers: list):
-        self.receivers = receivers
+    def set_senders(self, senders: list):
+        self.senders = senders
 
-    def add_receivers(self, receiver):
-        self.receivers.append(receiver)
+    def add_senders(self, receiver):
+        self.senders.append(receiver)
 
-    def extend_receivers(self, receivers):
-        self.receivers.extend(receivers)
+    def extend_senders(self, senders):
+        self.senders.extend(senders)
 
     def get_validity_period(self):
         return self.validity_period

agrirouter/messaging/services/messaging.py

@@ -1,7 +1,8 @@
 from agrirouter.generated.messaging.request.payload.account.endpoints_pb2 import ListEndpointsQuery
 from agrirouter.generated.messaging.request.payload.endpoint.capabilities_pb2 import CapabilitySpecification
 from agrirouter.generated.messaging.request.payload.endpoint.subscription_pb2 import Subscription
-from agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageConfirm, MessageQuery
+from agrirouter.generated.messaging.request.payload.feed.feed_requests_pb2 import MessageConfirm, MessageDelete, \
+    MessageQuery
 from agrirouter.generated.messaging.request.request_pb2 import RequestEnvelope
 from agrirouter.messaging.encode import encode_message
 from agrirouter.messaging.enums import TechnicalMessageType
@@ -107,16 +108,18 @@ def encode(parameters: FeedDeleteParameters) -> EncodedMessage:
             application_message_seq_no=parameters.get_application_message_seq_no(),
             team_set_context_id=parameters.get_team_set_context_id(),
             mode=RequestEnvelope.Mode.Value("DIRECT"),
-            technical_message_type=TechnicalMessageType.FEED_CONFIRM.value
+            technical_message_type=TechnicalMessageType.FEED_DELETE.value
         )
 
-        message_confirm = MessageConfirm(
-            message_ids=parameters.get_message_ids()
+        message_delete = MessageDelete(
+            message_ids=parameters.get_message_ids(),
+            senders=parameters.get_senders(),
+            validity_period=parameters.get_validity_period()
         )
 
         message_payload_parameters = MessagePayloadParameters(
-            type_url=TypeUrl.get_type_url(MessageConfirm),
-            value=message_confirm.SerializeToString()
+            type_url=TypeUrl.get_type_url(MessageDelete),
+            value=message_delete.SerializeToString()
         )
 
         message_content = encode_message(message_header_parameters, message_payload_parameters)

tests/auth_test/test_response.py

@@ -5,7 +5,7 @@
 import pytest
 
 from agrirouter.auth.response import AuthResponse
-from tests.constants import valid_response_signature, valid_response_token, public_key
+from tests.constants import valid_response_signature, valid_response_token, AR_PUBLIC_KEY
 
 
 def test_decode_token():
@@ -31,7 +31,7 @@ def test_verify(authorization):
 
     with pytest.raises(PermissionError):
         auth_response.is_valid
-    auth_response.verify(public_key)
+    auth_response.verify(AR_PUBLIC_KEY)
     assert auth_response.is_valid