From 0ec0f94fd03fdfe2f795cf6e311be9eea8019eb4 Mon Sep 17 00:00:00 2001
From: Flix6x <Flix6x@users.noreply.github.com>
Date: Tue, 7 Sep 2021 13:06:54 +0000
Subject: [PATCH 1/3] Create draft PR for #175


From c7eeb8b3cd1fbe8f140d790a692d5c3228335fb8 Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Tue, 7 Sep 2021 15:28:53 +0200
Subject: [PATCH 2/3] Allow passing a GenericAsset or an id

---
 flexmeasures/data/models/time_series.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/flexmeasures/data/models/time_series.py b/flexmeasures/data/models/time_series.py
index db7b8493a..c8d087741 100644
--- a/flexmeasures/data/models/time_series.py
+++ b/flexmeasures/data/models/time_series.py
@@ -39,10 +39,22 @@ class Sensor(db.Model, tb.SensorDBMixin):
         ),
     )
 
-    def __init__(self, name: str, generic_asset: GenericAsset, **kwargs):
+    def __init__(
+        self,
+        name: str,
+        generic_asset: Optional[GenericAsset] = None,
+        generic_asset_id: Optional[int] = None,
+        **kwargs,
+    ):
+        assert (generic_asset is None) ^ (
+            generic_asset_id is None
+        ), "Either generic_asset_id or generic_asset must be set."
         tb.SensorDBMixin.__init__(self, name, **kwargs)
         tb_utils.remove_class_init_kwargs(tb.SensorDBMixin, kwargs)
-        kwargs["generic_asset"] = generic_asset
+        if generic_asset is not None:
+            kwargs["generic_asset"] = generic_asset
+        else:
+            kwargs["generic_asset_id"] = generic_asset_id
         db.Model.__init__(self, **kwargs)
 
     @property

From 0660c102c310765fdc5519b8fda34b3cde0f6ae2 Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Tue, 7 Sep 2021 15:41:59 +0200
Subject: [PATCH 3/3] Changelog entry

---
 documentation/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/changelog.rst b/documentation/changelog.rst
index 8b1193343..ab520b22a 100644
--- a/documentation/changelog.rst
+++ b/documentation/changelog.rst
@@ -24,6 +24,7 @@ New features
 Bugfixes
 -----------
 * Fix (dev) CLI command for adding a GenericAssetType [see `PR #173 <http://www.github.com/SeitaBV/flexmeasures/pull/173>`_]
+* Fix (dev) CLI command for adding a Sensor [see `PR #176 <http://www.github.com/SeitaBV/flexmeasures/pull/176>`_]
 
 Infrastructure / Support
 ----------------------