OpenConceptLab/ocl_issues#1729 | Refactoring services | creating dir …

…structure
OpenConceptLab · Jan 10, 2024 · bcd9dc3 · bcd9dc3
1 parent 62d5ae6
commit bcd9dc3
Show file tree

Hide file tree

Showing 34 changed files with 956 additions and 909 deletions.
diff --git a/core/common/authentication.py b/core/common/authentication.py
@@ -10,7 +10,7 @@ class OCLAuthentication(BaseAuthentication):
     3. Uses Auth Service to determine auth class Django/OIDC
     """
     def get_auth_class(self, request):
-        from core.common.services import AuthService
+        from core.services.auth.core import AuthService
         if AuthService.is_valid_django_token(request) or get(settings, 'TEST_MODE', False):
             klass = TokenAuthentication
         else:

diff --git a/core/common/backends.py b/core/common/backends.py
@@ -99,7 +99,7 @@ def get_auth_backend(self, request=None):
         if get(self, '_authentication_backend'):
             return get(self, '_authentication_backend')
 
-        from core.common.services import AuthService
+        from core.services.auth.core import AuthService
         if AuthService.is_valid_django_token(request) or get(settings, 'TEST_MODE', False):
             klass = ModelBackend
         else:

diff --git a/core/common/management/commands/celery_beat_healthcheck.py b/core/common/management/commands/celery_beat_healthcheck.py
@@ -3,8 +3,7 @@
 from django.conf import settings
 from django.core.management import BaseCommand
 
-from core.common.services import RedisService
-from core.users.models import UserProfile
+from core.services.storages.redis import RedisService
 
 
 class Command(BaseCommand):