Refactoring: using the apps directory is redundant

logs_collector/account/apps.py

@@ -3,5 +3,5 @@ from django.apps import AppConfig
 
 class AccountConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.account'
+    name = 'account'
     verbose_name = 'Auth and account management'

logs_collector/collector/api/filters.py

@@ -5,7 +5,7 @@ from django_filters.rest_framework import (
 )
 from django_filters import widgets
 
-from apps.collector.models import Archive, Ticket
+from collector.models import Archive, Ticket
 from .utils import DateTimeFilterMixin
 
 

logs_collector/collector/api/serializers.py

@@ -3,7 +3,7 @@ from rest_framework import serializers
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.openapi import OpenApiTypes
 
-from apps.collector.models import Archive, Platform, Ticket
+from collector.models import Archive, Platform, Ticket
 
 
 @extend_schema_field(OpenApiTypes.NUMBER)

logs_collector/collector/api/views.py

@@ -10,7 +10,7 @@ from rest_framework import filters
 
 from django_filters.rest_framework import DjangoFilterBackend
 
-from apps.collector.models import Archive, Ticket, Platform  # ???????
+from collector.models import Archive, Ticket, Platform
 
 from .filters import ArchiveFilter, TicketFilter
 from .permissions import IsGuestUpload

logs_collector/collector/apps.py

@@ -3,5 +3,5 @@ from django.apps import AppConfig
 
 class CollectorConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'apps.collector'
+    name = 'collector'
     verbose_name = 'Collector archives for analyse'

logs_collector/collector/migrations/0001_initial.py

@@ -1,6 +1,6 @@
-# Generated by Django 4.2 on 2023-08-14 09:07
+# Generated by Django 4.2 on 2023-08-15 03:58
 
-import apps.collector.utils
+import collector.utils
 from django.conf import settings
 import django.core.files.storage
 import django.core.validators
@@ -49,7 +49,7 @@ class Migration(migrations.Migration):
             name='Archive',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('file', models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(base_url='/archives/', location=pathlib.PurePosixPath('/home/stepan/Documents/Dev/ISPsystem/logs-collector/logs_collector/archives')), upload_to=apps.collector.utils.logs_dir_path)),
+                ('file', models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(base_url='/archives/', location=pathlib.PurePosixPath('/home/stepan/Documents/Dev/ISPsystem/logs-collector/logs_collector/archives')), upload_to=collector.utils.logs_dir_path)),
                 ('md5', models.CharField(editable=False, max_length=1024)),
                 ('time_create', models.DateTimeField(auto_now_add=True)),
                 ('time_update', models.DateTimeField(auto_now=True)),

logs_collector/collector/templatetags/collector_extras.py

@@ -2,7 +2,7 @@ import markdown as md
 from django import template
 from django.template.defaultfilters import stringfilter
 
-from apps.collector.models import Platform
+from collector.models import Platform
 
 
 register = template.Library()

logs_collector/logs_collector/settings.py

@@ -35,8 +35,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'apps.collector.apps.CollectorConfig',  # main app
+    'collector.apps.CollectorConfig',  # main app
-    'apps.account.apps.AccountConfig',  # account app
+    'account.apps.AccountConfig',  # account app
     'rest_framework',
     'rest_framework_simplejwt',
     'django_filters',

logs_collector/logs_collector/urls.py

@@ -11,7 +11,7 @@ from drf_spectacular.views import (
 from two_factor.urls import urlpatterns as tf_urls
 
 from logs_collector import settings
-from apps.account.utils import AdminSiteOTPRequiredMixinRedirectSetup
+from account.utils import AdminSiteOTPRequiredMixinRedirectSetup
 
 
 # ? 2FA patch (Admin site protection)
@@ -25,7 +25,7 @@ urlpatterns = [
     ),
     path(
         '',
-        include('apps.collector.urls', namespace='collector')
+        include('collector.urls', namespace='collector')
     ),
     path(
         '',
@@ -33,11 +33,11 @@ urlpatterns = [
     ),
     path(
         '',
-        include('apps.account.urls', namespace='account')
+        include('account.urls', namespace='account')
     ),
     path(
         'api/',
-        include('apps.collector.api.urls', namespace='collector_api')
+        include('collector.api.urls', namespace='collector_api')
     ),
 ]