Skip to content

fix:TT-210 Dont allow activities deleting #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 16, 2021
Merged

fix:TT-210 Dont allow activities deleting #275

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1928714
fix:TT-210 Dont allow activities deleting
Apr 14, 2021
f93c707
fix: TT-210 Dont-allow activities deleting
Apr 15, 2021
1aada16
fix: TT-210 format
scastillo-jp Apr 16, 2021
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
fix: TT-210 Dont-allow activities deleting
  • Loading branch information
Pablo authored and Pablo committed Apr 15, 2021
commit f93c707524a9e2c2d793ba3f0dbdd8de86dc081d
40 changes: 31 additions & 9 deletions commons/data_access_layer/cosmos_db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,27 @@ def create_sql_condition_for_visibility(
return ''

@staticmethod
def create_sql_condition_for_active( only_active: bool,
container_name='c' ) -> str:
if only_active:
return 'AND NOT IS_DEFINED(%s.status) OR (IS_DEFINED(%s.status) AND %s.status = \'active\')' % (container_name, container_name, container_name)
def create_sql_active_condition(
status_value: str, container_name='c'
) -> str:
if status_value != None:
not_defined_condition = ''
condition_operand = ' AND '
if status_value == 'active':
not_defined_condition = (
'AND NOT IS_DEFINED({container_name}.status)'.format(
container_name=container_name
)
)
condition_operand = ' OR '

defined_condition = '(IS_DEFINED({container_name}.status) AND {container_name}.status = \'{status_value}\')'.format(
container_name=container_name, status_value=status_value
)
return (
not_defined_condition + condition_operand + defined_condition
)

return ''

@staticmethod
Expand Down Expand Up @@ -232,7 +249,6 @@ def find(
def find_all(
self,
event_context: EventContext,
only_active = True,
conditions: dict = None,
custom_sql_conditions: List[str] = None,
custom_params: dict = None,
Expand All @@ -254,14 +270,20 @@ def find_all(
{"name": "@offset", "value": offset},
{"name": "@max_count", "value": max_count},
]

status_value = None
if conditions.get('status') != None:
status_value = conditions.get('status')
conditions.pop('status')

params.extend(self.generate_params(conditions))
params.extend(custom_params)
query_str = """
SELECT * FROM c
WHERE c.{partition_key_attribute}=@partition_key_value
{conditions_clause}
{visibility_condition}
{only_active_condition}
{active_condition}
{custom_sql_conditions_clause}
{order_clause}
OFFSET @offset LIMIT @max_count
Expand All @@ -270,7 +292,7 @@ def find_all(
visibility_condition=self.create_sql_condition_for_visibility(
visible_only
),
only_active_condition=self.create_sql_condition_for_active(only_active),
active_condition=self.create_sql_active_condition(status_value),
conditions_clause=self.create_sql_where_conditions(conditions),
custom_sql_conditions_clause=self.create_custom_sql_conditions(
custom_sql_conditions
Expand Down Expand Up @@ -358,11 +380,11 @@ class CosmosDBDao(CRUDDao):
def __init__(self, repository: CosmosDBRepository):
self.repository = repository

def get_all(self, only_active = True, conditions: dict = None, **kwargs) -> list:
def get_all(self, conditions: dict = None, **kwargs) -> list:
conditions = conditions if conditions else {}
event_ctx = self.create_event_context("read-many")
return self.repository.find_all(
event_ctx, only_active, conditions=conditions, **kwargs
event_ctx, conditions=conditions, **kwargs
)

def get(self, id):
Expand Down
Loading