4545)
4646
4747
48- @mock .patch (
49- "forestadmin.datasource_toolkit.interfaces.query.filter.factory.time_transforms"
50- )
48+ @mock .patch ("forestadmin.datasource_toolkit.interfaces.query.filter.factory.time_transforms" )
5149def test_shift_period_filter (mock_time_transform : mock .MagicMock ):
5250 shift_period_filter_replacer = FilterFactory ._shift_period_filter ("UTC" ) # type: ignore
5351 leaf = ConditionTreeLeaf (field = "test" , operator = Operator .PREVIOUS_YEAR )
5452 mock_replacer = mock .MagicMock (return_value = "fake_replacer" )
55- mock_time_transform .return_value = {
56- Operator .PREVIOUS_YEAR : [{"replacer" : mock_replacer }]
57- }
53+ mock_time_transform .return_value = {Operator .PREVIOUS_YEAR : [{"replacer" : mock_replacer }]}
5854 with mock .patch (
5955 "forestadmin.datasource_toolkit.interfaces.query.filter.factory.SHIFTED_OPERATORS" ,
6056 {Operator .PREVIOUS_YEAR },
@@ -70,35 +66,23 @@ def test_shift_period_filter(mock_time_transform: mock.MagicMock):
7066 assert shift_period_filter_replacer (leaf ) == leaf
7167
7268
73- @mock .patch (
74- "forestadmin.datasource_toolkit.interfaces.query.filter.factory.time_transforms"
75- )
69+ @mock .patch ("forestadmin.datasource_toolkit.interfaces.query.filter.factory.time_transforms" )
7670def test_shift_period_filter_with_complex_condition_tree (
7771 mock_time_transform : mock .MagicMock ,
7872):
7973 tz = zoneinfo .ZoneInfo ("UTC" )
8074 shift_period_filter_replacer = FilterFactory ._shift_period_filter (tz )
8175
82- leaf_previous_year = ConditionTreeLeaf (
83- field = "date_field" , operator = Operator .PREVIOUS_YEAR
84- )
76+ leaf_previous_year = ConditionTreeLeaf (field = "date_field" , operator = Operator .PREVIOUS_YEAR )
8577 leaf_equal = ConditionTreeLeaf (field = "name" , operator = Operator .EQUAL , value = "test" )
86- leaf_greater_than = ConditionTreeLeaf (
87- field = "age" , operator = Operator .GREATER_THAN , value = 18
88- )
89- leaf_previous_month = ConditionTreeLeaf (
90- field = "created_at" , operator = Operator .PREVIOUS_MONTH
91- )
78+ leaf_greater_than = ConditionTreeLeaf (field = "age" , operator = Operator .GREATER_THAN , value = 18 )
79+ leaf_previous_month = ConditionTreeLeaf (field = "created_at" , operator = Operator .PREVIOUS_MONTH )
9280
9381 mock_replacer_year = mock .MagicMock (
94- return_value = ConditionTreeLeaf (
95- field = "date_field" , operator = Operator .EQUAL , value = "replaced_year"
96- )
82+ return_value = ConditionTreeLeaf (field = "date_field" , operator = Operator .EQUAL , value = "replaced_year" )
9783 )
9884 mock_replacer_month = mock .MagicMock (
99- return_value = ConditionTreeLeaf (
100- field = "created_at" , operator = Operator .EQUAL , value = "replaced_month"
101- )
85+ return_value = ConditionTreeLeaf (field = "created_at" , operator = Operator .EQUAL , value = "replaced_month" )
10286 )
10387
10488 mock_time_transform .return_value = {
@@ -133,22 +117,16 @@ def test_shift_period_filter_with_complex_condition_tree(
133117 field = "date_field" , operator = Operator .EQUAL , value = "replaced_year"
134118 )
135119 assert result .conditions [1 ] == leaf_equal # EQUAL should remain unchanged
136- assert (
137- result .conditions [2 ] == leaf_greater_than
138- ) # GREATER_THAN should remain unchanged
120+ assert result .conditions [2 ] == leaf_greater_than # GREATER_THAN should remain unchanged
139121 assert result .conditions [3 ] == ConditionTreeLeaf (
140122 field = "created_at" , operator = Operator .EQUAL , value = "replaced_month"
141123 )
142124
143125
144- @mock .patch (
145- "forestadmin.datasource_toolkit.interfaces.query.filter.factory.FilterFactory._shift_period_filter"
146- )
126+ @mock .patch ("forestadmin.datasource_toolkit.interfaces.query.filter.factory.FilterFactory._shift_period_filter" )
147127def test_get_previous_period_filter (mock_shifted_period : mock .MagicMock ):
148128 leaf = ConditionTreeLeaf (field = "test" , operator = Operator .PREVIOUS_MONTH )
149- filter = Filter (
150- {"condition_tree" : leaf , "timezone" : zoneinfo .ZoneInfo ("Europe/Paris" )}
151- )
129+ filter = Filter ({"condition_tree" : leaf , "timezone" : zoneinfo .ZoneInfo ("Europe/Paris" )})
152130 with mock .patch .object (filter , "override" ) as override_mock :
153131 with mock .patch .object (leaf , "replace" ) as replace_override :
154132 override_mock .return_value = "fake_override"
@@ -220,18 +198,10 @@ async def test_make_through_filter():
220198 )
221199
222200 assert res .condition_tree .aggregator == Aggregator .AND
223- assert (
224- ConditionTreeLeaf ("child_id" , Operator .EQUAL , "fake_value" )
225- in res .condition_tree .conditions
226- )
227- assert (
228- ConditionTreeLeaf ("parent_id" , Operator .IN , [1 ])
229- in res .condition_tree .conditions
230- )
201+ assert ConditionTreeLeaf ("child_id" , Operator .EQUAL , "fake_value" ) in res .condition_tree .conditions
202+ assert ConditionTreeLeaf ("parent_id" , Operator .IN , [1 ]) in res .condition_tree .conditions
231203
232- mock_get_value .assert_called_once_with (
233- mocked_caller , collection , [1 ], "id"
234- )
204+ mock_get_value .assert_called_once_with (mocked_caller , collection , [1 ], "id" )
235205 mock_get_value .reset_mock ()
236206
237207 # test with unnestable PaginatedFilter
@@ -244,9 +214,7 @@ async def test_make_through_filter():
244214 )
245215
246216 fake_datasource = mock .MagicMock ()
247- fake_datasource .get_collection = mock .MagicMock (
248- return_value = fake_collection
249- )
217+ fake_datasource .get_collection = mock .MagicMock (return_value = fake_collection )
250218 collection ._datasource = fake_datasource # type: ignore
251219
252220 mock_make_foreign_filter .reset_mock ()
@@ -269,9 +237,7 @@ async def test_make_through_filter():
269237 }
270238 ),
271239 )
272- mock_get_value .assert_called_once_with (
273- mocked_caller , collection , [1 ], "id"
274- )
240+ mock_get_value .assert_called_once_with (mocked_caller , collection , [1 ], "id" )
275241 fake_datasource .get_collection .assert_called_once_with ("parent" ) # type: ignore
276242 mock_make_foreign_filter .assert_called_once_with (
277243 mocked_caller ,
@@ -293,9 +259,7 @@ async def test_make_through_filter():
293259 "condition_tree" : ConditionTreeBranch (
294260 Aggregator .AND ,
295261 conditions = [
296- ConditionTreeLeaf (
297- "child_id" , Operator .EQUAL , "fake_value"
298- ),
262+ ConditionTreeLeaf ("child_id" , Operator .EQUAL , "fake_value" ),
299263 ConditionTreeLeaf (
300264 "parent_id" ,
301265 Operator .IN ,
0 commit comments