fixed a bug where a previous change broke an import statement

api/public/public_api/endpoints/device_metrics.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from http import HTTPStatus
 
 from selene.api import PublicEndpoint
@@ -13,7 +12,6 @@ class DeviceMetricsEndpoint(PublicEndpoint):
         core_metric = CoreMetric(
             device_id=device_id,
             metric_type=metric,
-            insert_ts=datetime.now(),
             metric_value=self.request.json
         )
         self._add_metric(core_metric)

shared/selene/data/metric/__init__.py

@@ -1,5 +1,5 @@
 from .entity.api import ApiMetric
-from .entity.core import CoreTimingMetric, CoreInteraction
+from .entity.core import CoreMetric, CoreInteraction
 from .entity.job import JobMetric
 from .repository.api import ApiMetricsRepository
 from .repository.core import CoreMetricRepository

shared/selene/data/metric/entity/core.py

@@ -4,9 +4,11 @@ from decimal import Decimal
 
 
 @dataclass
-class CoreTimingMetric(object):
+class CoreMetric(object):
     device_id: str
+    metric_type: str
     metric_value: dict
+    id: str = None
 
 
 @dataclass

shared/selene/data/metric/repository/core.py

@@ -2,7 +2,7 @@ import json
 from dataclasses import asdict
 from datetime import date
 from typing import List
-from ..entity.core import CoreTimingMetric, CoreInteraction
+from ..entity.core import CoreMetric, CoreInteraction
 from ...repository_base import RepositoryBase
 
 
@@ -10,9 +10,11 @@ class CoreMetricRepository(RepositoryBase):
     def __init__(self, db):
         super(CoreMetricRepository, self).__init__(db, __file__)
 
-    def add(self, metric: CoreTimingMetric):
+    def add(self, metric: CoreMetric):
         db_request_args = asdict(metric)
-        db_request_args['metric_value'] = json.dumps(db_request_args['metric_value'])
+        db_request_args['metric_value'] = json.dumps(
+            db_request_args['metric_value']
+        )
         db_request = self._build_db_request(
             sql_file_name='add_core_metric.sql',
             args=db_request_args
@@ -21,14 +23,14 @@ class CoreMetricRepository(RepositoryBase):
 
     def get_metrics_by_device(self, device_id):
         return self._select_all_into_dataclass(
-            CoreTimingMetric,
+            CoreMetric,
             sql_file_name='get_core_metric_by_device.sql',
             args=dict(device_id=device_id)
         )
 
-    def get_metrics_by_date(self, metric_date: date) -> List[CoreTimingMetric]:
+    def get_metrics_by_date(self, metric_date: date) -> List[CoreMetric]:
         return self._select_all_into_dataclass(
-            CoreTimingMetric,
+            CoreMetric,
             sql_file_name='get_core_timing_metrics_by_date.sql',
             args=dict(metric_date=metric_date)
         )

shared/selene/data/metric/repository/sql/get_core_metric_by_device.sql

@@ -2,7 +2,6 @@ SELECT
     id,
     device_id,
     metric_type,
-    insert_ts,
     metric_value
 FROM
     metric.core

shared/selene/data/metric/repository/sql/get_core_timing_metrics_by_date.sql

@@ -1,5 +1,6 @@
 SELECT
     device_id,
+    metric_type,
     metric_value
 FROM
     metric.core