API updates part 1

Author: kwuz

odmtools/odmservices/series_service.py

@@ -124,31 +124,35 @@ def get_variables_by_site_code(self, site_code):
 
 # Series Catalog methods
 
-#
-#     def get_series_by_site(self , site_id):
-#         """
-#
-#         :param site_id: int
-#         :return: List[Series]
-#         """
-#         try:
-#             selectedSeries = self._edit_session.query(Series).filter_by(site_id=site_id).order_by(Series.id).all()
-#             return selectedSeries
-#         except:
-#             return None
 
+    def get_series_by_site(self , site_id):
+        """
+
+        :param site_id: int
+        :return: List[Series]
+        """
+        # try:
+        #     selectedSeries = self._edit_session.query(Series).filter_by(site_id=site_id).order_by(Series.id).all()
+        #     return selectedSeries
+        # except:
+        #     return None
+
+        return self.read.getResult(type="site", ids = [site_id])[0]
+    ##TODO : check is this the right way to get the series??
+
+
+
+
+    # Site methods
+    def get_all_sites(self):
+        """
+
+        :return: List[Sites]
+        """
+        #return self._edit_session.query(Site).order_by(Site.code).all()
+        return self.read.getResults(type="site")
 
 
-#
-#     # Site methods
-#     def get_all_sites(self):
-#         """
-#
-#         :return: List[Sites]
-#         """
-#         return self._edit_session.query(Site).order_by(Site.code).all()
-#
-#
 #
     def get_site_by_id(self, site_id):
         """
@@ -166,12 +170,13 @@ def get_site_by_id(self, site_id):
 #
 
 #
-#     def get_all_variables(self):
-#         """
-#
-#         :return: List[Variables]
-#         """
-#         return self._edit_session.query(Variable).all()
+    def get_all_variables(self):
+        """
+
+        :return: List[Variables]
+        """
+        #return self._edit_session.query(Variable).all()
+        return self.read.getVariables()
 #
     def get_variable_by_id(self, variable_id):
         """