Merge pull request #238 from raphaelrpl/reuse-cube

🐛 Fix minimal issues related api resources and list merges

Author: raphaelrpl

cube_builder/controller.py

@@ -331,7 +331,12 @@ def get_cube(cls, cube_id: int):
         ]
         dump_cube['extent'] = None
         dump_cube['grid'] = cube.grs.name
-        dump_cube['composite_function'] = cube.composite_function.name
+        dump_cube['composite_function'] = dict(
+            name=cube.composite_function.name,
+            description=cube.composite_function.description,
+            alias=cube.composite_function.alias,
+        )
+
         dump_cube['summary'] = cls.summarize(cube)
 
         return dump_cube, 200
@@ -461,8 +466,9 @@ def check_for_invalid_merges(cls, cube_id: str, tile_id: str, start_date: str, e
             raise NotFound('Cube {} not found'.format(cube_id))
 
         # TODO validate schema to avoid start/end too abroad
+        identity = cube.composite_function.alias == 'IDT'
 
-        res = Activity.list_merge_files(cube.name, tile_id, start_date[:10], end_date[:10])
+        res = Activity.list_merge_files(cube.name, tile_id, start_date[:10], end_date[:10], identity)
 
         result = validate_merges(res)
 

cube_builder/forms.py

@@ -119,8 +119,8 @@ class CubeParametersSchema(Schema):
 class DataCubeForm(Schema):
     """Define parser for datacube creation."""
 
-    datacube = fields.String(required=True, allow_none=False, validate=Regexp('^[a-zA-Z0-9-]*$', error=INVALID_CUBE_NAME))
-    datacube_identity = fields.String(required=False, allow_none=False, validate=Regexp('^[a-zA-Z0-9-]*$', error=INVALID_CUBE_NAME))
+    datacube = fields.String(required=True, allow_none=False, validate=Regexp('^[a-zA-Z0-9-_]*$', error=INVALID_CUBE_NAME))
+    datacube_identity = fields.String(required=False, allow_none=False, validate=Regexp('^[a-zA-Z0-9-_]*$', error=INVALID_CUBE_NAME))
     grs = fields.String(required=True, allow_none=False)
     resolution = fields.Integer(required=True, allow_none=False)
     temporal_composition = fields.Dict(required=True, allow_none=False)

cube_builder/models/activity.py

@@ -52,17 +52,22 @@ class Activity(BaseModel):
     @classmethod
     def list_merge_files(cls, collection: str, tile: str,
                          start_date: Union[str, datetime],
-                         end_date: Union[str, datetime]) -> ResultProxy:
+                         end_date: Union[str, datetime],
+                         identity: bool = False) -> ResultProxy:
         """List all merge files used in data cube generation."""
+        field = 'collection_id'
+        if identity:
+            field = 'warped_collection_id'
         sql = """
         SELECT id, tile_id, band, date::VARCHAR as date, collection_id, args->>'file' AS file, args->'dataset'::VARCHAR AS data_set, (elem->>'link')::VARCHAR as link, status, traceback::TEXT
           FROM cube_builder.activities
          CROSS JOIN json_array_elements(args->'assets') elem
-         WHERE collection_id = '{}'
+         WHERE {} = '{}'
            AND tile_id = '{}'
            AND date BETWEEN '{}'::DATE AND '{}'::DATE
          ORDER BY id
         """.format(
+            field,
             collection,
             tile,
             start_date,

cube_builder/views.py

@@ -133,9 +133,9 @@ def update_cube_parameters(cube_id, **kwargs):
     """Update the data cube parameters execution."""
     parameters = request.get_json()
 
-    message, status_code = CubeController.configure_parameters(cube_id, **parameters)
+    message = CubeController.configure_parameters(int(cube_id), **parameters)
 
-    return jsonify(message), status_code
+    return jsonify(message)
 
 
 @bp.route('/cubes/<cube_id>/tiles/geom', methods=['GET'])