Merge branch 'develop' of https://github.com/podaac/hydrocron into fe…

…ature/issue-235

CHANGELOG.md

@@ -17,6 +17,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [1.4.1]
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+    - Issue 243 - Fix cases where not all time steps were returned for a feature id
+### Security
+
 ## [1.4.0]
 
 ### Added

hydrocron/api/controllers/timeseries.py

@@ -213,7 +213,7 @@ def sanitize_time(start_time, end_time):
     return start_time, end_time
 
 
-def timeseries_get(feature, feature_id, start_time, end_time, output, fields):  # noqa: E501 pylint: disable=too-many-positional-arguments
+def timeseries_get(feature, feature_id, start_time, end_time, output, fields):  # pylint: disable=too-many-positional-arguments
     """Get Timeseries for a particular Reach, Node, or LakeID
 
     Get Timeseries for a particular Reach, Node, or LakeID # noqa: E501
@@ -239,12 +239,7 @@ def timeseries_get(feature, feature_id, start_time, end_time, output, fields):
     hits = 0
 
     data_repository = DynamoDataRepository(connection.dynamodb_resource)
-    if feature.lower() == 'reach':
-        results = data_repository.get_reach_series_by_feature_id(feature_id, start_time, end_time)
-    if feature.lower() == 'node':
-        results = data_repository.get_node_series_by_feature_id(feature_id, start_time, end_time)
-    if feature.lower() == 'priorlake':
-        results = data_repository.get_prior_lake_series_by_feature_id(feature_id, start_time, end_time)
+    results = data_repository.get_series_by_feature_id(feature, feature_id, start_time, end_time)
 
     if len(results['Items']) == 0:
         data['http_code'] = '400 Bad Request'

hydrocron/api/data_access/db.py

@@ -5,7 +5,7 @@
 import logging
 
 from boto3.resources.base import ServiceResource
-from boto3.dynamodb.conditions import Key  # noqa: E501 # pylint: disable=C0412
+from boto3.dynamodb.conditions import Key, And  # noqa: E501 # pylint: disable=C0412
 
 from hydrocron.utils import constants
 
@@ -19,61 +19,76 @@ def __init__(self, dynamo_resource: ServiceResource):
         self._dynamo_instance = dynamo_resource
         self._logger = logging.getLogger('hydrocron.api.data_access.db.DynamoDataRepository')
 
-    def get_reach_series_by_feature_id(self, feature_id: str, start_time: str, end_time: str):  # noqa: E501 # pylint: disable=W0613
+    def get_series_by_feature_id(self, feature_type: str, feature_id: str, start_time: str, end_time: str):  # noqa: E501 # pylint: disable=W0613
         """
 
+        @param feature_type:
         @param feature_id:
         @param start_time:
         @param end_time:
         @return:
         """
-        table_name = constants.SWOT_REACH_TABLE_NAME
 
-        hydrocron_table = self._dynamo_instance.Table(table_name)
-        hydrocron_table.load()
+        if feature_type.lower() == 'reach':
+            table_name = constants.SWOT_REACH_TABLE_NAME
+            partition_key = constants.SWOT_REACH_PARTITION_KEY
+            sort_key = constants.SWOT_REACH_SORT_KEY
+        elif feature_type.lower() == 'node':
+            table_name = constants.SWOT_NODE_TABLE_NAME
+            partition_key = constants.SWOT_NODE_PARTITION_KEY
+            sort_key = constants.SWOT_NODE_SORT_KEY
+        elif feature_type.lower() == 'priorlake':
+            table_name = constants.SWOT_PRIOR_LAKE_TABLE_NAME
+            partition_key = constants.SWOT_PRIOR_LAKE_PARTITION_KEY
+            sort_key = constants.SWOT_PRIOR_LAKE_SORT_KEY
+        else:
+            table_name = ''
+            partition_key = ''
+            sort_key = ''
+
+        if table_name:
+            hydrocron_table = self._dynamo_instance.Table(table_name)
+            hydrocron_table.load()
+            key_condition_expression = (
+                Key(partition_key).eq(feature_id) &
+                Key(sort_key).between(start_time, end_time)
+            )
+            items = self._query_hydrocron_table(hydrocron_table, key_condition_expression)
+        else:
+            items = {'Items': []}
 
-        items = hydrocron_table.query(KeyConditionExpression=(
-            Key(constants.SWOT_REACH_PARTITION_KEY).eq(feature_id) &
-            Key(constants.SWOT_REACH_SORT_KEY).between(start_time, end_time))
-        )
         return items
 
-    def get_node_series_by_feature_id(self, feature_id, start_time, end_time):  # noqa: E501 # pylint: disable=W0613
+    def _query_hydrocron_table(self, hydrocron_table: str, key_condition_expression: And):
         """
 
-        @param feature_id:
-        @param start_time:
-        @param end_time:
+        @param hydrocron_table:
+        @param key_condition_expression:
         @return:
         """
-        table_name = constants.SWOT_NODE_TABLE_NAME
-
-        hydrocron_table = self._dynamo_instance.Table(table_name)
-        hydrocron_table.load()
-
-        items = hydrocron_table.query(KeyConditionExpression=(
-            Key(constants.SWOT_NODE_PARTITION_KEY).eq(feature_id) &
-            Key(constants.SWOT_NODE_SORT_KEY).between(start_time, end_time))
-        )
-        return items
-
-    def get_prior_lake_series_by_feature_id(self, feature_id, start_time, end_time):  # noqa: E501 # pylint: disable=W0613
-        """
 
-        @param feature_id:
-        @param start_time:
-        @param end_time:
-        @return:
-        """
-        table_name = constants.SWOT_PRIOR_LAKE_TABLE_NAME
+        items = hydrocron_table.query(
+                KeyConditionExpression=key_condition_expression
+            )
+        last_key_evaluated = ''
+        if 'LastEvaluatedKey' in items.keys():
+            last_key_evaluated = items['LastEvaluatedKey']
 
-        hydrocron_table = self._dynamo_instance.Table(table_name)
-        hydrocron_table.load()
+        while last_key_evaluated:
+            next_items = hydrocron_table.query(
+                ExclusiveStartKey=last_key_evaluated,
+                KeyConditionExpression=key_condition_expression
+            )
+            items['Items'].extend(next_items['Items'])
+            items['Count'] += next_items['Count']
+            items['ScannedCount'] += next_items['ScannedCount']
+            items['ResponseMetadata'] = next_items['ResponseMetadata']
+            last_key_evaluated = ''
+            if 'LastEvaluatedKey' in next_items.keys():
+                last_key_evaluated = next_items['LastEvaluatedKey']
+            else:
+                items.pop('LastEvaluatedKey')
 
-        items = hydrocron_table.query(KeyConditionExpression=(
-            Key(constants.SWOT_PRIOR_LAKE_PARTITION_KEY).eq(feature_id) &
-            Key(constants.SWOT_PRIOR_LAKE_SORT_KEY).between(start_time, end_time))
-        )
         return items
 
     def get_series_granule_ur(self, table_name, feature_name, granule_ur):