Skip to content

Commit daed9c8

Browse files
Merge pull request #52 from edx/hammad/ENT-4202
ENT-4202 | Updated logging.
2 parents 86bca6f + a560972 commit daed9c8

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ Change Log
1414
Unreleased
1515
--------------------
1616

17-
[1.5.0] - 2021-03-04
17+
[1.6.1] - 2021-03-10
18+
--------------------
19+
20+
* Updated logging structure for `refresh_course_skills` command.
21+
22+
[1.6.0] - 2021-03-09
1823
--------------------
1924

2025
* Added support for --all param in `refresh_course_skills` command to back populate data.

taxonomy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
# 2. MINOR version when you add functionality in a backwards compatible manner, and
1616
# 3. PATCH version when you make backwards compatible bug fixes.
1717
# More details can be found at https://semver.org/
18-
__version__ = '1.6.0'
18+
__version__ = '1.6.1'
1919

2020
default_app_config = 'taxonomy.apps.TaxonomyConfig' # pylint: disable=invalid-name

taxonomy/management/commands/refresh_course_skills.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,15 @@ def handle(self, *args, **options):
9090
raise InvalidCommandOptionsError('Either course or all argument must be provided.')
9191

9292
LOGGER.info('[TAXONOMY] Refresh course skills process started.')
93-
success_courses, skipped_courses, failures = utils.refresh_course_skills(courses, options['commit'])
93+
success_courses_count, skipped_courses_count, failures = utils.refresh_course_skills(courses, options['commit'])
9494
LOGGER.info(
9595
'[TAXONOMY] Refresh course skills process completed. \n'
96-
'Courses Updated Successfully: %s \n'
97-
'Courses Skipped: %s \n'
9896
'Failures: %s \n'
9997
'Total Courses Updated Successfully: %s \n'
10098
'Total Courses Skipped: %s \n'
10199
'Total Failures: %s \n',
102-
success_courses,
103-
skipped_courses,
104100
failures,
105-
len(success_courses),
106-
len(skipped_courses),
101+
success_courses_count,
102+
skipped_courses_count,
107103
len(failures),
108104
)

taxonomy/utils.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ def refresh_course_skills(courses, should_commit_to_db):
6666
Refresh the skills associated with the provided courses.
6767
"""
6868
all_failures = []
69-
success_courses = []
70-
skipped_courses = []
69+
success_courses_count = 0
70+
skipped_courses_count = 0
7171

7272
client = EMSISkillsApiClient()
7373

@@ -81,15 +81,15 @@ def refresh_course_skills(courses, should_commit_to_db):
8181
if failures:
8282
all_failures += failures
8383
else:
84-
success_courses.append((course['uuid'], course['key']))
84+
success_courses_count += 1
8585
except TaxonomyAPIError:
8686
message = f'[TAXONOMY] API Error for course_key: {course["key"]}'
8787
LOGGER.error(message)
8888
all_failures.append((course['uuid'], message))
8989
else:
90-
skipped_courses.append((course['uuid'], course['key']))
90+
skipped_courses_count += 1
9191

92-
return success_courses, skipped_courses, all_failures
92+
return success_courses_count, skipped_courses_count, all_failures
9393

9494

9595
def blacklist_course_skill(course_key, skill_id):

tests/management/test_refresh_course_skills.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,10 @@ def test_course_without_description(self, get_course_provider_mock):
100100
'[TAXONOMY] Refresh Course Skills. Options: [%s]',
101101
'[TAXONOMY] Refresh course skills process started.',
102102
'[TAXONOMY] Refresh course skills process completed. \n'
103-
'Courses Updated Successfully: %s \n'
104-
'Courses Skipped: %s \n'
105103
'Failures: %s \n'
106104
'Total Courses Updated Successfully: %s \n'
107-
'Total Courses Skipped: %s \nTotal Failures: %s \n'
105+
'Total Courses Skipped: %s \n'
106+
'Total Failures: %s \n'
108107
]
109108
)
110109

@@ -193,11 +192,10 @@ def test_course_skill_not_saved_upon_exception(self, get_course_skills_mock, get
193192
f'[TAXONOMY] API Error for course_key: {self.course_1.key}',
194193
f'[TAXONOMY] API Error for course_key: {self.course_2.key}',
195194
'[TAXONOMY] Refresh course skills process completed. \n'
196-
'Courses Updated Successfully: %s \n'
197-
'Courses Skipped: %s \n'
198195
'Failures: %s \n'
199196
'Total Courses Updated Successfully: %s \n'
200-
'Total Courses Skipped: %s \nTotal Failures: %s \n'
197+
'Total Courses Skipped: %s \n'
198+
'Total Failures: %s \n'
201199
]
202200
)
203201

@@ -267,8 +265,6 @@ def test_course_skill_not_saved_for_key_error(self, get_course_skills_mock, get_
267265
'[TAXONOMY] Skills data received from EMSI. Skills: [%s]',
268266
f'[TAXONOMY] Missing keys in skills data for course_key: {self.course_2.key}',
269267
'[TAXONOMY] Refresh course skills process completed. \n'
270-
'Courses Updated Successfully: %s \n'
271-
'Courses Skipped: %s \n'
272268
'Failures: %s \n'
273269
'Total Courses Updated Successfully: %s \n'
274270
'Total Courses Skipped: %s \n'
@@ -310,8 +306,6 @@ def test_course_skill_not_saved_for_type_error(self, get_course_skills_mock, get
310306
'[TAXONOMY] Skills data received from EMSI. Skills: [%s]',
311307
f'[TAXONOMY] Invalid type for `confidence` in course skills for course_key: {self.course_2.key}',
312308
'[TAXONOMY] Refresh course skills process completed. \n'
313-
'Courses Updated Successfully: %s \n'
314-
'Courses Skipped: %s \n'
315309
'Failures: %s \n'
316310
'Total Courses Updated Successfully: %s \n'
317311
'Total Courses Skipped: %s \n'

0 commit comments

Comments
 (0)