From 7ad944ba3f490d175e926506894148bb3ff377a4 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Sun, 28 Jun 2020 17:33:29 +0200
Subject: [PATCH] Move DB model to base.
---
engine-api.py | 2 +-
modules/{database/model.py => base/models.py} | 0
modules/cli/padavan.py | 3 +--
modules/scheduling/calendar.py | 2 +-
modules/scheduling/scheduler.py | 2 +-
testing/connection_tester.py | 1 -
testing/test.py | 7 ++-----
testing/tests.py | 2 +-
8 files changed, 7 insertions(+), 12 deletions(-)
rename modules/{database/model.py => base/models.py} (100%)
diff --git a/engine-api.py b/engine-api.py
index 14332e10..acf5961e 100644
--- a/engine-api.py
+++ b/engine-api.py
@@ -41,7 +41,7 @@ from werkzeug.exceptions import HTTPException, default_exceptions, Ab
from modules.base.logger import AuraLogger
from modules.base.config import AuraConfig
-from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
+from modules.base.models import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData, TrackService
diff --git a/modules/database/model.py b/modules/base/models.py
similarity index 100%
rename from modules/database/model.py
rename to modules/base/models.py
diff --git a/modules/cli/padavan.py b/modules/cli/padavan.py
index 7ae71ed5..c27a267c 100644
--- a/modules/cli/padavan.py
+++ b/modules/cli/padavan.py
@@ -22,8 +22,7 @@ import json
from modules.base.enum import RedisChannel
from modules.base.utils import TerminalColors
from modules.cli.redis.adapter import ClientRedisAdapter, ServerRedisAdapter
-from modules.cli.redis.messenger import RedisMessenger
-from modules.database.model import AuraDatabaseModel
+from modules.base.models import AuraDatabaseModel
class Padavan:
diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py
index d4a5376c..1c229206 100644
--- a/modules/scheduling/calendar.py
+++ b/modules/scheduling/calendar.py
@@ -28,7 +28,7 @@ from datetime import datetime
from modules.base.enum import PlaylistType
from modules.base.utils import SimpleUtil
-from modules.database.model import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
+from modules.base.models import Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.scheduling.calender_fetcher import CalendarFetcher
diff --git a/modules/scheduling/scheduler.py b/modules/scheduling/scheduler.py
index 4fb178ea..f7095ddb 100644
--- a/modules/scheduling/scheduler.py
+++ b/modules/scheduling/scheduler.py
@@ -30,7 +30,7 @@ import threading
from operator import attrgetter
from datetime import datetime, timedelta
-from modules.database.model import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
+from modules.base.models import AuraDatabaseModel, Schedule, Playlist, PlaylistEntry, PlaylistEntryMetaData
from modules.base.exceptions import NoActiveScheduleException, NoActiveEntryException, LoadSourceException
from modules.base.enum import Channel, ChannelType, TimerType, TransitionType, EntryQueueState, EntryPlayState
from modules.base.utils import SimpleUtil, TerminalColors, EngineUtil
diff --git a/testing/connection_tester.py b/testing/connection_tester.py
index 5dd375b6..3b2e4cf0 100644
--- a/testing/connection_tester.py
+++ b/testing/connection_tester.py
@@ -23,7 +23,6 @@ import urllib
import json
from modules.core.engine import SoundSystem
-#from modules.database.model import ScheduleEntry
from modules.base.config import AuraConfig
diff --git a/testing/test.py b/testing/test.py
index 3b6e567d..b466adce 100644
--- a/testing/test.py
+++ b/testing/test.py
@@ -24,13 +24,10 @@ import validators
from datetime import datetime
-# libraries.base
from modules.base.logger import AuraLogger
from modules.base.config import AuraConfig
-# libraries.database
-from modules.database.model import Schedule, TrackService
-# libraries.security
-# from libraries.security.user import AuraUser
+from modules.base.models import Schedule, TrackService
+
# modules
from modules.core.engine import SoundSystem
diff --git a/testing/tests.py b/testing/tests.py
index 52b1c97c..51bbab63 100755
--- a/testing/tests.py
+++ b/testing/tests.py
@@ -26,7 +26,7 @@ import decimal
from modules.core.engine import SoundSystem
from modules.base.config import AuraConfig
-from modules.database.model import Schedule, ScheduleEntry
+from modules.base.models import Schedule, ScheduleEntry
from modules.scheduling.scheduler import AuraScheduler, AuraCalendarService
def alchemyencoder(obj):
--
GitLab