Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cache junebug lookup for jembi software type #179

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions registrations/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import responses
from django.contrib.auth.models import Group, User
from django.core import management
from django.core.cache import cache
from django.core.management import call_command
from django.db.models.signals import post_save
from django.test import TestCase, override_settings
Expand Down Expand Up @@ -3708,6 +3709,10 @@ def setUp(self):
"2016-01-02", "%Y-%m-%d"
)

def tearDown(self):
super(TestJembiHelpdeskOutgoing, self).tearDown()
cache.clear()

def make_registration_for_jembi_helpdesk(self, source=None):
registration_data = {
"reg_type": "momconnect_prebirth",
Expand Down Expand Up @@ -4103,6 +4108,60 @@ def test_send_outgoing_message_to_jembi_via_whatsapp(self):
self.assertEqual(request_json["type"], 7)
self.assertEqual(request_json["op"], "1234")

cache_key = "SW_TYPE_6a5c691e-140c-48b0-9f39-a53d4951d7fa"
self.assertEqual(cache.get(cache_key), 4)

@responses.activate
def test_send_outgoing_message_to_jembi_using_cache_for_sw_type(self):
self.make_registration_for_jembi_helpdesk()

utils_tests.mock_jembi_json_api_call(
url="http://jembi/ws/rest/v1/helpdesk",
ok_response="jembi-is-ok",
err_response="jembi-is-unhappy",
fields={},
)

cache_key = "SW_TYPE_6a5c691e-140c-48b0-9f39-a53d4951d7fa"
cache.set(cache_key, 4)

user_request = {
"to": "+27123456789",
"content": "this is a sample response",
"reply_to": "this is a sample user message",
"inbound_created_on": self.inbound_created_on_date,
"outbound_created_on": self.outbound_created_on_date,
"user_id": "mother01-63e2-4acc-9b94-26663b9bc267",
"helpdesk_operator_id": 1234,
"label": "Complaint",
"inbound_channel_id": "6a5c691e-140c-48b0-9f39-a53d4951d7fa",
}
# Execute
response = self.normalclient.post(
"/api/v1/jembi/helpdesk/outgoing/", user_request
)
self.assertEqual(response.status_code, 200)
self.assertEqual(len(responses.calls), 1)
request_json = json.loads(responses.calls[0].request.body)

self.assertEqual(request_json["dmsisdn"], "+27123456789")
self.assertEqual(request_json["cmsisdn"], "+27123456789")
self.assertEqual(request_json["encdate"], "20160101000000")
self.assertEqual(request_json["repdate"], "20160102000000")
self.assertEqual(request_json["mha"], 1)
self.assertEqual(request_json["swt"], 4)
self.assertEqual(request_json["faccode"], "123456")
self.assertEqual(
request_json["data"],
{
"question": u"this is a sample user message",
"answer": u"this is a sample response",
},
)
self.assertEqual(request_json["class"], "Complaint")
self.assertEqual(request_json["type"], 7)
self.assertEqual(request_json["op"], "1234")

@responses.activate
def test_report_pmtct_registrations(self):
# Mock API call to SBM for message set
Expand Down
38 changes: 24 additions & 14 deletions registrations/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import requests
from django.conf import settings
from django.contrib.auth.models import Group, User
from django.core.cache import cache
from django.core.exceptions import PermissionDenied, ValidationError
from django.http import Http404
from django.shortcuts import get_object_or_404
Expand Down Expand Up @@ -242,20 +243,29 @@ def get_software_type(channel_id):
"""
if channel_id == "":
return 2
result = requests.get(
"%s/jb/channels/%s" % (settings.JUNEBUG_BASE_URL, channel_id),
headers={"Content-Type": "application/json"},
auth=(settings.JUNEBUG_USERNAME, settings.JUNEBUG_PASSWORD),
)
result.raise_for_status()
channel_config = result.json()

if (
channel_config["result"].get("type", None)
== settings.WHATSAPP_CHANNEL_TYPE
):
return 4
return 2

cache_key = "SW_TYPE_{}".format(channel_id)
sw_type = cache.get(cache_key, None)

if not sw_type:
result = requests.get(
"%s/jb/channels/%s" % (settings.JUNEBUG_BASE_URL, channel_id),
headers={"Content-Type": "application/json"},
auth=(settings.JUNEBUG_USERNAME, settings.JUNEBUG_PASSWORD),
)
result.raise_for_status()
channel_config = result.json()

sw_type = 2
if (
channel_config["result"].get("type", None)
== settings.WHATSAPP_CHANNEL_TYPE
):
sw_type = 4

cache.set(cache_key, sw_type)

return sw_type

registration = (
Registration.objects.filter(registrant_id=validated_data.get("user_id"))
Expand Down