Fix issue with notifications

litolax · Sep 8, 2023 · ec7916b · ec7916b
1 parent 03dff80
commit ec7916b
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/StudentsTimetable/Services/ParseService.cs b/StudentsTimetable/Services/ParseService.cs
@@ -176,13 +176,29 @@ public async Task ParseDay()
 
             if (groupInfoFromTimetable is null || groupInfoFromTimetable.Equals(groupInfo)) continue;
 
-            _ = this._botService.SendAdminMessageAsync(
-                new SendMessageArgs(0, $"Расписание у группы {groupInfo.Number}"));
+            try
+            {
+                _ = this._botService.SendAdminMessageAsync(
+                    new SendMessageArgs(0, $"Расписание у группы {groupInfo.Number}"));
+
+                var userList = (await this._mongoService.Database.GetCollection<User>("Users")
+                        .FindAsync(u => u.Group != null && u.Notifications)).ToList().Where(u =>
+                    {
+                        if (u?.Group != null && int.TryParse(Regex.Replace(u.Group, "[^0-9]", ""), out int userGroupNumber))
+                        {
+                            return userGroupNumber == groupInfo.Number;
+                        }
+
+                        return false;
+                    })
+                    .ToList();
 
-            notificationUserList.AddRange((await this._mongoService.Database.GetCollection<User>("Users")
-                .FindAsync(u =>
-                    u.Group != null && int.Parse(Regex.Replace(u.Group, "[^0-9]", "")) == groupInfo.Number &&
-                    u.Notifications)).ToList());
+                notificationUserList.AddRange(userList);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
         }