jrdb-model 0.2.2__tar.gz → 0.2.4__tar.gz

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jrdb-model
-Version: 0.2.2
+Version: 0.2.4
 Summary: ORM for JRDB
 Author-email: requrd <requrd1989@gmail.com>
 Project-URL: Bug Tracker, https://github.com/astroripple/horseview/issues

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/pyproject.toml

@@ -6,7 +6,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 name = "jrdb-model"
-version = "0.2.2"
+version = "0.2.4"
 description = "ORM for JRDB"
 readme = "README.md"
 dependencies = ["flask-migrate>=4.1.0", "pymysql>=1.1.1"]

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/src/jrdb_model/domain/bangumi.py

@@ -1,35 +1,50 @@
-from typing import List
+"""レースデータ."""
+
+from typing import List, Optional
 
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, backref, mapped_column, relationship
 
 from ..sessioncontroll import db
+from .predict_race import PredictRaceData
+from .racehorse import RacehorseData
+from .returninfo import ReturninfoData
+from .umaren_odds import UmarenOddsData
+from .wakuren_odds import WakurenOddsData
+from .wide_odds import WideOddsData
 
 
 class BangumiData(db.Model):
+    """レースデータ.
+
+    Args:
+        db (_type_): _description_
+
+    """
+
     __tablename__ = "bangumi"
     racekey: Mapped[str] = mapped_column(primary_key=True)
     # 親に対して
     kaisaikey: Mapped[str] = mapped_column(ForeignKey("kaisai.kaisaikey"))
     # 子に対して
-    racehorses: Mapped[List["RacehorseData"]] = relationship(
+    racehorses: Mapped[Optional[List["RacehorseData"]]] = relationship(
         "RacehorseData", backref=backref("bangumi"), innerjoin=True
     )
 
     # 1:1
-    returninfo: Mapped[List["ReturninfoData"]] = relationship(
+    returninfo: Mapped[Optional["ReturninfoData"]] = relationship(
         "ReturninfoData", uselist=False, backref=backref("bangumi")
     )
-    umaren_odds: Mapped[List["UmarenOddsData"]] = relationship(
+    umaren_odds: Mapped[Optional["UmarenOddsData"]] = relationship(
         "UmarenOddsData", uselist=False, backref=backref("bangumi")
     )
-    wide_odds: Mapped[List["WideOddsData"]] = relationship(
+    wide_odds: Mapped[Optional["WideOddsData"]] = relationship(
         "WideOddsData", uselist=False, backref=backref("bangumi")
     )
-    wakuren_odds: Mapped[List["WakurenOddsData"]] = relationship(
+    wakuren_odds: Mapped[Optional["WakurenOddsData"]] = relationship(
         "WakurenOddsData", uselist=False, backref=backref("bangumi")
     )
-    predict_race: Mapped[List["PredictRaceData"]] = relationship(
+    predict_race: Mapped[Optional["PredictRaceData"]] = relationship(
         "PredictRaceData", uselist=False, backref=backref("bangumi")
     )
     ymd: Mapped[str] = mapped_column()

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/src/jrdb_model/domain/kaisai.py

@@ -1,9 +1,11 @@
 """開催データ定義."""
 
-from typing import List
+from typing import List, Optional
 
 from sqlalchemy.orm import Mapped, backref, mapped_column, relationship
 
+from jrdb_model import BangumiData
+
 from ..sessioncontroll import db
 
 
@@ -13,7 +15,7 @@ class KaisaiData(db.Model):
     __tablename__ = "kaisai"
     kaisaikey: Mapped[int] = mapped_column(primary_key=True)
     # 子に対して
-    races: Mapped[List["BangumiData"]] = relationship(
+    races: Mapped[Optional[List["BangumiData"]]] = relationship(
         "BangumiData", backref=backref("kaisai"), innerjoin=True
     )
     ymd: Mapped[int] = mapped_column()

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/src/jrdb_model/domain/racehorse.py

@@ -1,11 +1,17 @@
 """競走馬データ."""
 
-from typing import List
+from typing import Optional
 
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, backref, mapped_column, relationship
 
+from ..master.horsebase import HorsebaseData
 from ..sessioncontroll import db
+from .calculated_score import CalculatedScoreData
+from .predict import PredictData
+from .seiseki import SeisekiData
+from .trainanalysis import TrainAnalysisData
+from .trainoikiri import TrainOikiriData
 
 
 class RacehorseData(db.Model):
@@ -22,22 +28,22 @@ class RacehorseData(db.Model):
     # 親に対して
     racekey: Mapped[str] = mapped_column(ForeignKey("bangumi.racekey"))
     # 1:1
-    trainanalysis: Mapped[List["TrainAnalysisData"]] = relationship(
+    trainanalysis: Mapped[Optional["TrainAnalysisData"]] = relationship(
         "TrainAnalysisData", uselist=False, backref=backref("racehorse"), innerjoin=True
     )
-    trainoikiri: Mapped[List["TrainOikiriData"]] = relationship(
+    trainoikiri: Mapped[Optional["TrainOikiriData"]] = relationship(
         "TrainOikiriData", uselist=False, backref=backref("racehorse"), innerjoin=True
     )
-    horse_base: Mapped[List["HorsebaseData"]] = relationship(
+    horse_base: Mapped[Optional["HorsebaseData"]] = relationship(
         "HorsebaseData", uselist=False, backref=backref("racehorse"), innerjoin=True
     )
-    result: Mapped[List["SeisekiData"]] = relationship(
+    result: Mapped[Optional["SeisekiData"]] = relationship(
         "SeisekiData", uselist=False, backref=backref("racehorse"), innerjoin=False
     )
-    predict: Mapped[List["PredictData"]] = relationship(
+    predict: Mapped[Optional["PredictData"]] = relationship(
         "PredictData", uselist=False, backref=backref("racehorse"), innerjoin=False
     )
-    calculated_score: Mapped[List["CalculatedScoreData"]] = relationship(
+    calculated_score: Mapped[Optional["CalculatedScoreData"]] = relationship(
         "CalculatedScoreData",
         uselist=False,
         backref=backref("racehorse"),

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/src/jrdb_model/domain/seiseki.py

@@ -1,9 +1,12 @@
 """成績データ."""
 
+from typing import Optional
+
 from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, backref, mapped_column, relationship
 
 from ..sessioncontroll import db
+from .seisekirace import SeisekiRaceData
 
 
 class SeisekiData(db.Model):
@@ -24,7 +27,7 @@ class SeisekiData(db.Model):
     kai: Mapped[int] = mapped_column()
     day: Mapped[str] = mapped_column()
     raceno: Mapped[int] = mapped_column()
-    seisekirace = relationship(
+    seisekirace: Mapped[Optional["SeisekiRaceData"]] = relationship(
         "SeisekiRaceData", uselist=False, backref=backref("seiseki")
     )
     num: Mapped[int] = mapped_column()

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/src/jrdb_model.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jrdb-model
-Version: 0.2.2
+Version: 0.2.4
 Summary: ORM for JRDB
 Author-email: requrd <requrd1989@gmail.com>
 Project-URL: Bug Tracker, https://github.com/astroripple/horseview/issues

{jrdb_model-0.2.2 → jrdb_model-0.2.4}/tests/test_integration.py

@@ -3,21 +3,25 @@
 
 def test_kaisai():
     """開催データのジョインロードのテスト."""
-    # import os
+    import os
     from typing import List
 
     from sqlalchemy.orm import joinedload
 
     from jrdb_model import KaisaiData, create_app
 
-    # os.environ["DB"] = mariadb+pymysql://user:pass@host/database
+    os.environ["DB"] = (
+        "mariadb+pymysql://astroripple:S#tonoprime0407@sazanami-db/astroripple"
+    )
     app = create_app()
+    kaisais: List[KaisaiData]
     with app.app_context():
-        kaisais: List[KaisaiData] = (
+        kaisais = (
             KaisaiData.query.filter(
                 KaisaiData.ymd >= 20220101, KaisaiData.ymd <= 20220130
             )
             .options(joinedload("*"))
             .all()
         )
-        assert len(kaisais) == 26
+    assert len(kaisais) == 26
+    assert kaisais[0].races[0].racehorses[0].result.order_of_arrival == 4