From 5c8a4566bdfa01dafa9b31095b7bad65562e26c6 Mon Sep 17 00:00:00 2001
From: t0xa <pro100ton@gmail.com>
Date: Sun, 12 Oct 2025 16:27:47 +0300
Subject: [PATCH] Add sqlite + 0002 migration

---
 app/config.py                     |  2 ++
 app/main.py                       |  7 ++++++-
 app/templates/base.html           |  3 ++-
 migrations/runner.py              | 24 +++++++++++++++---------
 migrations/sql/0002_trainings.sql | 28 ++++++++++++++++++++++++++++
 pyproject.toml                    |  5 +++++
 run.py                            |  2 +-
 uv.lock                           | 16 +++++++++++++++-
 8 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 migrations/sql/0002_trainings.sql

diff --git a/app/config.py b/app/config.py
index f47ad35..6086eeb 100644
--- a/app/config.py
+++ b/app/config.py
@@ -9,6 +9,8 @@ class Settings(BaseSettings):
     version: str = "0.0.1"
     debug: bool = False
 
+    # TODO: Add sqlite 3 settings
+
     # Postgres database settings
     POSTGRES_DATABASE_URL: Optional[str] = None
     POSTGRES_DATABASE_HOST: str = "localhost"
diff --git a/app/main.py b/app/main.py
index e3af335..d852401 100644
--- a/app/main.py
+++ b/app/main.py
@@ -10,6 +10,11 @@ from app.api.v1.web import web_router
 from app.config import settings
 from migrations.runner import MigrationRunner
 
+# TODO: Replace level with settings value
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -24,7 +29,7 @@ app = FastAPI(
     title="Fitness Parser API",
     description="API for parsing fitness training data from various sources",
     version="0.1.0",
-    lifespan=lifespan
+    lifespan=lifespan,
 )
 
 app.mount("/static", StaticFiles(directory="app/static"), name="static")
diff --git a/app/templates/base.html b/app/templates/base.html
index 503835c..ab1b48e 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -13,7 +13,8 @@
     <!-- Navigation -->
     <nav class="navbar navbar-dark bg-primary">
         <div class="container">
-            <a class="navbar-brand" href="/">
+            <!-- TODO: find solution to not harcode links in hrefs -->
+            <a class="navbar-brand" href="/app/obsidian/list">
               <strong>{{ app_name }}</strong>
             </a>
         </div>
diff --git a/migrations/runner.py b/migrations/runner.py
index 0f70323..c503aeb 100644
--- a/migrations/runner.py
+++ b/migrations/runner.py
@@ -10,7 +10,9 @@ class MigrationRunner:
     def __init__(self, database_url: str) -> None:
         self.engine = create_async_engine(database_url)
         self.migrations_dir = Path("migrations/sql")
-        logging.error(f"{database_url}")
+        logging.info(
+            f"Migrator initializer: engine = {self.engine}, migrations_dir = {self.migrations_dir}"
+        )
 
     async def get_applied_migrations(self) -> set:
         """Get list of applied migrations"""
@@ -29,7 +31,9 @@ class MigrationRunner:
             result = await conn.execute(
                 text(f"SELECT version FROM {self.MIGRATIONS_SCHEMA_NAME}")
             )
-            return {row[0] for row in result.fetchall()}
+            result_data =  {row[0] for row in result.fetchall()}
+            logging.info(f"Received migrator data: {result_data}")
+            return result_data
 
     async def run_migrations(self):
         """Run all unapplied migrations"""
@@ -38,7 +42,9 @@ class MigrationRunner:
 
         # Getting all sql files from migrations_dir
         # TODO: (#ToLearn) Read about Path.glob function
-        migration_files = sorted([file for file in self.migrations_dir.glob(".*sql")])
+        migration_files = self.migrations_dir.glob('.*sql')
+        migration_files = sorted([file for file in self.migrations_dir.glob("*.sql")])
+        logging.info(f"Migration files: {migration_files}")
 
         for migration_file in migration_files:
             # TODO: (#ToLearn) Read about stem property
@@ -52,19 +58,19 @@ class MigrationRunner:
 
     async def _apply_migration(self, migration_file: Path, migration_name: str):
         """Apply migrations from migrations/sql folder"""
-        with open(migration_file, 'r', encoding='utf-8') as f:
+        with open(migration_file, "r", encoding="utf-8") as f:
             sql_content = f.read()
-        
+
         async with self.engine.begin() as conn:
             try:
-                statements = [s.strip() for s in sql_content.split(';') if s.strip()]
-                
+                statements = [s.strip() for s in sql_content.split(";") if s.strip()]
+
                 for statement in statements:
                     if statement:
                         await conn.execute(text(statement))
-                
+
                 logging.info(f"Migration {migration_name} applied successfully")
-                
+
             except Exception as e:
                 logging.error(f"Error applying migration {migration_name}: {e}")
                 raise
diff --git a/migrations/sql/0002_trainings.sql b/migrations/sql/0002_trainings.sql
new file mode 100644
index 0000000..60bbde4
--- /dev/null
+++ b/migrations/sql/0002_trainings.sql
@@ -0,0 +1,28 @@
+-- Migration: 0002_trainings
+-- Description: Basic migration to initialize and create basic tarinings table
+
+-- Schemas for trainings
+-- Trainings table
+CREATE TABLE IF NOT EXISTS trainings (
+  id SERIAL PRIMARY KEY,
+  date DATE NOT NULL,
+  trainer VARCHAR(100)
+);
+
+-- Exercies table
+CREATE TABLE IF NOT EXISTS exercises (
+  id SERIAL PRIMARY KEY,
+  training_id INTEGER REFERENCES trainings(id) ON DELETE CASCADE,
+  name VARCHAR(255) NOT NULL,
+  splitted_weigh BOOLEAN DEFAULT FALSE
+);
+
+-- Approaches table
+CREATE TABLE IF NOT EXISTS approaches (
+  id SERIAL PRIMARY KEY,
+  approach_id INTEGER REFERENCES approaches(id) ON DELETE CASCADE,
+  weight FLOAT NOT NULL,
+  reps INTEGER NOT NULL
+);
+
+INSERT INTO schema_migrations (version) VALUES ('0002_trainings');
diff --git a/pyproject.toml b/pyproject.toml
index 1c971ce..b9cc14c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,6 +15,7 @@ dependencies = [
     "python-multipart>=0.0.6",
     "sqlalchemy>=2.0.43",
     "asyncpg>=0.30.0",
+    "aiosqlite>=0.21.0",
 ]
 
 [dependency-groups]
@@ -23,3 +24,7 @@ dev = [
     "types-grpcio>=1.0.0.20250703",
     "types-protobuf>=6.30.2.20250822",
 ]
+
+[tools.pyright]
+venvPath = "."
+venv = ".venv"
diff --git a/run.py b/run.py
index 07d318c..22fc30c 100644
--- a/run.py
+++ b/run.py
@@ -11,4 +11,4 @@ if __name__ == "__main__":
         port=8000,
         reload=True,
         log_level="info"
-    )
\ No newline at end of file
+    )
diff --git a/uv.lock b/uv.lock
index 2020598..f15e47d 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1,7 +1,19 @@
 version = 1
-revision = 2
+revision = 3
 requires-python = ">=3.13"
 
+[[package]]
+name = "aiosqlite"
+version = "0.21.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/13/7d/8bca2bf9a247c2c5dfeec1d7a5f40db6518f88d314b8bca9da29670d2671/aiosqlite-0.21.0.tar.gz", hash = "sha256:131bb8056daa3bc875608c631c678cda73922a2d4ba8aec373b19f18c17e7aa3", size = 13454, upload-time = "2025-02-03T07:30:16.235Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f5/10/6c25ed6de94c49f88a91fa5018cb4c0f3625f31d5be9f771ebe5cc7cd506/aiosqlite-0.21.0-py3-none-any.whl", hash = "sha256:2549cf4057f95f53dcba16f2b64e8e2791d7e1adedb13197dd8ed77bb226d7d0", size = 15792, upload-time = "2025-02-03T07:30:13.6Z" },
+]
+
 [[package]]
 name = "annotated-types"
 version = "0.7.0"
@@ -66,6 +78,7 @@ name = "f1tness-parser"
 version = "0.1.0"
 source = { virtual = "." }
 dependencies = [
+    { name = "aiosqlite" },
     { name = "asyncpg" },
     { name = "fastapi" },
     { name = "jinja2" },
@@ -87,6 +100,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
+    { name = "aiosqlite", specifier = ">=0.21.0" },
     { name = "asyncpg", specifier = ">=0.30.0" },
     { name = "fastapi", specifier = ">=0.115.0" },
     { name = "jinja2", specifier = ">=3.1.0" },