hansard sitting post from pipeline working

Author: shenghann

src/api/serializers.py

@@ -18,9 +18,9 @@ class Meta:
 
 
 class SittingSerializer(serializers.ModelSerializer):
-    cycle_id = serializers.PrimaryKeyRelatedField(
-        source="cycle", queryset=ParliamentaryCycle.objects.all(), write_only=True
-    )
+    # cycle_id = serializers.PrimaryKeyRelatedField(
+    #     source="cycle", queryset=ParliamentaryCycle.objects.all(), write_only=True
+    # )
     cycle = ParliamentaryCycleSerializer(read_only=True)
 
     class Meta:

src/api/views.py

@@ -90,7 +90,8 @@ def _add_to_result(levels, data, result):
     current_level.append(data)
 
 
-def _speeches_to_json(df_sitting):
+def _speeches_to_json(speech_data):
+    df_sitting = pd.DataFrame(json.loads(speech_data))
     result = []
     for index, row in df_sitting.iterrows():
         speech_dict = {
@@ -149,9 +150,20 @@ def post(self, request):
         if serializer.is_valid():
             try:
                 # convert speech_data to JSON string
-                speeches_list = request.data.get("speech_data")
-                speech_data = _speeches_to_json(speeches_list)
-                serializer.validated_data["speech_data"] = json.dumps(speech_data)
+                speech_data = request.data.get("speech_data")
+                speeches_list = json.loads(speech_data)
+                # speech_data = _speeches_to_json(speeches_list)
+                serializer.validated_data["speech_data"] = speech_data
+
+                # Get parliamentary cycle ID given house_types, and date that falls between start_date and end_date
+                cycle = ParliamentaryCycle.objects.get(
+                    house=ParliamentaryCycle.get_integer_value(
+                        request.data.get("house")
+                    ),
+                    start_date__lte=request.data.get("date"),
+                    end_date__gte=request.data.get("date"),
+                )
+                serializer.validated_data["cycle_id"] = cycle.cycle_id
 
                 # First create the sitting record
                 sitting = serializer.save()
@@ -170,9 +182,9 @@ def post(self, request):
                                 "speech": speech.get("speech", ""),
                                 "speech_tokens": speech.get("speech_tokens", []),
                                 "length": speech.get("length", 0),
-                                "level_1": speech.get("level_1", ""),
-                                "level_2": speech.get("level_2", ""),
-                                "level_3": speech.get("level_3", ""),
+                                "level_1": speech.get("level_1", None),
+                                "level_2": speech.get("level_2", None),
+                                "level_3": speech.get("level_3", None),
                                 "is_annotation": speech.get("is_annotation", False),
                             }
                         )