Skip to content

Include deleted data when entries are queried #172

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 4 commits into from
Jun 11, 2020
Merged

Include deleted data when entries are queried #172

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80fa31e
Add is_deleted function to CosmosDBModel class
fabidick22 Jun 11, 2020
323c713
feature: Change visible_only to False
fabidick22 Jun 11, 2020
5aa6b61
feature: Detect if an activity was deleted
fabidick22 Jun 11, 2020
12cb129
feature: Detect if an project was deleted
fabidick22 Jun 11, 2020
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
feature: Change visible_only to False
  • Loading branch information
@fabidick22
fabidick22 committed Jun 11, 2020
commit 323c713b2d61fe8e024317259ea4dfed93cfb5cd
6 changes: 4 additions & 2 deletions time_tracker_api/time_entries/time_entries_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,17 @@ def find_all(

if time_entries:
custom_conditions = create_in_condition(time_entries, "project_id")
custom_conditions_activity = create_in_condition(time_entries, "activity_id")

project_dao = projects_model.create_dao()
projects = project_dao.get_all(
custom_sql_conditions=[custom_conditions]
custom_sql_conditions=[custom_conditions],
visible_only=False
)
add_project_name_to_time_entries(time_entries, projects)

activity_dao = activities_model.create_dao()
activities = activity_dao.get_all()
activities = activity_dao.get_all(custom_sql_conditions=[custom_conditions_activity], visible_only=False)
add_activity_name_to_time_entries(time_entries, activities)

users = AzureConnection().users()
Expand Down