update set state methods

Author: emdekatharina

frost_sta_client/__version__.py

@@ -1,5 +1,5 @@
 __title__ = 'frost_sta_client'
-__version__ = '1.1.28'
+__version__ = '1.1.29'
 __license__ = 'LGPL3'
 __author__ = 'Katharina Emde'
 __copyright__ = 'Fraunhofer IOSB'

frost_sta_client/model/datastream.py

@@ -334,9 +334,9 @@ def __setstate__(self, state):
         if state.get("Sensor", None) is not None:
             self.sensor = frost_sta_client.model.sensor.Sensor()
             self.sensor.__setstate__(state["Sensor"])
-        if state.get("Observations", None) is not None and isinstance(state["Observations"], list):
+        if state.get("Observations", None) is not None and type(state["Observations"] == str):
             entity_class = entity_type.EntityTypes['Observation']['class']
-            self.observations = utils.transform_json_to_entity_list(state['Observations'], entity_class)
+            self.observations = utils.transform_related_json_to_entity_list(state['Observations'], entity_class)
             self.observations.next_link = state.get("Observations@iot.nextLink", None)
             self.observations.count = state.get("Observations@iot.count", None)
 

frost_sta_client/model/historical_location.py

@@ -29,18 +29,18 @@
 class HistoricalLocation(entity.Entity):
 
     def __init__(self,
-                 locations=None,
+                 location=None,
                  time=None,
                  thing=None,
                  **kwargs):
         super().__init__(**kwargs)
-        self.locations = locations
+        self.location = location
         self.time = time
         self.thing = thing
 
     def __new__(cls, *args, **kwargs):
         new_h_loc = super().__new__(cls)
-        attributes = {'_id': None, '_locations': None, '_time': None, '_thing': None, '_self_link': None,
+        attributes = {'_id': None, '_location': None, '_time': None, '_thing': None, '_self_link': None,
                       '_service': None}
         for key, value in attributes.items():
             new_h_loc.__dict__[key] = value
@@ -55,23 +55,15 @@ def time(self, value):
         self._time = utils.check_datetime(value, 'time')
 
     @property
-    def locations(self):
-        return self._locations
+    def location(self):
+        return self._location
 
-    @locations.setter
-    def locations(self, values):
-        if values is None:
-            self._locations = None
+    @location.setter
+    def location(self, value):
+        if value is None or isinstance(value, location.Location):
+            self._location = value
             return
-        if isinstance(values, list) and all(isinstance(loc, location.Location) for loc in values):
-            entity_class = entity_type.EntityTypes['Location']['class']
-            self._locations = entity_list.EntityList(entity_class=entity_class, entities=values)
-            return
-        if isinstance(values, entity_list.EntityList) and\
-                all((isinstance(loc, location.Location)) for loc in values.entities):
-            self._locations = values
-            return
-        raise ValueError('locations should be a list of locations!')
+        raise ValueError("location should be of type Location!")
 
     @property
     def thing(self):
@@ -84,11 +76,6 @@ def thing(self, value):
             return
         raise ValueError('thing should be of type Thing!')
 
-    def get_locations(self):
-        result = self.service.locations()
-        result.parent = self
-        return result
-
     def ensure_service_on_children(self, service):
         if self.locations is not None:
             self.locations.set_service(service)
@@ -127,11 +114,9 @@ def __setstate__(self, state):
         if state.get("Thing", None) is not None:
             self.thing = frost_sta_client.model.thing.Thing()
             self.thing.__setstate__(state["Thing"])
-        if state.get("Locations", None) is not None and isinstance(state["Locations"], list):
-            entity_class = entity_type.EntityTypes['Location']['class']
-            self.locations = utils.transform_json_to_entity_list(state['Locations'], entity_class)
-            self.locations.next_link = state.get('Locations@iot.nextLink', None)
-            self.locations.count = state.get('Locations@iot.count', None)
+        if state.get("Location", None) is not None:
+            self.thing = frost_sta_client.model.location.Location()
+            self.thing.__setstate__(state["Location"])
 
     def get_dao(self, service):
         return HistoricalLocationDao(service)

frost_sta_client/model/thing.py

@@ -274,10 +274,12 @@ def __setstate__(self, state):
             entity_class = entity_type.EntityTypes['Location']['class']
             self.locations = utils.transform_json_to_entity_list(state['Locations'], entity_class)
             self.locations.next_link = state.get("Locations@iot.nextLink", None)
+            self.locations.count = state.get("Locations@iot.count", None)
         if state.get("HistoricalLocations", None) is not None and isinstance(state["HistoricalLocations"], list):
             entity_class = entity_type.EntityTypes['HistoricalLocation']['class']
             self.historical_locations = utils.transform_json_to_entity_list(state['HistoricalLocations'], entity_class)
             self.historical_locations.next_link = state.get("HistoricalLocations@iot.nextLink", None)
+            self.historical_locations.count = state.get("HistoricalLocations@iot.count", None)
         if state.get("Datastreams", None) is not None and isinstance(state["Datastreams"], list):
             entity_class = entity_type.EntityTypes['Datastream']['class']
             self.datastreams = utils.transform_json_to_entity_list(state['Datastreams'], entity_class)