fix: refactor re, optimize regular exsperssion, fix bug with cache

Author: depocoder

backend/yet_another_calendar/settings.py

@@ -50,6 +50,7 @@ class Settings(BaseSettings):
     redis_events_time_live: int = 60 * 60 * 24 * 14  # 2 weeks
     redis_utmn_teachers_time_live: int = 60 * 60 * 24 * 30  # 30 days
     redis_prefix: str = 'FastAPI-redis'
+    redis_lesson_prefix: str = "calendar"
 
     retry_tries: int = 5
     retry_delay: int = 3

backend/yet_another_calendar/tests/test_netology.py

@@ -220,6 +220,8 @@ async def test_lesson_webinar_schema() -> None:
     ("Submit by 00.04.24", (2024, 4, 1)),
     ("Submit by 00..04..24", (2024, 4, 1)),
     ("Submit by 01.04.2025", (2025, 4, 1)),
+    ("Submit by 01.04.2025", (2025, 4, 1)),
+    ("Домашнее задание 8 (тест) к теме 10 «Ядро и уровень пользователя» (дедлайн 22.05.25)", (2025, 5, 22)),
 ])
 @pytest.mark.asyncio
 async def test_lesson_task_schema_validation(title: str, date: tuple[int, int, int] | None) -> None:

backend/yet_another_calendar/web/api/bulk/integration.py

@@ -101,7 +101,7 @@ async def refresh_events(
         coder = FastAPICache.get_coder()
         backend = FastAPICache.get_backend()
         await backend.set(
-            key=f"{settings.redis_prefix}:{cache_key}",
+            key=f"{settings.redis_prefix}:{settings.redis_lesson_prefix}{cache_key}",
             value=coder.encode(calendar),
             expire=settings.redis_events_time_live)
     except Exception as exception:
@@ -140,7 +140,7 @@ async def get_calendar(
 @cache(
     expire=settings.redis_events_time_live,
     key_builder=key_builder,
-    namespace="calendar",
+    namespace=settings.redis_lesson_prefix,
 )  # type i
 async def get_cached_calendar(
         body: modeus_schema.ModeusTimeBody,

backend/yet_another_calendar/web/api/netology/schema.py

@@ -11,7 +11,7 @@
 from yet_another_calendar.web.api.modeus.schema import ModeusTimeBody
 from yet_another_calendar.web.api.validators import OptionalUTCDate
 
-_DATE_PATTERN = r"(?<!\d)(\d{2})\D+(\d{2})\D+(?:\d{2})?(\d{2})(?!\d)"
+_DATE_PATTERN = re.compile(r"(?<!\d)(\d{2})[^\w]+(\d{2})[^\w]+(?:\d{2})?(\d{2})(?!\d)")
 
 class NetologyCreds(BaseModel):
     """Netology creds."""
@@ -106,7 +106,7 @@ def deadline_validation(cls, data: Any) -> Any:
         if not isinstance(data, dict):
             return data
         title = str(data.get('title', ''))
-        match = re.search(_DATE_PATTERN, title)
+        match = _DATE_PATTERN.search(title)
         if not match:
             return data
         try: