Fixed get_stream_names_ids_by_user and

renamed to get_stream_metadata_by_user
MD2Korg · Mar 14, 2018 · 1b91dcc · 1b91dcc
1 parent b74e494
commit 1b91dcc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/cerebralcortex/cerebralcortex.py b/cerebralcortex/cerebralcortex.py
@@ -182,14 +182,14 @@ def get_stream_duration(self, stream_id: uuid) -> dict:
         """
         return self.SqlData.get_stream_duration(stream_id)
 
-    def get_stream_names_ids_by_user(self, user_id: uuid, stream_name: str = None, start_time: datetime = None,
+    def get_stream_metadata_by_user(self, user_id: uuid, stream_name: str = None, start_time: datetime = None,
                                      end_time: datetime = None) -> List:
         """
         Returns all the stream ids and name that belongs to an owner-id
         :param user_id:
         :return:
         """
-        return self.SqlData.get_stream_names_ids_by_user(user_id, stream_name, start_time, end_time)
+        return self.SqlData.get_stream_metadata_by_user(user_id, stream_name, start_time, end_time)
 
     def get_stream_metadata(self, stream_id: uuid) -> dict:
         """

diff --git a/cerebralcortex/core/data_manager/sql/stream_handler.py b/cerebralcortex/core/data_manager/sql/stream_handler.py
@@ -50,37 +50,36 @@ def get_stream_metadata(self, stream_id: uuid) -> dict:
         rows = self.execute(qry, vals)
         return rows
 
-    def get_stream_names_ids_by_user(self, user_id: uuid, stream_name: str = None, start_time: datetime = None,
+    def get_stream_metadata_by_user(self, user_id: uuid, stream_name: str = None, start_time: datetime = None,
                                      end_time: datetime = None) -> List:
         """
         Returns all the stream ids and name that belongs to an owner-id
         :param user_id:
         :return:
         """
         stream_ids_names = {}
-        v1, v2, v3, v4 = None, None, None, None
+        vals = []
         if not user_id:
+            print("User ID cannot be empty/None.")
             return None
 
-        qry = "SELECT identifier, name from " + self.datastreamTable
-        where_clause = "where owner=%s"
-        v1 = user_id
+        qry = "SELECT identifier, data_descriptor,execution_context,annotations, start_time, end_time from " + self.datastreamTable
+        where_clause = " where owner=%s "
+        vals.append(user_id)
         if stream_name:
             where_clause += " and name=%s "
-            v2 = stream_name
+            vals.append(stream_name)
         if start_time:
             where_clause += " and start_time<=%s "
-            v3 = start_time
+            vals.append(start_time)
         if end_time:
             where_clause += " and end_time>=%s "
-            v4 = end_time
-        vals = filter(None, (v1, v2, v3, v4))
+            vals.append(end_time)
 
+        qry = qry+where_clause
+        vals = tuple(vals)
         rows = self.execute(qry, vals)
-        #rows = self.cursor.fetchall()
-        for row in rows:
-            stream_ids_names[row["name"]] = row["identifier"]
-        return stream_ids_names
+        return rows
 
     def get_stream_duration(self, stream_id: uuid) -> dict:
         """

diff --git a/cerebralcortex/core/test_suite/test_hdfs.py b/cerebralcortex/core/test_suite/test_hdfs.py
@@ -54,6 +54,7 @@ def test01_save_stream(self):
                 outputdata[day] = []
 
             outputdata[day].append(row)
+
         for day, dps in outputdata.items():
             ds = DataStream(self.stream_id, self.owner_id, self.stream_name, self.metadata["data_descriptor"],
                             self.metadata["execution_context"], self.metadata["annotations"], self.metadata["type"], None, None, dps)