Merge branch 'main' into bug/9173-otanalytics-counts_15min-csv-does-not-contain-line-with-count-0-for-combinations-after-the-first-time-point

Author: schubsen

OTAnalytics/application/use_cases/road_user_assignment_export.py

@@ -61,6 +61,7 @@ def __create(self, assignment: RoadUserAssignment) -> dict:
             ras.FLOW_ID: assigned_flow.id.id,
             ras.FLOW_NAME: assigned_flow.name,
             ras.ROAD_USER_ID: assignment.road_user,
+            ras.ROAD_USER_TYPE: assignment.road_user_type,
             ras.MAX_CONFIDENCE: self._max_confidence,
             ras.START_OCCURRENCE: start.occurrence.strftime(ras.DATE_TIME_FORMAT),
             ras.START_OCCURRENCE_DATE: start.occurrence.strftime(ras.DATE_FORMAT),
@@ -107,6 +108,7 @@ def reset(self) -> None:
     ras.FLOW_ID,
     ras.FLOW_NAME,
     ras.ROAD_USER_ID,
+    ras.ROAD_USER_TYPE,
     ras.MAX_CONFIDENCE,
     ras.START_OCCURRENCE,
     ras.START_OCCURRENCE_DATE,

tests/utils/builders/road_user_assignment.py

@@ -16,6 +16,7 @@ def create_road_user_assignment(
         ras.FLOW_ID: assignment.assignment.id.id,
         ras.FLOW_NAME: assignment.assignment.name,
         ras.ROAD_USER_ID: assignment.road_user,
+        ras.ROAD_USER_TYPE: assignment.road_user_type,
         ras.MAX_CONFIDENCE: max_confidence,
         ras.START_OCCURRENCE: start_event.occurrence.strftime(ras.DATE_TIME_FORMAT),
         ras.START_OCCURRENCE_DATE: start_event.occurrence.strftime(ras.DATE_FORMAT),