Cleanups for deployment

ohcnetwork · Dec 29, 2024 · 66b0a74 · 66b0a74
1 parent 4361dc2
commit 66b0a74
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/care/emr/api/otp_viewsets/login.py b/care/emr/api/otp_viewsets/login.py
@@ -77,7 +77,7 @@ def login(self, request):
         if not otp_object:
             raise ValidationError({"otp": "Invalid OTP"})
 
-        # otp_object.is_used = True # TODO UNCOMMENT THIS !!
+        otp_object.is_used = True
         otp_object.save()
 
         token = PatientToken()

diff --git a/care/emr/api/viewsets/resource_request.py b/care/emr/api/viewsets/resource_request.py
@@ -10,9 +10,10 @@
 from care.emr.resources.resource_request.spec import (
     ResourceRequestCommentCreateSpec,
     ResourceRequestCommentListSpec,
+    ResourceRequestCommentRetrieveSpec,
     ResourceRequestCreateSpec,
     ResourceRequestListSpec,
-    ResourceRequestRetrieveSpec, ResourceRequestCommentRetrieveSpec,
+    ResourceRequestRetrieveSpec,
 )
 
 

diff --git a/care/emr/resources/resource_request/spec.py b/care/emr/resources/resource_request/spec.py
@@ -144,5 +144,7 @@ def perform_extra_serialization(cls, mapping, obj):
         if obj.created_by:
             mapping["created_by"] = UserSpec.serialize(obj.created_by)
 
+
 class ResourceRequestCommentRetrieveSpec(ResourceRequestCommentListSpec):
     pass
+
diff --git a/care/utils/sms/send_sms.py b/care/utils/sms/send_sms.py
@@ -19,11 +19,17 @@ def send_sms(phone_numbers, message, many=False):
             if settings.DEBUG:
                 logger.error("Invalid Phone Number %s", phone)
             continue
-        client = boto3.client(
-            "sns",
-            aws_access_key_id=settings.SNS_ACCESS_KEY,
-            aws_secret_access_key=settings.SNS_SECRET_KEY,
-            region_name=settings.SNS_REGION,
-        )
+        if settings.SNS_ROLE_BASED_MODE:
+            client = boto3.client(
+                "sns",
+                region_name=settings.SNS_REGION,
+            )
+        else:
+            client = boto3.client(
+                "sns",
+                aws_access_key_id=settings.SNS_ACCESS_KEY,
+                aws_secret_access_key=settings.SNS_SECRET_KEY,
+                region_name=settings.SNS_REGION,
+            )
         client.publish(PhoneNumber=phone, Message=message)
     return True
diff --git a/config/settings/deployment.py b/config/settings/deployment.py
@@ -123,6 +123,7 @@
 SNS_ACCESS_KEY = env("SNS_ACCESS_KEY", default="")
 SNS_SECRET_KEY = env("SNS_SECRET_KEY", default="")
 SNS_REGION = env("SNS_REGION", default="ap-south-1")
+SNS_ROLE_BASED_MODE = env.bool("SNS_ROLE_BASED_MODE", default=False)
 
 # open id connect
 JWKS = JsonWebKey.import_key_set(