wip

learn_sql_model/models/hero.py

@@ -1,10 +1,11 @@
 from typing import Optional
 
 from fastapi import HTTPException
+import httpx
 from pydantic import BaseModel
 from sqlmodel import Field, Relationship, SQLModel, Session, select
 
-from learn_sql_model.config import Config
+from learn_sql_model.config import config, get_session
 from learn_sql_model.models.pet import Pet
 
 
@@ -25,14 +26,13 @@ class Hero(HeroBase, table=True):
 class HeroCreate(HeroBase):
     ...
 
-    def post(self, config: Config) -> Hero:
-        config.init()
-        with Session(config.database.engine) as session:
-            db_hero = Hero.from_orm(self)
-            session.add(db_hero)
-            session.commit()
-            session.refresh(db_hero)
-            return db_hero
+    def post(self) -> Hero:
+        r = httpx.post(
+            f"{config.api_client.url}/hero/",
+            json=self.dict(),
+        )
+        if r.status_code != 200:
+            raise RuntimeError(f"{r.status_code}:\n {r.text}")
 
 
 class HeroRead(HeroBase):
@@ -41,10 +41,8 @@ class HeroRead(HeroBase):
     @classmethod
     def get(
         cls,
-        config: Config,
         id: int,
     ) -> Hero:
-
         with config.database.session as session:
             hero = session.get(Hero, id)
             if not hero:
@@ -54,25 +52,25 @@ class HeroRead(HeroBase):
     @classmethod
     def list(
         self,
-        config: Config,
         where=None,
         offset=0,
         limit=None,
+        session: Session = get_session,
     ) -> Hero:
+        # with config.database.session as session:
 
-        with config.database.session as session:
-            statement = select(Hero)
-            if where != "None":
-                from sqlmodel import text
+        statement = select(Hero)
+        if where != "None" and where is not None:
+            from sqlmodel import text
 
-                statement = statement.where(text(where))
-            statement = statement.offset(offset).limit(limit)
-            heroes = session.exec(statement).all()
+            statement = statement.where(text(where))
+        statement = statement.offset(offset).limit(limit)
+        heroes = session.exec(statement).all()
         return heroes
 
 
 class HeroUpdate(SQLModel):
-    # id is required to get the hero
+    # id is required to update the hero
     id: int
 
     # all other fields, must match the model, but with Optional default None
@@ -84,30 +82,22 @@ class HeroUpdate(SQLModel):
     pet_id: Optional[int] = Field(default=None, foreign_key="pet.id")
     pet: Optional[Pet] = Relationship(back_populates="hero")
 
-    def update(self, config: Config) -> Hero:
-        with Session(config.database.engine) as session:
-            db_hero = session.get(Hero, self.id)
-            if not db_hero:
-                raise HTTPException(status_code=404, detail="Hero not found")
-            hero_data = self.dict(exclude_unset=True)
-            for key, value in hero_data.items():
-                if value is not None:
-                    setattr(db_hero, key, value)
-            session.add(db_hero)
-            session.commit()
-            session.refresh(db_hero)
-            return db_hero
+    def update(self) -> Hero:
+        r = httpx.patch(
+            f"{config.api_client.url}/hero/",
+            json=self.dict(),
+        )
+        if r.status_code != 200:
+            raise RuntimeError(f"{r.status_code}:\n {r.text}")
 
 
 class HeroDelete(BaseModel):
     id: int
 
-    def delete(self, config: Config) -> Hero:
-        config.init()
-        with Session(config.database.engine) as session:
-            hero = session.get(Hero, self.id)
-            if not hero:
-                raise HTTPException(status_code=404, detail="Hero not found")
-            session.delete(hero)
-            session.commit()
-            return {"ok": True}
+    def delete(self) -> Hero:
+        r = httpx.delete(
+            f"{config.api_client.url}/hero/{self.id}",
+        )
+        if r.status_code != 200:
+            raise RuntimeError(f"{r.status_code}:\n {r.text}")
+        return {"ok": True}