teacher

daemons/fetch.py

@@ -1,16 +1,17 @@
 import datetime
 from time import sleep
 
-from helpers import now
+from helpers import now, User
+from helpers.models import UserSchema
 from helpers.mongo import mongo
 from helpers.ruz import ruz
 from settings import MOSCOW_TIMEZONE
 
 
-def fetch_schedule_for_user(user_hse_id: int):
+def fetch_schedule_for_user(user: User):
     today = now()
     next_day = today + datetime.timedelta(days=7)
-    schedule = ruz.get_schedule(user_hse_id, today, next_day)
+    schedule = ruz.get_schedule(user, today, next_day)
     if schedule is None:
         return False
     saved_ids = []
@@ -21,7 +22,7 @@ def fetch_schedule_for_user(user_hse_id: int):
         lesson = mongo.lessons_collection.find_one({
             "discipline": element['discipline'],
             "auditorium": element['auditorium'],
-            "hse_user_id": user_hse_id,
+            "hse_user_id": user.hse_id,
             "begin": datetime.datetime(
                 year=int(year),
                 month=int(month),
@@ -34,7 +35,7 @@ def fetch_schedule_for_user(user_hse_id: int):
             result = mongo.lessons_collection.insert_one({
                 "discipline": element['discipline'],
                 "auditorium": element['auditorium'],
-                "hse_user_id": user_hse_id,
+                "hse_user_id": user.hse_id,
                 "begin": datetime.datetime(
                     year=int(year),
                     month=int(month),
@@ -56,13 +57,13 @@ def fetch_schedule_for_user(user_hse_id: int):
             saved_ids.append(result.inserted_id)
         else:
             saved_ids.append(lesson['_id'])
-    mongo.lessons_collection.delete_many({"hse_user_id": user_hse_id, "_id": {"$nin": saved_ids}})
+    mongo.lessons_collection.delete_many({"hse_user_id": user.hse_id, "_id": {"$nin": saved_ids}})
     return True
 
 
 def process():
     for user in mongo.users_collection.find({"hse_id": {"$ne": None}}):
-        fetch_schedule_for_user(user['hse_id'])
+        fetch_schedule_for_user(UserSchema().load(user))
 
 
 def delete_old():

daemons/notify.py

@@ -20,6 +20,7 @@ def process():
             "notified": False
         }):
             ans = ""
+            ans += f"Дисциплина: {lesson['discipline']}\n"
             ans += f"Аудитория: {lesson['building']}, {lesson['auditorium']}\n"
             ans += f"Начало: {lesson['begin'].strftime('%H:%M')}\n"
             ans += f"Конец: {lesson['end'].strftime('%H:%M')}\n"