EoD push 2017-03-07

Author: Ted Salmon

clouder_metric/models/clouder_metric_interface.py

@@ -52,9 +52,14 @@ class ClouderMetricInterface(models.Model):
     interval_type = fields.Selection(
         related='cron_id.interval_type',
     )
-    query_code = fields.Text(
+    query_code = fields.Text()
+    clouder_contract_id = fields.Many2one(
+        string='Clouder Contract',
+        comodel_name='clouder.contract',
+        inverse_name='clouder_metric_ids'
     )
 
+
     @property
     @api.multi
     def metric_id(self):

sale_clouder/models/clouder_contract.py

@@ -23,6 +23,11 @@ class ClouderContract(models.Model):
         require=True,
         ondelete='restrict',
     )
+    clouder_metric_ids = fields.One2many(
+        string='Clouder Metrics',
+        comodel_name='clouder.metric.interface',
+        inverse_name='clouder_contract_id'
+    )
 
     _sql_constraints = [
         ('ref_contract_id_unique', 'UNIQUE(ref_contract_id)',
@@ -142,6 +147,10 @@ def _get_quantity_threshold(self, account_line, invoice):
             (float) Quantity to use on invoice line in the UOM defined on the
                 ``contract_line``.
         """
+        # Filter relevant metrics & return the right quanitity for the type
+        metrics = self.clouder_metric_ids.search([
+            ('metric_start', '>=', None),
+        ])
         return account_line.quantity * account_line.uom_id
 
     @api.multi
@@ -155,4 +164,8 @@ def _get_quantity_usage(self, account_line, invoice):
             (float) Quantity to use on invoice line in the UOM defined on the
                 ``contract_line``.
             """
+        # Filter relevant metrics & return the right quanitity for the type
+        metrics = self.clouder_metric_ids.search([
+            ('metric_start', '>=', None),
+        ])
         return account_line.quantity * account_line.uom_id