Skip to content
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

update term override logic #992

Merged
merged 1 commit into from
Nov 20, 2024
Merged

update term override logic #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions sis_provisioner/dao/canvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,7 @@ def delete_course(course_id):


def update_term_overrides(term_sis_id, override_dates):
overrides = {}
for role in override_dates.keys():
overrides[role] = {
'start_at': override_dates[role][0],
'end_at': override_dates[role][1]
}

return Terms().update_term_overrides(term_sis_id, overrides=overrides)
return Terms().update_term_overrides(term_sis_id, overrides=override_dates)


def get_section_by_sis_id(section_sis_id):
Expand Down
25 changes: 10 additions & 15 deletions sis_provisioner/dao/term.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,16 @@ def term_date_overrides(term):
overrides = {}
for role_choice in CanvasEnrollment.ROLE_CHOICES:
role = role_choice[0]
if role == CanvasEnrollment.OBSERVER:
continue
elif role == CanvasEnrollment.TEACHER:
overrides[role] = (
(quarter_term_start_date(term) - timedelta(days=365)).strftime(
TERM_DATE_FORMAT),
(quarter_term_end_date(term) + timedelta(days=365*5)).strftime(
TERM_DATE_FORMAT))
else:
overrides[role] = (
(quarter_term_start_date(term) - timedelta(days=365)).strftime(
TERM_DATE_FORMAT),
(quarter_term_end_date(term) + timedelta(days=365)).strftime(
TERM_DATE_FORMAT))

if role == CanvasEnrollment.STUDENT:
overrides[role] = {
'start_at': (quarter_term_start_date(term) - timedelta(
days=365)).strftime(TERM_DATE_FORMAT),
}
elif role != CanvasEnrollment.OBSERVER:
overrides[role] = {
'end_at': (quarter_term_end_date(term) + timedelta(
days=365*7)).strftime(TERM_DATE_FORMAT),
}
return overrides


Expand Down
5 changes: 2 additions & 3 deletions sis_provisioner/test/dao/test_canvas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,9 @@ def test_get_term_by_sis_id(self, mock_method):

@mock.patch.object(Terms, 'update_term_overrides')
def test_update_term_overrides(self, mock_method):
r = update_term_overrides('abc', {'xyz': ('somedate', 'anotherdate')})
r = update_term_overrides('abc', {'xyz': {'start_at': 'somedate'}})
mock_method.assert_called_with(
'abc', overrides={
'xyz': {'start_at': 'somedate', 'end_at': 'anotherdate'}})
'abc', overrides={'xyz': {'start_at': 'somedate'}})


@fdao_sws_override
Expand Down
14 changes: 6 additions & 8 deletions sis_provisioner/test/dao/test_term.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,10 @@ def test_term_end_date(self):

def test_term_overrides(self):
term = get_term_by_year_and_quarter(2013, 'summer')
self.maxDiff = None
self.assertEqual(term_date_overrides(term), {
'StudentEnrollment': (
'2012-06-24T00:00:00-0800', '2014-08-28T00:00:00-0800'),
'TaEnrollment': (
'2012-06-24T00:00:00-0800', '2014-08-28T00:00:00-0800'),
'TeacherEnrollment': (
'2012-06-24T00:00:00-0800', '2018-08-27T00:00:00-0800'),
'DesignerEnrollment': (
'2012-06-24T00:00:00-0800', '2014-08-28T00:00:00-0800')})
'StudentEnrollment': {'start_at': '2012-06-24T00:00:00-0800'},
'TaEnrollment': {'end_at': '2020-08-26T00:00:00-0800'},
'TeacherEnrollment': {'end_at': '2020-08-26T00:00:00-0800'},
'DesignerEnrollment': {'end_at': '2020-08-26T00:00:00-0800'},
})