From 1a707c871d8ac7093738399fa97014e1822c316d Mon Sep 17 00:00:00 2001
From: Dan de Sybel <daniel.de.sybel@gmail.com>
Date: Thu, 6 Feb 2025 21:21:07 +0000
Subject: [PATCH] move common module to see if that fixes imports

---
 controllers/common/__init__.py     | 0
 controllers/{ => common}/common.py | 0
 controllers/filters.py             | 2 +-
 controllers/messages.py            | 2 +-
 controllers/posts.py               | 2 +-
 controllers/reports.py             | 2 +-
 controllers/root.py                | 2 +-
 controllers/users.py               | 2 +-
 tests/conftest.py                  | 4 ++--
 tests/test_common.py               | 4 ++--
 10 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 controllers/common/__init__.py
 rename controllers/{ => common}/common.py (100%)

diff --git a/controllers/common/__init__.py b/controllers/common/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/controllers/common.py b/controllers/common/common.py
similarity index 100%
rename from controllers/common.py
rename to controllers/common/common.py
diff --git a/controllers/filters.py b/controllers/filters.py
index ae29fe8b..c21e99ef 100644
--- a/controllers/filters.py
+++ b/controllers/filters.py
@@ -6,7 +6,7 @@
 from auth import UserData, requires_auth
 from config.config import sah_config
 
-from .common import validator
+from .common.common import validator
 from models import Filter
 
 filters_endpoints = Blueprint("filters", __name__)
diff --git a/controllers/messages.py b/controllers/messages.py
index 133f1034..4ccbe214 100644
--- a/controllers/messages.py
+++ b/controllers/messages.py
@@ -7,7 +7,7 @@
 from auth import AuthError, UserData, requires_auth
 from config.config import sah_config
 
-from .common import (
+from .common.common import (
     DATETIME_PATTERN,
     get_current_filters,
     get_thread_id_for_users,
diff --git a/controllers/posts.py b/controllers/posts.py
index 1594e6c4..41ea1e5c 100644
--- a/controllers/posts.py
+++ b/controllers/posts.py
@@ -7,7 +7,7 @@
 from auth import AuthError, UserData, requires_auth
 from config.config import sah_config
 
-from .common import (
+from .common.common import (
     DATETIME_PATTERN,
     get_current_filters,
     get_thread_id_for_users,
diff --git a/controllers/reports.py b/controllers/reports.py
index 76064c73..080abf4a 100644
--- a/controllers/reports.py
+++ b/controllers/reports.py
@@ -7,7 +7,7 @@
 from auth import UserData, requires_auth
 from config.config import sah_config
 
-from .common import DATETIME_PATTERN, validator
+from .common.common import DATETIME_PATTERN, validator
 from models import Post, Report, User
 
 reports_endpoints = Blueprint("reports", __name__)
diff --git a/controllers/root.py b/controllers/root.py
index 70bd417f..605d643c 100644
--- a/controllers/root.py
+++ b/controllers/root.py
@@ -6,7 +6,7 @@
 
 from config.config import sah_config
 
-from .common import validator
+from .common.common import validator
 from models import Post, User
 
 root_endpoints = Blueprint("root", __name__)
diff --git a/controllers/users.py b/controllers/users.py
index 70099e9b..2a0de090 100644
--- a/controllers/users.py
+++ b/controllers/users.py
@@ -7,7 +7,7 @@
 from auth import AuthError, UserData, requires_auth
 from config.config import sah_config
 
-from .common import send_push_notification, validator
+from .common.common import send_push_notification, validator
 from models import (
     BLOCKED_USER_ROLE_ID,
     Notification,
diff --git a/tests/conftest.py b/tests/conftest.py
index 6a4f56bf..7e76b1b2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -146,7 +146,7 @@ def get_scoped_session():
         # Mock the session for all controllers
         # TODO: Surely there's a better way to do this
         controllers = listdir(path.join(path.dirname(__file__), "../controllers"))
-        non_controllers = ["__init__.py", "common.py", "__pycache__"]
+        non_controllers = ["__init__.py", "common", "__pycache__"]
         for controller in controllers:
             if controller in non_controllers:
                 continue
@@ -160,7 +160,7 @@ def get_scoped_session():
 
         await db.session.begin_nested()
         mocker.patch("pywebpush.webpush")
-        mocker.patch("controllers.common.webpush")
+        mocker.patch("controllers.common.common.webpush")
 
         yield db
 
diff --git a/tests/test_common.py b/tests/test_common.py
index a73a7f65..42df35ac 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -29,7 +29,7 @@
 from pytest_mock import MockerFixture
 from quart.typing import TestClientProtocol
 
-from controllers.common import send_email_notification
+from controllers.common.common import send_email_notification
 
 from models.db import SendADatabase
 from utils.push_notifications import RawPushData
@@ -39,7 +39,7 @@
 async def test_send_email_notification(
     app_client: TestClientProtocol, test_db: SendADatabase, mocker: MockerFixture
 ) -> None:
-    send_email_func = mocker.patch("controllers.common.send_email")
+    send_email_func = mocker.patch("controllers.common.common.send_email")
 
     async with app_client.app.app_context():
         await send_email_notification(