update dockerfile because of needing new image

Author: taichan03

server/Dockerfile

@@ -1,5 +1,4 @@
-# pull official base image
-FROM python:3.11.4-slim-buster
+FROM python:3.11.4-slim-bullseye
 
 # set work directory
 WORKDIR /usr/src/server
@@ -24,4 +23,4 @@ COPY . /usr/src/server
 RUN sed -i 's/\r$//' /usr/src/server/entrypoint.sh && chmod +x /usr/src/server/entrypoint.sh
 
 # run entrypoint.sh
-ENTRYPOINT ["/usr/src/server/entrypoint.sh"]
+ENTRYPOINT ["/usr/src/server/entrypoint.sh"]

server/api/views/listMeds/views.py

@@ -1,14 +1,21 @@
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
+
 from .models import Diagnosis, Medication, Suggestion
 from .serializers import MedicationSerializer
 # Constants for medication inclusion and exclusion
-MEDS_INCLUDE = {'suicideHistory': ['Lithium']}
+MEDS_INCLUDE = {
+    'suicideHistory': ['Lithium']
+}
+
 MED_EXCLUDE = {
     'kidneyHistory': ['Lithium'],
     'liverHistory': ['Valproate'],
-    'bloodPressureHistory': ['Asenapine', 'Lurasidone', 'Olanzapine', 'Paliperidone', 'Quetiapine', 'Risperidone', 'Ziprasidone', 'Aripiprazole', 'Cariprazine'],
+    'bloodPressureHistory': [
+        'Asenapine', 'Lurasidone', 'Olanzapine', 'Paliperidone',
+        'Quetiapine', 'Risperidone', 'Ziprasidone', 'Aripiprazole', 'Cariprazine'
+    ],
     'weightGainConcern': ['Quetiapine', 'Risperidone', 'Aripiprazole', 'Olanzapine']
 }
 
@@ -26,12 +33,13 @@ def post(self, request):
             if data.get(condition, False):
                 # Remove any medication from include list that is in the exclude list
                 include_result = [
-                    med for med in include_result if med not in MED_EXCLUDE[condition]]
+                    med for med in include_result if med not in MED_EXCLUDE[condition]
+                ]
                 exclude_result.extend(MED_EXCLUDE[condition])
-        diag_query = Diagnosis.objects.filter(state=state_query)
-        if diag_query.count() <= 0:
+        try:
+            diagnosis = Diagnosis.objects.get(state=state_query)
+        except Diagnosis.DoesNotExist:
             return Response({'error': 'Diagnosis not found'}, status=status.HTTP_404_NOT_FOUND)
-        diagnosis = diag_query[0]
         meds = {'first': [], 'second': [], 'third': []}
 
         included_set = set(include_result)
@@ -42,15 +50,18 @@ def post(self, request):
 
         for i, tier_label in enumerate(['first', 'second', 'third']):
             suggestions = Suggestion.objects.filter(
-                diagnosis=diagnosis, tier=i+1)
+                diagnosis=diagnosis, tier=i+1
+            )
             for suggestion in suggestions:
                 med_name = suggestion.medication.name
                 if med_name in excluded_set:
                     continue
                 if i > 0 and med_name in included_set:
                     continue
-                meds[tier_label].append(
-                    {'name': med_name, 'source': 'diagnosis'})
+                meds[tier_label].append({
+                    'name': med_name,
+                    'source': 'diagnosis'
+                })
 
         return Response(meds)
 
@@ -71,20 +82,7 @@ def get(self, request):
             return Response(serializer.data)
 
     def post(self, request):
-        # Implement logic for adding new medications (if needed)
-        # If adding medications, you would check if the medication already exists before creating it
-        data = request.data
-        name = data.get('name', '')
-        if not name:
-            return Response({'error': 'Medication name is required'}, status=status.HTTP_400_BAD_REQUEST)
-        if Medication.objects.filter(name=name).exists():
-            return Response({'error': 'Medication already exists'}, status=status.HTTP_400_BAD_REQUEST)
-        # Assuming Medication model has `name`, `benefits`, `risks` as fields
-        serializer = MedicationSerializer(data=data)
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        return Response({'error': 'Use AddMedication endpoint for creating medications'}, status=status.HTTP_405_METHOD_NOT_ALLOWED)
 
 
 class AddMedication(APIView):
@@ -97,13 +95,15 @@ def post(self, request):
         name = data.get('name', '').strip()
         benefits = data.get('benefits', '').strip()
         risks = data.get('risks', '').strip()
-        # Validate the inputs
+        
+        # Validate required fields
         if not name:
             return Response({'error': 'Medication name is required'}, status=status.HTTP_400_BAD_REQUEST)
         if not benefits:
             return Response({'error': 'Medication benefits are required'}, status=status.HTTP_400_BAD_REQUEST)
         if not risks:
             return Response({'error': 'Medication risks are required'}, status=status.HTTP_400_BAD_REQUEST)
+        
         # Check if medication already exists
         if Medication.objects.filter(name=name).exists():
             return Response({'error': f'Medication "{name}" already exists'}, status=status.HTTP_400_BAD_REQUEST)
@@ -116,25 +116,22 @@ def post(self, request):
 
 
 class DeleteMedication(APIView):
-    "API endpoint to delete medication if medication in database"
+    """
+    API endpoint to delete medication if medication in database.
+    """
 
     def delete(self, request):
         data = request.data
         name = data.get('name', '').strip()
-        print("ok vin")
-        # Validate the inputs
+        
+        # Validate required fields
         if not name:
             return Response({'error': 'Medication name is required'}, status=status.HTTP_400_BAD_REQUEST)
-       # Check if medication exists
-        if Medication.objects.filter(name=name).exists():
-            # return f'Medication "{name}" exists'
-            # Get the medication object
+        
+        # Check if medication exists and delete
+        try:
             medication = Medication.objects.get(name=name)
-        # Delete the medication
             medication.delete()
-            return Response({'success': "medication exists and will now be deleted"}, status=status.HTTP_201_CREATED)
-        else:
-            return Response({'error': 'Medication does not exist'}, status=status.HTTP_400_BAD_REQUEST)
-        # ask user if sure to delete?
-        # delete med from database
-        # Medication.objects.filter(name=name)
+            return Response({'success': f'Medication "{name}" has been deleted'}, status=status.HTTP_200_OK)
+        except Medication.DoesNotExist:
+            return Response({'error': f'Medication "{name}" does not exist'}, status=status.HTTP_404_NOT_FOUND)