From ac29e84833282c2006df441e388410e8e94d368a Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Santos Souza de Miranda <gustavohssmiranda@gmail.com>
Date: Wed, 4 Jun 2025 00:13:02 -0300
Subject: [PATCH] Changed the names of the files to conform the python
 convection and also added photo_in_entry.py to diminish the cyclic import
 error in pylint

---
 .idea/workspace.xml                           | 59 ++++++++++++-------
 src/Pilgrim/__init__.py                       |  8 ---
 src/pilgrim/__init__.py                       |  8 +++
 .../Application.py => pilgrim/application.py} |  2 +-
 src/{Pilgrim => pilgrim}/command.py           |  2 +-
 .../Database.py => pilgrim/database.py}       |  4 +-
 .../Models => pilgrim/models}/__init__.py     |  0
 .../Entry.py => pilgrim/models/entry.py}      | 11 +---
 .../Photo.py => pilgrim/models/photo.py}      |  6 +-
 src/pilgrim/models/photo_in_entry.py          |  8 +++
 .../models/travel_diary.py}                   |  3 +-
 11 files changed, 66 insertions(+), 45 deletions(-)
 delete mode 100644 src/Pilgrim/__init__.py
 create mode 100644 src/pilgrim/__init__.py
 rename src/{Pilgrim/Application.py => pilgrim/application.py} (77%)
 rename src/{Pilgrim => pilgrim}/command.py (54%)
 rename src/{Pilgrim/Database.py => pilgrim/database.py} (83%)
 rename src/{Pilgrim/Models => pilgrim/models}/__init__.py (100%)
 rename src/{Pilgrim/Models/Entry.py => pilgrim/models/entry.py} (53%)
 rename src/{Pilgrim/Models/Photo.py => pilgrim/models/photo.py} (80%)
 create mode 100644 src/pilgrim/models/photo_in_entry.py
 rename src/{Pilgrim/Models/TravelDiary.py => pilgrim/models/travel_diary.py} (81%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e459338..70c8282 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0a7f92e2-b44a-4dfe-8e01-136d1c0c18be" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Pilgrim/Models/Photo.py" afterDir="false" />
+    <list default="true" id="0a7f92e2-b44a-4dfe-8e01-136d1c0c18be" name="Changes" comment="Added a Back Relationship in Entry to list all the photos">
+      <change afterPath="$PROJECT_DIR$/src/pilgrim/models/photo_in_entry.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Models/Entry.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pilgrim/Models/Entry.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Pilgrim/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/Pilgrim/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Application.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/application.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Database.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/database.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Models/Entry.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/Entry.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Models/Photo.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/Photo.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Models/TravelDiary.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/TravelDiary.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/Models/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/models/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Pilgrim/command.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/pilgrim/command.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -50,23 +56,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "Python.Database.executor": "Run",
-    "Python.command.executor": "Run",
-    "Python.main.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "git-widget-placeholder": "master",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;Python.Database.executor&quot;: &quot;Run&quot;,
+    &quot;Python.command.executor&quot;: &quot;Run&quot;,
+    &quot;Python.main.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
@@ -85,11 +91,24 @@
       <workItem from="1748985569621" duration="2124000" />
       <workItem from="1748992451560" duration="312000" />
     </task>
+    <task id="LOCAL-00001" summary="Added a Back Relationship in Entry to list all the photos">
+      <option name="closed" value="true" />
+      <created>1749004109515</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1749004109515</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Added a Back Relationship in Entry to list all the photos" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added a Back Relationship in Entry to list all the photos" />
+  </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/Pilgrim$Database.coverage" NAME="Database Coverage Results" MODIFIED="1748987101492" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src/Database" />
     <SUITE FILE_PATH="coverage/Pilgrim$main.coverage" NAME="main Coverage Results" MODIFIED="1748992510527" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
diff --git a/src/Pilgrim/__init__.py b/src/Pilgrim/__init__.py
deleted file mode 100644
index e5627f1..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.TravelDiary 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/pilgrim/__init__.py b/src/pilgrim/__init__.py
new file mode 100644
index 0000000..22aad53
--- /dev/null
+++ b/src/pilgrim/__init__.py
@@ -0,0 +1,8 @@
+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/Pilgrim/Application.py b/src/pilgrim/application.py
similarity index 77%
rename from src/Pilgrim/Application.py
rename to src/pilgrim/application.py
index 429798b..fec18fc 100644
--- a/src/Pilgrim/Application.py
+++ b/src/pilgrim/application.py
@@ -1,4 +1,4 @@
-from Pilgrim.Database import Database
+from pilgrim.database import Database
 
 
 class Application:
diff --git a/src/Pilgrim/command.py b/src/pilgrim/command.py
similarity index 54%
rename from src/Pilgrim/command.py
rename to src/pilgrim/command.py
index d132d04..1af56cc 100644
--- a/src/Pilgrim/command.py
+++ b/src/pilgrim/command.py
@@ -1,4 +1,4 @@
-from Pilgrim import Application
+from pilgrim.application import Application
 
 
 def main():
diff --git a/src/Pilgrim/Database.py b/src/pilgrim/database.py
similarity index 83%
rename from src/Pilgrim/Database.py
rename to src/pilgrim/database.py
index d28fdee..389b15b 100644
--- a/src/Pilgrim/Database.py
+++ b/src/pilgrim/database.py
@@ -12,10 +12,10 @@ class Database:
             echo=False,
             connect_args={"check_same_thread": False},
         )
-        self.Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
+        self.session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
 
     def create(self):
         Base.metadata.create_all(self.engine)
 
     def get_db(self):
-        return self.Session()
+        return self.session()
diff --git a/src/Pilgrim/Models/__init__.py b/src/pilgrim/models/__init__.py
similarity index 100%
rename from src/Pilgrim/Models/__init__.py
rename to src/pilgrim/models/__init__.py
diff --git a/src/Pilgrim/Models/Entry.py b/src/pilgrim/models/entry.py
similarity index 53%
rename from src/Pilgrim/Models/Entry.py
rename to src/pilgrim/models/entry.py
index 6333849..42f2a0b 100644
--- a/src/Pilgrim/Models/Entry.py
+++ b/src/pilgrim/models/entry.py
@@ -1,13 +1,8 @@
-from sqlalchemy import Column, Integer, String, ForeignKey, Table
+from sqlalchemy import Column, Integer, String, ForeignKey
 from sqlalchemy.orm import relationship
 
-from Pilgrim import Base
-
-
-photo_entry_association = Table('photo_entry_association', Base.metadata,
-Column('id', Integer, primary_key=True, autoincrement=True),
-    Column('fk_Photo_id', Integer, ForeignKey('photo.id')),
-    Column('fk_Entry_id', Integer, ForeignKey('Entry.id')))
+from pilgrim.models.photo_in_entry import photo_entry_association
+from ..database import Base
 
 
 class Entry(Base):
diff --git a/src/Pilgrim/Models/Photo.py b/src/pilgrim/models/photo.py
similarity index 80%
rename from src/Pilgrim/Models/Photo.py
rename to src/pilgrim/models/photo.py
index 69773b9..b197061 100644
--- a/src/Pilgrim/Models/Photo.py
+++ b/src/pilgrim/models/photo.py
@@ -1,8 +1,8 @@
 from sqlalchemy import Column, Integer, String
 from sqlalchemy.orm import relationship
 
-from Pilgrim import Base
-from Pilgrim.Models.Entry import photo_entry_association
+from pilgrim.models.photo_in_entry import photo_entry_association
+from ..database import Base
 
 
 class Photo(Base):
@@ -16,4 +16,4 @@ class Photo(Base):
         "Entry",
         secondary=photo_entry_association,
         back_populates="photos"
-    )
\ No newline at end of file
+    )
diff --git a/src/pilgrim/models/photo_in_entry.py b/src/pilgrim/models/photo_in_entry.py
new file mode 100644
index 0000000..99ff9db
--- /dev/null
+++ b/src/pilgrim/models/photo_in_entry.py
@@ -0,0 +1,8 @@
+from sqlalchemy import Table, Column, Integer, ForeignKey
+
+from ..database import Base
+
+photo_entry_association = Table('photo_entry_association', Base.metadata,
+Column('id', Integer, primary_key=True, autoincrement=True),
+    Column('fk_Photo_id', Integer, ForeignKey('photo.id')),
+    Column('fk_Entry_id', Integer, ForeignKey('Entry.id')))
diff --git a/src/Pilgrim/Models/TravelDiary.py b/src/pilgrim/models/travel_diary.py
similarity index 81%
rename from src/Pilgrim/Models/TravelDiary.py
rename to src/pilgrim/models/travel_diary.py
index ea03940..175749e 100644
--- a/src/Pilgrim/Models/TravelDiary.py
+++ b/src/pilgrim/models/travel_diary.py
@@ -1,7 +1,6 @@
 from sqlalchemy import Column, String, Integer
 
-from Pilgrim import Application, Base
-
+from ..database import Base
 
 class TravelDiary(Base):
     __tablename__ = "TravelDiary"