fix merge conflict

src/template_project/adapters/data_gateways/notification_device.py

@@ -4,9 +4,9 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from template_project.adapters.data_gateways.tables import notification_device_table
+from template_project.application.notification_device.data_gateway import NotificationDeviceDataGateway
+from template_project.application.notification_device.entity import NotificationDevice
 from template_project.application.user.entity import UserId
-from template_project.application.user.notification_device.data_gateway import NotificationDeviceDataGateway
-from template_project.application.user.notification_device.entity import NotificationDevice
 
 
 class DefaultNotificationDeviceDataGateway(NotificationDeviceDataGateway):
@@ -18,3 +18,16 @@ class DefaultNotificationDeviceDataGateway(NotificationDeviceDataGateway):
         statement = select(NotificationDevice).where(notification_device_table.c.user_id == user_id)
         result = await self._session.execute(statement)
         return result.scalar_one_or_none()
+
+    @override
+    async def load_by_user_id_and_device_id(
+        self,
+        user_id: UserId,
+        device_id: str,
+    ) -> NotificationDevice | None:
+        statement = select(NotificationDevice).where(
+            notification_device_table.c.user_id == user_id,
+            notification_device_table.c.device_id == device_id,
+        )
+        result = await self._session.execute(statement)
+        return result.scalar_one_or_none()

src/template_project/adapters/data_gateways/tables.py

@@ -14,8 +14,8 @@ from sqlalchemy.orm import registry
 
 from template_project.application.access_token.entity import AccessToken
 from template_project.application.auth_identity.entity import AuthIdentity, AuthMethod
+from template_project.application.notification_device.entity import NotificationDevice
 from template_project.application.user.entity import User
-from template_project.application.user.notification_device.entity import NotificationDevice
 from template_project.application.user.profile.entity import Profile
 
 meta_data = MetaData()