Fix linting

ohcnetwork · Sep 22, 2024 · ab99a1b · ab99a1b
1 parent 4261fa5
commit ab99a1b
Show file tree

Hide file tree

Showing 51 changed files with 195 additions and 255 deletions.
diff --git a/Makefile b/Makefile
@@ -55,6 +55,9 @@ reset_db:
 ruff-all:
 	ruff check .
 
+ruff-fix-all:
+	ruff check --fix .
+
 ruff:
 	ruff check --fix $(shell git diff --name-only --staged | grep -E '\.py$$|\/pyproject.toml$$')
 

diff --git a/care/abdm/api/viewsets/auth.py b/care/abdm/api/viewsets/auth.py
@@ -159,7 +159,7 @@ def post(self, request, *args, **kwargs):
                     map(
                         lambda consultation: {
                             "id": str(consultation.external_id),
-                            "name": f"Encounter: {str(consultation.created_date.date())}",
+                            "name": f"Encounter: {consultation.created_date.date()!s}",
                         },
                         PatientConsultation.objects.filter(patient=patient),
                     )
@@ -213,7 +213,7 @@ def post(self, request, *args, **kwargs):
                     map(
                         lambda consultation: {
                             "id": str(consultation.external_id),
-                            "name": f"Encounter: {str(consultation.created_date.date())}",
+                            "name": f"Encounter: {consultation.created_date.date()!s}",
                         },
                         PatientConsultation.objects.filter(patient=patient),
                     )
@@ -251,7 +251,7 @@ def post(self, request, *args, **kwargs):
 
         consent_id = data["hiRequest"]["consent"]["id"]
         consent = json.loads(cache.get(consent_id)) if consent_id in cache else None
-        if not consent or not consent["notification"]["status"] == "GRANTED":
+        if not consent or consent["notification"]["status"] != "GRANTED":
             return Response({}, status=status.HTTP_401_UNAUTHORIZED)
 
         # TODO: check if from and to are in range and consent expiry is greater than today
@@ -269,7 +269,7 @@ def post(self, request, *args, **kwargs):
             {"request_id": data["requestId"], "transaction_id": data["transactionId"]}
         )
 
-        if not on_data_request_response.status_code == 202:
+        if on_data_request_response.status_code != 202:
             return Response({}, status=status.HTTP_202_ACCEPTED)
             return Response(
                 on_data_request_response, status=status.HTTP_400_BAD_REQUEST

diff --git a/care/abdm/api/viewsets/hip.py b/care/abdm/api/viewsets/hip.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from rest_framework import status
 from rest_framework.decorators import action
@@ -118,7 +118,7 @@ def share(self, request, *args, **kwargs):
             payload = {
                 "requestId": str(uuid.uuid4()),
                 "timestamp": str(
-                    datetime.now(tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.000Z")
+                    datetime.now(tz=UTC).strftime("%Y-%m-%dT%H:%M:%S.000Z")
                 ),
                 "acknowledgement": {
                     "status": "SUCCESS",

diff --git a/care/abdm/api/viewsets/monitoring.py b/care/abdm/api/viewsets/monitoring.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from rest_framework import status
 from rest_framework.generics import GenericAPIView
@@ -14,7 +14,7 @@ def get(self, request, *args, **kwargs):
         return Response(
             {
                 "timestamp": str(
-                    datetime.now(tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.000Z")
+                    datetime.now(tz=UTC).strftime("%Y-%m-%dT%H:%M:%S.000Z")
                 ),
                 "status": "UP",
                 "error": None,

diff --git a/care/abdm/service/gateway.py b/care/abdm/service/gateway.py
@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 from django.conf import settings
 from django.db.models import Q
@@ -18,7 +18,7 @@ def __init__(self):
     def consent_requests__init(self, consent: ConsentRequest):
         data = {
             "requestId": str(consent.external_id),
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "consent": {
@@ -42,14 +42,14 @@ def consent_requests__init(self, consent: ConsentRequest):
                 "permission": {
                     "accessMode": consent.access_mode,
                     "dateRange": {
-                        "from": consent.from_time.astimezone(timezone.utc).strftime(
+                        "from": consent.from_time.astimezone(UTC).strftime(
                             "%Y-%m-%dT%H:%M:%S.000Z"
                         ),
-                        "to": consent.to_time.astimezone(timezone.utc).strftime(
+                        "to": consent.to_time.astimezone(UTC).strftime(
                             "%Y-%m-%dT%H:%M:%S.000Z"
                         ),
                     },
-                    "dataEraseAt": consent.expiry.astimezone(timezone.utc).strftime(
+                    "dataEraseAt": consent.expiry.astimezone(UTC).strftime(
                         "%Y-%m-%dT%H:%M:%S.000Z"
                     ),
                     "frequency": {
@@ -67,7 +67,7 @@ def consent_requests__init(self, consent: ConsentRequest):
     def consent_requests__status(self, consent_request_id: str):
         data = {
             "requestId": str(uuid.uuid4()),
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "consentRequestId": consent_request_id,
@@ -80,7 +80,7 @@ def consent_requests__status(self, consent_request_id: str):
     def consents__hiu__on_notify(self, consent: ConsentRequest, request_id: str):
         data = {
             "requestId": str(uuid.uuid4()),
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "resp": {"requestId": request_id},
@@ -104,7 +104,7 @@ def consents__hiu__on_notify(self, consent: ConsentRequest, request_id: str):
     def consents__fetch(self, consent_artefact_id: str):
         data = {
             "requestId": str(uuid.uuid4()),
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "consentId": consent_artefact_id,
@@ -121,7 +121,7 @@ def health_information__cm__request(self, artefact: ConsentArtefact):
 
         data = {
             "requestId": request_id,
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "hiRequest": {
@@ -132,7 +132,7 @@ def health_information__cm__request(self, artefact: ConsentArtefact):
                     "cryptoAlg": artefact.key_material_algorithm,
                     "curve": artefact.key_material_curve,
                     "dhPublicKey": {
-                        "expiry": artefact.expiry.astimezone(timezone.utc).strftime(
+                        "expiry": artefact.expiry.astimezone(UTC).strftime(
                             "%Y-%m-%dT%H:%M:%S.000Z"
                         ),
                         "parameters": f"{artefact.key_material_curve}/{artefact.key_material_algorithm}",
@@ -169,13 +169,13 @@ def get_hf_id_by_health_id(self, health_id):
     def health_information__notify(self, artefact: ConsentArtefact):
         data = {
             "requestId": str(uuid.uuid4()),
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "notification": {
                 "consentId": str(artefact.artefact_id),
                 "transactionId": str(artefact.transaction_id),
-                "doneAt": datetime.now(tz=timezone.utc).strftime(
+                "doneAt": datetime.now(tz=UTC).strftime(
                     "%Y-%m-%dT%H:%M:%S.000Z"
                 ),
                 "notifier": {
@@ -198,7 +198,7 @@ def health_information__notify(self, artefact: ConsentArtefact):
     def patients__find(self, abha_number: AbhaNumber):
         data = {
             "requestId": str(uuid.uuid4()),
-            "timestamp": datetime.now(tz=timezone.utc).strftime(
+            "timestamp": datetime.now(tz=UTC).strftime(
                 "%Y-%m-%dT%H:%M:%S.000Z"
             ),
             "query": {