Merge pull request 'feature: die Veränderung von Daten ist möglich' (#1) from feature/rest-api into main

Reviewed-on: https://git.torsten-hettstedt.de:3000/TorstenHettstedt/PythonAppFuelTable/pulls/1

.gitignore

@@ -1,3 +1,3 @@
 .venv
 /.idea/
-/database.db
+/api/database.db

api/.env

@@ -0,0 +1,2 @@
+SQLITE_FILE_NAME=database.db
+DATABASE_URL=sqlite:///database.db

api/main.py

@@ -1,28 +1,37 @@
 import datetime
 
 from fastapi import FastAPI
+from fastapi.encoders import jsonable_encoder
+from sqlalchemy.exc import IntegrityError, DataError
 from sqlmodel import Session, SQLModel, create_engine, select
 from contextlib import asynccontextmanager
-
 from api.models import Car, FuelItem
+from pydantic_settings import BaseSettings, SettingsConfigDict
+from fastapi.responses import JSONResponse
 
-sqlite_file_name = "database.db"
+
-sqlite_url = f"sqlite:///{sqlite_file_name}"
+class Settings(BaseSettings):
+    database_url: str = ""
+    sqlite_file_name: str = ""
+
+    model_config = SettingsConfigDict(env_file=".env")
+
+
+settings = Settings()
+
+database_url = settings.database_url
 
 connect_args = {
         "check_same_thread": False
         }
-engine = create_engine(sqlite_url, echo=True, connect_args=connect_args)
+engine = create_engine(database_url, echo=True, connect_args=connect_args)
 
 
 def create_db_and_tables():
     SQLModel.metadata.create_all(engine)
 
 
-@asynccontextmanager
+def fill_database():
-async def lifespan(app: FastAPI):
-    # startup
-    create_db_and_tables()
     car = Car(id_string="Auto 1")
     with Session(engine) as session:
         session.add(car)
@@ -37,19 +46,61 @@ async def lifespan(app: FastAPI):
         session.add(fill_item)
         session.commit()
         session.refresh(fill_item)
+
+
+# noinspection PyUnusedLocal
+@asynccontextmanager
+async def lifespan(actual_app: FastAPI):
+    # startup
+    create_db_and_tables()
+    try:
+        fill_database()
+    except IntegrityError as e:
+        print(e)
     yield
 
 
 app = FastAPI(lifespan=lifespan)
 
 
+def save_object(obj):
+    with Session(engine) as session:
+        try:
+            session.add(obj)
+            session.commit()
+            session.refresh(obj)
+            return obj
+        except IntegrityError|DataError as e:
+            content = jsonable_encoder({"message": e})
+            return JSONResponse(content=content, status_code=400)
+
+
+def update_object(obj_id: int, obj):
+    with Session(engine) as session:
+        try:
+            object_db = session.get(type(obj), obj_id)
+            if not object_db:
+                content = jsonable_encoder({"message": "%s-ID not found" % type(obj).__qualname__})
+                return JSONResponse(content=content, status_code=404)
+            obj_data = obj.model_dump(exclude_unset=True)
+            object_db.sqlmodel_update(obj_data)
+            session.add(object_db)
+            session.commit()
+            session.refresh(object_db)
+            return object_db
+        except IntegrityError|DataError as e:
+            content = jsonable_encoder({"message": e})
+            return JSONResponse(content=content, status_code=400)
+
+
 @app.post("/cars/")
 def create_cars(car: Car):
-    with Session(engine) as session:
+    return save_object(car)
-        session.add(car)
+
-        session.commit()
+
-        session.refresh(car)
+@app.put("/cars/{obj_id}")
-        return car
+def update_cars(obj_id, car: Car):
+    return update_object(obj_id, car)
 
 
 @app.get("/cars/")
@@ -61,11 +112,12 @@ def read_cars():
 
 @app.post("/fill_items/")
 def create_cars(fill_item: FuelItem):
-    with Session(engine) as session:
+    return save_object(fill_item)
-        session.add(fill_item)
+
-        session.commit()
+
-        session.refresh(fill_item)
+@app.put("/fill_items/{obj_id}")
-        return fill_item
+def update_cars(obj_id, fill_item: FuelItem):
+    return update_object(obj_id, fill_item)
 
 
 @app.get("/fill_items/")

api/models.py

@@ -5,12 +5,12 @@ from sqlmodel import Field, SQLModel
 
 class Car(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
-    id_string: str = Field(nullable=False, index=True)
+    id_string: str = Field(nullable=False, index=True, unique=True)
 
 
 class FuelItem(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
-    car_id: int | None = Field(default=None, foreign_key="car.id")
+    car_id: int | None = Field(default=None, foreign_key="car.id", unique_items=True)
-    date: datetime.date = Field(nullable=False, index=True)
+    date: datetime.date = Field(nullable=False, index=True, unique_items=True)
     odometer_reading: float = Field(nullable=False)
     fuel_fill: float = Field(nullable=False)

api/requirements.txt

@@ -7,7 +7,8 @@ uvicorn==0.38.0
 idna==3.11
 pydantic==2.12.*
 pydantic_core==2.41.*
+pydantic_settings==2.11.*
 sniffio==1.3.*
-starlette==0.48.*
+starlette==0.49.*
 typing-inspection==0.4.*
 typing_extensions==4.15.*