Skip to content
Merged
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
Next Next commit
fix(time-entries): 🚑 move logic of project names to time-entries DAO …
…to keep compatibility with repository level functions
  • Loading branch information
Angeluz-07 committed May 14, 2020
commit aae2fac4e61a8af151cf25a7be165f33144ca0d3
39 changes: 13 additions & 26 deletions time_tracker_api/time_entries/time_entries_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,24 +110,6 @@ def create_sql_date_range_filter(date_range: dict) -> str:
else:
return ''

def find(
self,
id: str,
event_context: EventContext,
peeker: Callable = None,
visible_only=True,
mapper: Callable = None,
):
time_entry = CosmosDBRepository.find(
self, id, event_context, peeker, visible_only, mapper,
)

project_dao = projects_model.create_dao()
project = project_dao.get(time_entry.project_id)
setattr(time_entry, 'project_name', project.name)

return time_entry

def find_all(
self,
event_context: EventContext,
Expand All @@ -141,19 +123,14 @@ def find_all(

custom_params = self.generate_params(date_range)

time_entries = CosmosDBRepository.find_all(
return CosmosDBRepository.find_all(
self,
event_context=event_context,
conditions=conditions,
custom_sql_conditions=custom_sql_conditions,
custom_params=custom_params,
)

project_dao = projects_model.create_dao()
projects = project_dao.get_all()
add_project_name_to_time_entries(time_entries, projects)
return time_entries

def on_create(self, new_item_data: dict, event_context: EventContext):
CosmosDBRepository.on_create(self, new_item_data, event_context)

Expand Down Expand Up @@ -310,16 +287,26 @@ def get_all(self, conditions: dict = {}) -> list:
conditions.update({"owner_id": event_ctx.user_id})

date_range = self.handle_date_filter_args(args=conditions)
return self.repository.find_all(
time_entries = self.repository.find_all(
event_ctx, conditions=conditions, date_range=date_range
)

project_dao = projects_model.create_dao()
projects = project_dao.get_all()
add_project_name_to_time_entries(time_entries, projects)
return time_entries

def get(self, id):
event_ctx = self.create_event_context("read")
return self.repository.find(
time_entry = self.repository.find(
id, event_ctx, peeker=self.check_whether_current_user_owns_item
)

project_dao = projects_model.create_dao()
project = project_dao.get(time_entry.project_id)
setattr(time_entry, 'project_name', project.name)
return time_entry

def create(self, data: dict):
event_ctx = self.create_event_context("create")
data['owner_id'] = event_ctx.user_id
Expand Down