Update App/routers/stocks/models.py

App/routers/stocks/models.py

@@ -1,58 +1,28 @@
-from tortoise.contrib.pydantic.creator import pydantic_queryset_creator
+# App/routers/stocks/models.py
+
+from tortoise.contrib.pydantic.creator import pydantic_queryset_creator, pydantic_model_creator
 from tortoise.models import Model
 from tortoise import fields
-from tortoise.contrib.pydantic import pydantic_model_creator
 from tortoise.queryset import QuerySet
 
+# ===============================================
+#  Step 1: Define all your ORM Models first
+# ===============================================
 
 class Stock(Model):
     id = fields.IntField(primary_key=True)
     symbol = fields.CharField(max_length=10, unique=True)
     name = fields.CharField(max_length=200)
     created_at = fields.DatetimeField(auto_now_add=True)
-    updated_at = fields.DatetimeField(auto_now=True)
-
-    @staticmethod
-    async def get_list(data):
-        if type(data) == list(Stock):
-            parser = pydantic_queryset_creator(Stock)
-            return await parser.from_queryset(data)
-
-    async def to_dict(self):
-        if type(self) == Stock:
-            parser = pydantic_model_creator(Stock)
-            return await parser.from_tortoise_orm(self)
+    updated_at = fields.DateTimeField(auto_now=True)
 
     class Meta:
         table = "stocks"
 
 
-
-# ----------------- STEP 1: Create the SLIM Pydantic model for Stock -----------------
-# This model represents a Stock but without its own nested lists.
-StockPydantic_Slim = pydantic_model_creator(
-    Stock,
-    name="StockSlim",
-    exclude=("dividends", "portfolio_holdings", "price_data", "watching") # Exclude all reverse relations
-)
-
-# ----------------- STEP 2: Create the FINAL Pydantic model for StockPriceData -----------------
-# First, generate a base model from the ORM, excluding the default 'stock' relation
-StockPriceData_Pydantic_Base = pydantic_model_creator(
-    StockPriceData,
-    name="StockPriceDataBase",
-    exclude=("stock",)
-)
-
-# Then, create a new class that inherits from the base and adds the 'stock' field back,
-# but this time, its type is our new 'StockPydantic_Slim'.
-class StockPriceData_Pydantic_Final(StockPriceData_Pydantic_Base):
-    stock: StockPydantic_Slim
-
-# ----------------- STEP 3: Update the StockPriceData ORM model -----------------
 class StockPriceData(Model):
     id = fields.IntField(primary_key=True)
-    stock = fields.ForeignKeyField("models.Stock", related_name="price_data")
+    stock: fields.ForeignKeyRelation[Stock] = fields.ForeignKeyField("models.Stock", related_name="price_data")
     date = fields.DateField()
     opening_price = fields.DecimalField(max_digits=15, decimal_places=2)
     closing_price = fields.DecimalField(max_digits=15, decimal_places=2)
@@ -67,28 +37,51 @@ class StockPriceData(Model):
     @staticmethod
     async def get_list(data: QuerySet):
         """
-        Creates a Pydantic model for a list of StockPriceData objects.
-        This method now correctly uses our custom final Pydantic model to serialize each item.
+        Creates a Pydantic model for a list of StockPriceData objects,
+        ensuring the nested 'stock' object is a "slim" version without further nesting.
         """
-        # Create a list/queryset serializer using our final, correctly nested Pydantic model
-        PriceDataListPydantic = pydantic_queryset_creator(
+        # --- Pydantic model definitions are now safely inside the method ---
+
+        # 1. Define a slim Pydantic model for the nested Stock object
+        StockPydantic_Slim = pydantic_model_creator(
+            Stock,
+            name="StockSlim",
+            exclude=("dividends", "portfolio_holdings", "price_data", "watching")
+        )
+
+        # 2. Define a base Pydantic model for StockPriceData, excluding the default 'stock' field
+        StockPriceData_Pydantic_Base = pydantic_model_creator(
+            StockPriceData,
+            name="StockPriceDataBase",
+            exclude=("stock",)
+        )
+
+        # 3. Create the final Pydantic model by combining the base and the slim stock model
+        class StockPriceData_Pydantic_Final(StockPriceData_Pydantic_Base):
+            stock: StockPydantic_Slim
+
+        # 4. Create the serializer for a list of these final models
+        PriceDataList_Serializer = pydantic_queryset_creator(
             tortoise_model=StockPriceData,
-            pydantic_model=StockPriceData_Pydantic_Final, # This is the key change
+            pydantic_model=StockPriceData_Pydantic_Final,
             name="PriceDataList"
         )
-        return await PriceDataListPydantic.from_queryset(data)
+        
+        # Finally, serialize the data using the model we just constructed
+        return await PriceDataList_Serializer.from_queryset(data)
 
     async def to_dict(self):
-        # This method is for single instances, not lists. It can stay as is.
         parser = pydantic_model_creator(StockPriceData)
         return await parser.from_tortoise_orm(self)
 
     class Meta:
         table = "stock_price_data"
         unique_together = (("stock", "date"),)
+
+
 class Dividend(Model):
     id = fields.IntField(primary_key=True)
-    stock = fields.ForeignKeyField("models.Stock", related_name="dividends")
+    stock: fields.ForeignKeyRelation[Stock] = fields.ForeignKeyField("models.Stock", related_name="dividends")
     ex_dividend_date = fields.DateField()
     dividend_amount = fields.DecimalField(max_digits=15, decimal_places=4)
     dividend_type = fields.CharField(max_length=50, null=True, blank=True)
@@ -97,28 +90,8 @@ class Dividend(Model):
         max_digits=10, decimal_places=4, null=True, blank=True
     )
     created_at = fields.DatetimeField(auto_now_add=True)
-    updated_at = fields.DatetimeField(auto_now=True)
-
-    @staticmethod
-    async def get_list(data):
-        if type(data) == QuerySet:
-            parser = pydantic_queryset_creator(Dividend)
-            return await parser.from_queryset(data)
-
-    async def to_dict(self):
-        if type(self) == Model:
-            parser = pydantic_model_creator(Dividend)
-            return await parser.from_tortoise_orm(self)
-        if type(self) == QuerySet:
-            parser = pydantic_queryset_creator(Dividend)
-            return await parser.from_queryset(self)
+    updated_at = fields.DateTimeField(auto_now=True)
 
     class Meta:
         table = "dividends"
-        ordering = [
-            "-ex_dividend_date",
-            "-payment_date",
-        ]  # Order by dates descending by default
-
-    def __str__(self):
-        return f"{self.stock.symbol} Dividend: {self.dividend_amount} on {self.ex_dividend_date}"
+        ordering = ["-ex_dividend_date", "-payment_date"]