From 99eb0a0651fdaa04b41f043f9b6bd6674fc5b0d3 Mon Sep 17 00:00:00 2001 From: Matheus Toledo Date: Mon, 16 Jun 2025 12:43:39 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8refactor:=20move=20modules=20and=20?= =?UTF-8?q?refactor=20import=20statements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/{pilgrim/models => }/__init__.py | 0 src/{pilgrim => }/application.py | 4 ++-- src/{pilgrim => }/command.py | 2 +- src/{pilgrim => }/database.py | 1 - src/{pilgrim/service => models}/__init__.py | 0 src/{pilgrim => }/models/entry.py | 4 ++-- src/{pilgrim => }/models/photo.py | 6 +++--- src/{pilgrim => }/models/photo_in_entry.py | 2 +- src/{pilgrim => }/models/travel_diary.py | 3 ++- src/pilgrim/__init__.py | 8 -------- src/service/__init__.py | 0 src/{pilgrim => }/service/entry_service.py | 4 ++-- src/{pilgrim => }/service/photo_service.py | 3 ++- src/{pilgrim => }/service/servicemanager.py | 4 ++-- src/{pilgrim => }/service/travel_diary_service.py | 2 +- 15 files changed, 18 insertions(+), 25 deletions(-) rename src/{pilgrim/models => }/__init__.py (100%) rename src/{pilgrim => }/application.py (77%) rename src/{pilgrim => }/command.py (54%) rename src/{pilgrim => }/database.py (99%) rename src/{pilgrim/service => models}/__init__.py (100%) rename src/{pilgrim => }/models/entry.py (88%) rename src/{pilgrim => }/models/photo.py (90%) rename src/{pilgrim => }/models/photo_in_entry.py (92%) rename src/{pilgrim => }/models/travel_diary.py (90%) delete mode 100644 src/pilgrim/__init__.py create mode 100644 src/service/__init__.py rename src/{pilgrim => }/service/entry_service.py (95%) rename src/{pilgrim => }/service/photo_service.py (95%) rename src/{pilgrim => }/service/servicemanager.py (79%) rename src/{pilgrim => }/service/travel_diary_service.py (95%) diff --git a/src/pilgrim/models/__init__.py b/src/__init__.py similarity index 100% rename from src/pilgrim/models/__init__.py rename to src/__init__.py diff --git a/src/pilgrim/application.py b/src/application.py similarity index 77% rename from src/pilgrim/application.py rename to src/application.py index 61d75ba..2dcb79a 100644 --- a/src/pilgrim/application.py +++ b/src/application.py @@ -1,5 +1,5 @@ -from pilgrim.database import Database -from pilgrim.service.servicemanager import ServiceManager +from src.database import Database +from src.service.servicemanager import ServiceManager class Application: diff --git a/src/pilgrim/command.py b/src/command.py similarity index 54% rename from src/pilgrim/command.py rename to src/command.py index 1af56cc..3d23d5a 100644 --- a/src/pilgrim/command.py +++ b/src/command.py @@ -1,4 +1,4 @@ -from pilgrim.application import Application +from src.application import Application def main(): diff --git a/src/pilgrim/database.py b/src/database.py similarity index 99% rename from src/pilgrim/database.py rename to src/database.py index 389b15b..794d698 100644 --- a/src/pilgrim/database.py +++ b/src/database.py @@ -4,7 +4,6 @@ from sqlalchemy.orm import sessionmaker Base = declarative_base() - class Database: def __init__(self): self.engine = create_engine( diff --git a/src/pilgrim/service/__init__.py b/src/models/__init__.py similarity index 100% rename from src/pilgrim/service/__init__.py rename to src/models/__init__.py diff --git a/src/pilgrim/models/entry.py b/src/models/entry.py similarity index 88% rename from src/pilgrim/models/entry.py rename to src/models/entry.py index 4a1132c..8775faf 100644 --- a/src/pilgrim/models/entry.py +++ b/src/models/entry.py @@ -3,8 +3,8 @@ from typing import Any from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship -from pilgrim.models.photo_in_entry import photo_entry_association -from ..database import Base +from src.models.photo_in_entry import photo_entry_association +from src.database import Base class Entry(Base): diff --git a/src/pilgrim/models/photo.py b/src/models/photo.py similarity index 90% rename from src/pilgrim/models/photo.py rename to src/models/photo.py index f6e0406..d4eb6a9 100644 --- a/src/pilgrim/models/photo.py +++ b/src/models/photo.py @@ -1,10 +1,10 @@ from typing import Any -from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship +from sqlalchemy import Column, Integer, String, ForeignKey -from pilgrim.models.photo_in_entry import photo_entry_association -from ..database import Base +from src.models.photo_in_entry import photo_entry_association +from src.database import Base class Photo(Base): diff --git a/src/pilgrim/models/photo_in_entry.py b/src/models/photo_in_entry.py similarity index 92% rename from src/pilgrim/models/photo_in_entry.py rename to src/models/photo_in_entry.py index 76f452e..d07d4fa 100644 --- a/src/pilgrim/models/photo_in_entry.py +++ b/src/models/photo_in_entry.py @@ -1,6 +1,6 @@ from sqlalchemy import Table, Column, Integer, ForeignKey -from ..database import Base +from src.database import Base photo_entry_association = Table('photo_entry_association', Base.metadata, Column('id', Integer, primary_key=True, autoincrement=True), diff --git a/src/pilgrim/models/travel_diary.py b/src/models/travel_diary.py similarity index 90% rename from src/pilgrim/models/travel_diary.py rename to src/models/travel_diary.py index 676b49b..15c8579 100644 --- a/src/pilgrim/models/travel_diary.py +++ b/src/models/travel_diary.py @@ -1,8 +1,9 @@ from typing import Any +from src.database import Base + from sqlalchemy import Column, String, Integer -from ..database import Base class TravelDiary(Base): __tablename__ = "travel_diaries" diff --git a/src/pilgrim/__init__.py b/src/pilgrim/__init__.py deleted file mode 100644 index 22aad53..0000000 --- a/src/pilgrim/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -from pilgrim.application import Application -from pilgrim.command import main -from pilgrim.database import Database, Base -from pilgrim.models.travel_diary import TravelDiary -from pilgrim.models.entry import Entry -from pilgrim.models.photo import Photo - -__all__ = ["Application", "Database", "TravelDiary", "Entry", "Photo", "main", "Base"] diff --git a/src/service/__init__.py b/src/service/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pilgrim/service/entry_service.py b/src/service/entry_service.py similarity index 95% rename from src/pilgrim/service/entry_service.py rename to src/service/entry_service.py index f316f97..2afedd0 100644 --- a/src/pilgrim/service/entry_service.py +++ b/src/service/entry_service.py @@ -1,7 +1,7 @@ from typing import List -from ..models.entry import Entry -from ..models.travel_diary import TravelDiary +from src.models.entry import Entry +from src.models.travel_diary import TravelDiary class EntryService: diff --git a/src/pilgrim/service/photo_service.py b/src/service/photo_service.py similarity index 95% rename from src/pilgrim/service/photo_service.py rename to src/service/photo_service.py index b1086a9..2232ad1 100644 --- a/src/pilgrim/service/photo_service.py +++ b/src/service/photo_service.py @@ -1,7 +1,8 @@ from pathlib import Path from typing import List -from pilgrim import Photo, TravelDiary +from src.models.photo import Photo +from src.models.travel_diary import TravelDiary class PhotoService: diff --git a/src/pilgrim/service/servicemanager.py b/src/service/servicemanager.py similarity index 79% rename from src/pilgrim/service/servicemanager.py rename to src/service/servicemanager.py index b0b0cde..3e9c3a6 100644 --- a/src/pilgrim/service/servicemanager.py +++ b/src/service/servicemanager.py @@ -1,5 +1,5 @@ -from pilgrim.service.entry_service import EntryService -from pilgrim.service.travel_diary_service import TravelDiaryService +from src.service.entry_service import EntryService +from src.service.travel_diary_service import TravelDiaryService class ServiceManager: diff --git a/src/pilgrim/service/travel_diary_service.py b/src/service/travel_diary_service.py similarity index 95% rename from src/pilgrim/service/travel_diary_service.py rename to src/service/travel_diary_service.py index 0be4cc0..846f27d 100644 --- a/src/pilgrim/service/travel_diary_service.py +++ b/src/service/travel_diary_service.py @@ -1,4 +1,4 @@ -from ..models.travel_diary import TravelDiary +from src.models.travel_diary import TravelDiary class TravelDiaryService: