Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: ♻️ replace peeker logic
  • Loading branch information
Angeluz-07 committed May 20, 2020
commit b6476e2df76266f96dd29240cec0deeed4944f70
51 changes: 23 additions & 28 deletions commons/data_access_layer/cosmos_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,20 +210,25 @@ def find(
self,
id: str,
event_context: EventContext,
peeker: Callable = None,
visible_only=True,
mapper: Callable = None,
):
partition_key_value = self.find_partition_key_value(event_context)
found_item = self.container.read_item(id, partition_key_value)
if peeker:
peeker(found_item)

function_mapper = self.get_mapper_or_dict(mapper)
return function_mapper(self.check_visibility(found_item, visible_only))

def find_all(self, event_context: EventContext, conditions: dict = {}, custom_sql_conditions: List[str] = [],
custom_params: dict = {}, max_count=None, offset=0, visible_only=True, mapper: Callable = None):
def find_all(
self,
event_context: EventContext,
conditions: dict = {},
custom_sql_conditions: List[str] = [],
custom_params: dict = {},
max_count=None,
offset=0,
visible_only=True,
mapper: Callable = None,
):
partition_key_value = self.find_partition_key_value(event_context)
max_count = self.get_page_size_or(max_count)
params = [
Expand All @@ -242,16 +247,16 @@ def find_all(self, event_context: EventContext, conditions: dict = {}, custom_sq
{order_clause}
OFFSET @offset LIMIT @max_count
""".format(
partition_key_attribute=self.partition_key_attribute,
visibility_condition=self.create_sql_condition_for_visibility(
visible_only
),
conditions_clause=self.create_sql_where_conditions(conditions),
custom_sql_conditions_clause=self.create_custom_sql_conditions(
custom_sql_conditions
),
order_clause=self.create_sql_order_clause(),
)
partition_key_attribute=self.partition_key_attribute,
visibility_condition=self.create_sql_condition_for_visibility(
visible_only
),
conditions_clause=self.create_sql_where_conditions(conditions),
custom_sql_conditions_clause=self.create_custom_sql_conditions(
custom_sql_conditions
),
order_clause=self.create_sql_order_clause(),
)

result = self.container.query_items(
query=query_str,
Expand All @@ -268,16 +273,11 @@ def partial_update(
id: str,
changes: dict,
event_context: EventContext,
peeker: Callable = None,
visible_only=True,
mapper: Callable = None,
):
item_data = self.find(
id,
event_context,
peeker=peeker,
visible_only=visible_only,
mapper=dict,
id, event_context, visible_only=visible_only, mapper=dict,
)
item_data.update(changes)
return self.update(id, item_data, event_context, mapper=mapper)
Expand All @@ -295,17 +295,12 @@ def update(
return function_mapper(self.container.replace_item(id, body=item_data))

def delete(
self,
id: str,
event_context: EventContext,
peeker: Callable = None,
mapper: Callable = None,
self, id: str, event_context: EventContext, mapper: Callable = None,
):
return self.partial_update(
id,
{'deleted': generate_uuid4()},
event_context,
peeker=peeker,
visible_only=True,
mapper=mapper,
)
Expand Down
Loading