Skip to content

TT-201 validate the current entry and last entry #273

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 12 commits into from
Apr 12, 2021
Merged

TT-201 validate the current entry and last entry #273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d2f5d5b
refactor: TT-201 add fucntion to add update last entry flag in model
kellycastrof Apr 1, 2021
f528a25
refactor: TT-201 add update_last_entry and get_last_entry in reposito…
kellycastrof Apr 1, 2021
30a8a85
test: TT-201 add test method for get_last_entry
kellycastrof Apr 1, 2021
4b6beb6
fix: TT-201 fix import errors and function calls in time_entry_reposi…
kellycastrof Apr 3, 2021
ad2257a
fix: TT-201 fix return None in orderBy condition
kellycastrof Apr 3, 2021
8c820ed
fix: TT-201 missed and bad arguments and order by params not supporte…
kellycastrof Apr 4, 2021
8d34667
refactor: TT-201 delete unnecessary parameters in query_builder and i…
kellycastrof Apr 5, 2021
a408915
O
VanessaIniguezG Apr 5, 2021
186a5c0
refactor: TT-201 Add tests for update last entry and update TimeEntri…
VanessaIniguezG Apr 7, 2021
7f599d4
refactor: TT-201 apply changes
kellycastrof Apr 9, 2021
e3b3101
refactor: TT-201 refactor test and return only one instance of TimeEn…
kellycastrof Apr 9, 2021
2a683b1
refactor: TT-201 add type hinting and rename start_date_tmp
kellycastrof Apr 9, 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
refactor: TT-201 add type hinting and rename start_date_tmp
  • Loading branch information
@kellycastrof
kellycastrof committed Apr 9, 2021
commit 2a683b1f6dc01a4a14afe521f465f7364f0988de
2 changes: 1 addition & 1 deletion time_tracker_api/time_entries/time_entries_dao.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def update(self, id, data: dict, description=None):
time_entry = self.repository.find(id, event_ctx)
self.check_whether_current_user_owns_item(time_entry)

if data.get('update_last_entry_if_overlap'):
if data.get('update_last_entry_if_overlap', None):
self.repository.update_last_entry(
data.get('owner_id'), data.get('start_date'), event_ctx
)
Expand Down
9 changes: 4 additions & 5 deletions time_tracker_api/time_entries/time_entries_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,16 +265,15 @@ def get_last_entry(
return function_mapper(next(result))

def update_last_entry(
self, owner_id, start_date, event_context: EventContext
self, owner_id: str, start_date: str, event_context: EventContext
):
last_entry = self.get_last_entry(owner_id, event_context)
start_date_tmp = start_date

end_date = str_to_datetime(last_entry.end_date)
start_date = str_to_datetime(start_date)
_start_date = str_to_datetime(start_date)

if start_date < end_date:
update_data = {'end_date': start_date_tmp}
if _start_date < end_date:
update_data = {'end_date': start_date}
self.partial_update(last_entry.id, update_data, event_context)

def on_create(self, new_item_data: dict, event_context: EventContext):
Expand Down