Fixed issue TypeError: int() argument must be a string, a bytes-like object or a real number, not 'QuerySet' when update_or_create

Author: WideSu

insert_data.py

@@ -19,23 +19,23 @@ async def insert_data():
     position3 = await Position.create(symbol="GOOG", quantity=200, cost_basis=2800.00, client=client2)
 
     # # Creating Market Data
-    # market_data1 = await MarketData.create(symbol="AAPL", current_price=160.00, timestamp=datetime.now(pytz.utc))
-    # market_data2 = await MarketData.create(symbol="TSLA", current_price=750.00, timestamp=datetime.now(pytz.utc))
-    # market_data3 = await MarketData.create(symbol="GOOG", current_price=2900.00, timestamp=datetime.now(pytz.utc))
+    market_data1 = await MarketData.create(symbol="AAPL", current_price=160.00, timestamp=datetime.now(pytz.utc))
+    market_data2 = await MarketData.create(symbol="TSLA", current_price=750.00, timestamp=datetime.now(pytz.utc))
+    market_data3 = await MarketData.create(symbol="GOOG", current_price=2900.00, timestamp=datetime.now(pytz.utc))
 
     # Creating Margin for Clients
-    margin1 = await Margin.create(client=client1, margin_requirement=0.25, loan=10000.00)
-    margin2 = await Margin.create(client=client2, margin_requirement=0.3, loan=15000.00)
+    margin1 = await Margin.create(client_id=client1.id, margin_requirement=0.25, loan=10000.00)
+    margin2 = await Margin.create(client_id=client2.id, margin_requirement=0.3, loan=15000.00)
 
     # Print out the data
     print(repr(client1))
     print(repr(client2))
     print(repr(position1))
     print(repr(position2))
     print(repr(position3))
-    # print(market_data1)
-    # print(market_data2)
-    # print(market_data3)
+    print(repr(market_data1))
+    print(repr(market_data2))
+    print(repr(market_data3))
     print(repr(margin1))
     print(repr(margin2))
     await Tortoise.close_connections()

main.py

@@ -106,10 +106,13 @@ async def get_margin_status(clientId: int):
 
     net_equity = Decimal(total_value) - Decimal(margin_account.loan).quantize(Decimal('0.001'), rounding=ROUND_UP) 
     margin_account.margin_requirement = (Decimal(total_value) * Decimal(config.MMR)).quantize(Decimal('0.001'), rounding=ROUND_UP)  # Example margin requirement calculation
-    margin, created = await Margin.update_or_create(
-        client_id=clientId,
-        defaults={'margin_requirement': margin_account.margin_requirement, 'loan': margin_account.loan}
-    )
+    if margin_account:
+        margin, created = await Margin.update_or_create(
+            client_id=clientId,  # <-- This ensures we are updating a specific record
+            defaults={'margin_requirement': margin_account.margin_requirement, 'loan': margin_account.loan}
+        )
+    else:
+        print("No margin account found for client_id:", clientId)
     margin_shortfall = max(margin_account.margin_requirement - net_equity, Decimal(0)).quantize(Decimal('0.001'), rounding=ROUND_UP) 
     margin_call_triggered = margin_shortfall > 0
     # await Margin.update_or_create(client_id = clientId, margin_requirement=margin_account.margin_requirement,loan=margin_account.loan)

models.py

@@ -23,13 +23,13 @@ class MarketData(Model):
     id = fields.IntField(pk=True)
     symbol = fields.CharField(max_length=50)
     current_price = fields.FloatField()
-    timestamp = fields.DatetimeField()
+    timestamp = fields.DatetimeField(default=datetime.datetime.now)
     def __repr__(self):
         return f"<MarketData(id={self.id}, symbol={self.symbol}, current_price={self.current_price}, timestamp={self.timestamp})>"
 
 class Margin(Model):
-    client = fields.ForeignKeyField("models.Client", related_name="margins", pk=True, null=False)
+    id = fields.IntField(pk=True)  # Auto-increment primary key
+    client = fields.ForeignKeyField("models.Client", related_name="margins", on_delete=fields.CASCADE)
     margin_requirement = fields.FloatField()
     loan = fields.FloatField()
-    def __repr__(self):
-        return f"<Margin(loan={self.loan}, symbol={self.margin_requirement}>"
+    timestamp = fields.DatetimeField(default=datetime.datetime.now)