File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -848,7 +848,7 @@ async def applets_completed_entities(
848848 data = AnswerService (session , user_id = user .id ).get_completed_answers_data_list (
849849 applets_version_map = applets_version_arb_map ,
850850 from_date = from_date ,
851- use_version_filter = filterByVersion ,
851+ filterByVersion = filterByVersion ,
852852 )
853853 data_future_list .append (data )
854854
Original file line number Diff line number Diff line change @@ -645,15 +645,14 @@ async def get_completed_answers_data_list(
645645 applets_version_map : dict [uuid .UUID , Optional [str ]],
646646 respondent_id : uuid .UUID ,
647647 from_date : datetime .date ,
648- use_version_filter : bool = False ,
648+ filterByVersion : bool = False ,
649649 ) -> list [AppletCompletedEntities ]:
650650 is_completed = or_ (
651651 AnswerSchema .is_flow_completed ,
652652 AnswerSchema .flow_history_id .is_ (None ),
653653 )
654654
655- applet_ids = list (applets_version_map .keys ())
656- if use_version_filter :
655+ if filterByVersion :
657656 applet_predicate = or_ (
658657 * [
659658 and_ (AnswerSchema .applet_id == applet_id , AnswerSchema .version == version )
@@ -663,7 +662,7 @@ async def get_completed_answers_data_list(
663662 ]
664663 )
665664 else :
666- applet_predicate = AnswerSchema .applet_id .in_ (applet_ids )
665+ applet_predicate = AnswerSchema .applet_id .in_ (list ( applets_version_map . keys ()) )
667666
668667 query : Query = (
669668 select (
Original file line number Diff line number Diff line change @@ -1682,14 +1682,14 @@ async def get_completed_answers_data_list(
16821682 self ,
16831683 applets_version_map : Mapping [uuid .UUID , Optional [str ]],
16841684 from_date : datetime .date ,
1685- use_version_filter : bool = False ,
1685+ filterByVersion : bool = False ,
16861686 ) -> list [AppletCompletedEntities ]:
16871687 assert self .user_id
16881688 result = await AnswersCRUD (self .answer_session ).get_completed_answers_data_list (
16891689 dict (applets_version_map ),
16901690 self .user_id ,
16911691 from_date ,
1692- use_version_filter = use_version_filter ,
1692+ filterByVersion = filterByVersion ,
16931693 )
16941694 return result
16951695
You can’t perform that action at this time.
0 commit comments