chore: optimize endpoint for event group .ics file update

one-zero-eight · Oct 18, 2023 · 871113c · 871113c · github-actions · Oct 18, 2023
1 parent c4ebcde
commit 871113c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/src/app/event_groups/routes.py b/src/app/event_groups/routes.py
@@ -173,6 +173,7 @@ async def list_event_groups(
         **NoCredentialsException.responses,
     },
     status_code=201,
+    tags=["ICS"],
 )
 async def set_event_group_ics(
     event_group_id: int,
@@ -190,12 +191,9 @@ async def set_event_group_ics(
             content={"detail": f"File content type is {ics_file.content_type}, but should be 'text/calendar'"},
         )
 
-    event_group = await event_group_repository.read(event_group_id)
-
-    if event_group is None:
-        raise EventGroupNotFoundException()
+    event_group_path = await event_group_repository.get_only_path(event_group_id)
 
-    if event_group.path is None:
+    if event_group_path is None:
         raise EventGroupWithMissingPath()
 
     # owners_and_moderators = {ownership.user_id for ownership in event_group.ownerships}
@@ -213,7 +211,7 @@ async def set_event_group_ics(
 
     content = calendar.to_ical()
 
-    ics_path = PredefinedRepository.locate_ics_by_path(event_group.path)
+    ics_path = PredefinedRepository.locate_ics_by_path(event_group_path)
 
     async with aiofiles.open(ics_path, "rb") as f:
         old_content = await f.read()

diff --git a/src/repositories/event_groups/abc.py b/src/repositories/event_groups/abc.py
@@ -1,7 +1,7 @@
 __all__ = ["AbstractEventGroupRepository"]
 
 from abc import ABCMeta, abstractmethod
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from src.schemas import CreateEventGroup, ViewEventGroup, OwnershipEnum, UpdateEventGroup
@@ -47,6 +47,10 @@ async def batch_update(self, event_groups: dict[int, "UpdateEventGroup"]) -> lis
 
     # ^^^^^^^^^^^^^^^^^ CRUD ^^^^^^^^^^^^^^^^^^^^^^^^ #
 
+    @abstractmethod
+    async def get_only_path(self, group_id: int) -> Optional[str]:
+        ...
+
     @abstractmethod
     async def setup_ownership(self, group_id: int, user_id: int, role_alias: "OwnershipEnum") -> None:
         ...

diff --git a/src/repositories/event_groups/repository.py b/src/repositories/event_groups/repository.py
@@ -1,16 +1,23 @@
 __all__ = ["SqlEventGroupRepository"]
 
+from typing import Optional
+
+from sqlalchemy import select
 from sqlalchemy.dialects.postgresql import insert as postgres_insert
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.repositories.crud import CRUDFactory
+from src.repositories.crud import CRUDFactory, AbstractCRUDRepository
 from src.repositories.event_groups.abc import AbstractEventGroupRepository
 from src.repositories.ownership import setup_ownership_method
 from src.schemas import ViewEventGroup, CreateEventGroup, UpdateEventGroup, OwnershipEnum
 from src.storages.sql import AbstractSQLAlchemyStorage
 from src.storages.sql.models import UserXFavoriteEventGroup, EventGroup
 
-CRUD = CRUDFactory(
+CRUD: AbstractCRUDRepository[
+    CreateEventGroup,
+    ViewEventGroup,
+    UpdateEventGroup,
+] = CRUDFactory(
     EventGroup,
     CreateEventGroup,
     ViewEventGroup,
@@ -41,6 +48,12 @@ async def read(self, group_id: int) -> ViewEventGroup:
         async with self._create_session() as session:
             return await CRUD.read(session, id=group_id)
 
+    async def get_only_path(self, group_id: int) -> Optional[str]:
+        async with self._create_session() as session:
+            q = select(EventGroup.path).where(EventGroup.id == group_id).where(EventGroup.path.isnot(None))
+            path: Optional[str] = await session.scalar(q)
+            return path
+
     async def read_all(self) -> list[ViewEventGroup]:
         async with self._create_session() as session:
             return await CRUD.read_all(session)
File	Stmts	Miss	Cover	Missing
src
exceptions.py	35	8	77%	11, 28, 42, 56, 70, 84, 98, 112
main.py	27	21	22%	9–67
utils.py	70	70	0%	1–125
src/app
dependencies.py	47	8	83%	29, 33, 37, 41, 45, 49, 53, 57
routers.py	8	3	62%	10–14
src/app/auth
common.py	28	17	39%	12–21, 25–32, 36–44, 49–50
dependencies.py	19	9	53%	33–38, 44–47
jwt.py	51	34	33%	26–28, 32–36, 40–44, 48–53, 57–70, 74–81
src/app/event_groups
routes.py	70	46	34%	39–45, 65–76, 94–98, 116–120, 137–142, 157–158, 188–224
src/app/ics
routes.py	87	73	16%	19–187
src/app/root
__init__.py	4	4	0%	1–8
routes.py	13	13	0%	1–48
src/app/tags
routes.py	10	2	80%	24–25
src/app/users
routes.py	25	13	48%	32–34, 54–59, 78–80, 102–107
src/app/workshops
__init__.py	5	5	0%	1–9
routes.py	16	16	0%	1–63
src/repositories
crud.py	94	62	34%	82, 87–92, 95–101, 104–111, 116–121, 124–137, 140–144, 149–157, 161–166, 171–180, 183–185
ownership.py	13	7	46%	13–29
src/repositories/event_groups
repository.py	65	36	45%	32, 35, 40–41, 44–45, 48–49, 52–55, 58–59, 62–63, 66–67, 70–71, 74–75, 78–81, 88–90, 93–103, 106–123
src/repositories/events
__init__.py	3	3	0%	1–7
abc.py	4	4	0%	1–10
repository.py	50	50	0%	1–87
src/repositories/predefined
repository.py	143	87	39%	24–29, 48–70, 83–89, 105–109, 113–124, 127, 130, 133, 136, 140, 144–155, 159–168, 172–202
src/repositories/tags
repository.py	76	48	37%	22, 25, 29–33, 36–52, 55–56, 59–60, 63–64, 67–68, 71–72, 75–76, 81–83, 86–94, 97–118, 121–125
src/repositories/users
repository.py	95	64	33%	20, 36–44, 51, 54, 58–63, 66–80, 83–95, 98–99, 102–104, 107–108, 113–133, 136–150, 153–177
src/repositories/workshops
__init__.py	3	3	0%	1–4
abc.py	4	4	0%	1–10
repository.py	34	34	0%	1–68
src/schemas
event_groups.py	45	4	91%	27, 45–46, 86
events.py	71	16	77%	47–57, 77–79, 98–100
ownership.py	16	1	94%	21
tags.py	39	9	77%	19–21, 35–37, 51–53
users.py	24	3	88%	30–32
workshops.py	58	58	0%	1–85
src/storages/sql
storage.py	23	10	57%	26–27, 31–34, 37, 40–43, 46
TOTAL	1662	845	49%