P5-6370 inquires should use markets instead of territores for calculating prices #36

api/models/inquiry.py

@@ -9,7 +9,9 @@ class Inquiry(db.Model):
     __tablename__ = "inquiries"
 
     id = db.Column("inquiryid", db.Integer, primary_key=True)
-    territory = db.Column(db.String(2))
+    market_id = db.Column(db.Integer, db.ForeignKey("markets.id"))
+    market = db.relationship("Market", backref="inquiries")
+
     product_group = db.Column(db.String(100))
     price_m2 = db.Column(db.Numeric)
     price_effect = db.Column(db.Numeric)
@@ -36,13 +38,6 @@ class Inquiry(db.Model):
     product = db.relationship("Product", uselist=False)
     automated = db.Column(db.Integer, nullable=False, default=0)
 
-    @property
-    def market(self):
-        market = market_model.from_territory(self.territory)
-        if not market:
-            raise ValueError("Invalid territory: {}".format(self.territory))
-        return market
-
     def local_price_retouch(self, rounded=True, inc_vat=False):
         """ returns the retouch price in the inquiry local currency """
         if not self.price_retouch: