@@ -115,7 +115,7 @@ class DashboardCronJob(CronJobBase):
115
115
def __init__ (self ) -> None :
116
116
"""Constructor to be used to declare valid_locked_course_ids instance variable."""
117
117
super ().__init__ ()
118
- self .valid_locked_course_ids : List [int ]
118
+ self .valid_locked_course_ids : List [str ]
119
119
120
120
# verify whether course ids are valid
121
121
def verify_course_ids (self ):
@@ -447,7 +447,7 @@ def update_groups(self):
447
447
# loop through multiple course ids
448
448
status += util_function (queries ['assignment_groups' ],
449
449
'assignment_groups' ,
450
- {'course_ids' :tuple (self .valid_locked_course_ids )})
450
+ {'course_ids' : tuple (self .valid_locked_course_ids )})
451
451
452
452
return status
453
453
@@ -463,7 +463,7 @@ def update_assignment(self):
463
463
# loop through multiple course ids
464
464
status += util_function (queries ['assignment' ],
465
465
'assignment' ,
466
- {'course_ids' :tuple (self .valid_locked_course_ids )})
466
+ {'course_ids' : tuple (self .valid_locked_course_ids )})
467
467
468
468
return status
469
469
@@ -482,7 +482,7 @@ def submission(self):
482
482
status += util_function (queries ['submission' ],
483
483
'submission' ,
484
484
{
485
- 'course_ids' :tuple (self .valid_locked_course_ids ),
485
+ 'course_ids' : tuple (self .valid_locked_course_ids ),
486
486
'canvas_data_id_increment' : settings .CANVAS_DATA_ID_INCREMENT
487
487
})
488
488
@@ -501,7 +501,7 @@ def weight_consideration(self):
501
501
# loop through multiple course ids
502
502
status += util_function (queries ['assignment_weight' ],
503
503
'assignment_weight_consideration' ,
504
- {'course_ids' :tuple (self .valid_locked_course_ids )},
504
+ {'course_ids' : tuple (self .valid_locked_course_ids )},
505
505
'weight' )
506
506
507
507
logger .debug (status + "\n \n " )
@@ -581,7 +581,7 @@ def update_course(self, warehouse_courses_data: pd.DataFrame) -> str:
581
581
status += f'Course { course .id } : updated { ", " .join (updated_fields )} \n '
582
582
return status
583
583
584
- def do (self ):
584
+ def do (self ) -> str :
585
585
logger .info ("** MyLA cron tab" )
586
586
587
587
status = ""
@@ -595,7 +595,7 @@ def do(self):
595
595
status += f"ERROR: Those course ids are invalid: { invalid_course_id_list } \n "
596
596
status += "End cron: " + str (datetime .now ()) + "\n "
597
597
logger .info ("************ total status=" + status + "/n/n" )
598
- return ( status ,)
598
+ return status
599
599
600
600
# Lock in valid course IDs that data will be pulled for.
601
601
self .valid_locked_course_ids = [str (x ) for x in course_verification .course_data ['id' ].to_list ()]
@@ -639,12 +639,14 @@ def do(self):
639
639
logger .info ("** informational" )
640
640
status += self .update_unizin_metadata ()
641
641
642
- courses_added_during_cron : List [int ] = list (
643
- set (Course .objects .get_supported_courses ().values_list ('id' , flat = True )) - set (self .valid_locked_course_ids ))
642
+ all_str_course_ids = set (
643
+ str (x ) for x in Course .objects .get_supported_courses ().values_list ('id' , flat = True )
644
+ )
645
+ courses_added_during_cron : List [str ] = list (all_str_course_ids - set (self .valid_locked_course_ids ))
644
646
if courses_added_during_cron :
645
- logger .warning (
647
+ logger .debug (
646
648
f'During the run, users added { len (courses_added_during_cron )} course(s): { courses_added_during_cron } ' )
647
- logger .warning (f'No data was pulled for these courses.' )
649
+ logger .debug (f'No data was pulled for these courses.' )
648
650
649
651
# Set all of the courses to have been updated now (this is the same set update_course runs on)
650
652
if not exception_in_run :
0 commit comments