From f9633b1753152eaafcf2634a45b483673eb92e49 Mon Sep 17 00:00:00 2001
From: Jean Demeusy <61140535+jeandemeusy@users.noreply.github.com>
Date: Thu, 6 Jun 2024 12:15:44 +0200
Subject: [PATCH] Fix ticket-price usage from parameters (#526)

---
 ct-app/core/core.py                 | 1 +
 ct-app/core/model/economic_model.py | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ct-app/core/core.py b/ct-app/core/core.py
index de9d1e1f..760443d3 100644
--- a/ct-app/core/core.py
+++ b/ct-app/core/core.py
@@ -341,6 +341,7 @@ async def apply_economic_model(self):
             )
 
         model = EconomicModel.fromParameters(self.params.economicModel)
+        model.budget.ticket_price = await self.ticket_price.get()
 
         redeemed_rewards = await self.peer_rewards.get()
 
diff --git a/ct-app/core/model/economic_model.py b/ct-app/core/model/economic_model.py
index 2175431c..54da3456 100644
--- a/ct-app/core/model/economic_model.py
+++ b/ct-app/core/model/economic_model.py
@@ -54,15 +54,14 @@ def __init__(
         period: float,
         s: float,
         distribution_per_period: float,
-        ticket_price: float,
         winning_probability: float,
     ):
         self.amount = amount
         self.period = period
         self.s = s
         self.distribution_per_period = distribution_per_period
-        self.ticket_price = ticket_price
         self.winning_probability = winning_probability
+        self.ticket_price = None
 
     @property
     def amount(self):
@@ -102,7 +101,8 @@ def distribution_per_period(self, value):
     @ticket_price.setter
     def ticket_price(self, value):
         self._ticket_price = value
-        TICKET_PRICE.set(value)
+        if value is not None:
+            TICKET_PRICE.set(value)
 
     @winning_probability.setter
     def winning_probability(self, value):
@@ -116,7 +116,6 @@ def fromParameters(cls, parameters: Parameters):
             parameters.period,
             parameters.s,
             parameters.countsInPeriod,
-            parameters.ticketPrice,
             parameters.winningProbability,
         )