Adding image filtering for fbc_operations requests

Author: lipoja

iib/web/api_v1.py

@@ -402,6 +402,7 @@ def get_builds() -> flask.Response:
         request_add_alias = aliased(RequestAdd, flat=True)
         request_rm_alias = aliased(RequestRm, flat=True)
         request_merge_index_image_alias = aliased(RequestMergeIndexImage, flat=True)
+        request_fbc_operations_alias = aliased(RequestFbcOperations, flat=True)
 
         query_params['index_image'] = index_image
         # Get the image id of the image to be searched
@@ -419,6 +420,9 @@ def get_builds() -> flask.Response:
                     Request.id == request_merge_index_image_alias.id,
                 )
                 .outerjoin(request_rm_alias, Request.id == request_rm_alias.id)
+                .outerjoin(
+                    request_fbc_operations_alias, Request.id == request_fbc_operations_alias.id
+                )
             )
 
             query = query.filter(
@@ -427,6 +431,7 @@ def get_builds() -> flask.Response:
                     request_add_alias.index_image_id == image_result.id,
                     request_merge_index_image_alias.index_image_id == image_result.id,
                     request_rm_alias.index_image_id == image_result.id,
+                    request_fbc_operations_alias.index_image_id == image_result.id,
                 )
             )
         # if index_image is not found in image table, then raise an error

tests/conftest.py

@@ -158,6 +158,39 @@ def minimal_request_rm(db):
     return request
 
 
+@pytest.fixture()
+def minimal_request_fbc_operations(db):
+    """
+    Create and return an instance of the RequestFbcOperations class.
+
+    The request instance will have the minimal set of required attributes set,
+    and it'll be committed to the database.
+
+    :param flask_sqlalchemy.SQLAlchemy db: the connection to the database
+    :return: the newly created request object
+    :rtype: RequestFbcOperations
+    """
+    binary_image = models.Image(pull_specification='quay.io/fbc_operations/binary-image:latest')
+    db.session.add(binary_image)
+    from_index_image = models.Image(pull_specification='quay.io/fbc_operations/index-image:latest')
+    db.session.add(from_index_image)
+    fbc_fragment_image = models.Image(
+        pull_specification='quay.io/fbc_operations/fbcfragment-image:latest'
+    )
+    db.session.add(fbc_fragment_image)
+    batch = models.Batch()
+    db.session.add(batch)
+    request = models.RequestFbcOperations(
+        batch=batch,
+        binary_image=binary_image,
+        fbc_fragment=fbc_fragment_image,
+        from_index=from_index_image,
+    )
+    db.session.add(request)
+    db.session.commit()
+    return request
+
+
 @pytest.fixture()
 def minimal_request_regenerate_bundle(db):
     """

tests/test_web/test_api_v1.py

@@ -8,7 +8,13 @@
 from sqlalchemy.exc import DisconnectionError
 
 from iib.web.api_v1 import _get_unique_bundles
-from iib.web.models import Image, RequestAdd, RequestRm, RequestCreateEmptyIndex
+from iib.web.models import (
+    Image,
+    RequestAdd,
+    RequestRm,
+    RequestCreateEmptyIndex,
+    RequestFbcOperations,
+)
 
 
 def test_get_build(app, auth_env, client, db):
@@ -96,7 +102,8 @@ def test_get_build(app, auth_env, client, db):
 def test_get_builds(app, auth_env, client, db):
     total_create_requests = 5
     total_add_requests = 50
-    total_requests = total_create_requests + total_add_requests
+    total_fbc_operations_requests = 5
+    total_requests = total_create_requests + total_add_requests + total_fbc_operations_requests
     # flask_login.current_user is used in RequestAdd.from_json, which requires a request context
     with app.test_request_context(environ_base=auth_env):
         for i in range(total_add_requests):
@@ -116,6 +123,14 @@ def test_get_builds(app, auth_env, client, db):
             }
             request2 = RequestCreateEmptyIndex.from_json(data)
             db.session.add(request2)
+        for i in range(total_fbc_operations_requests):
+            data = {
+                'binary_image': 'quay.io/namespace/binary_image:latest',
+                'from_index': f'quay.io/namespace/repo:{i}',
+                'fbc_fragment': f'quay.io/namespace/fbcfragment:{i}',
+            }
+            request2 = RequestFbcOperations.from_json(data)
+            db.session.add(request2)
         db.session.commit()
 
     rv_json = client.get('/api/v1/builds?page=2').json
@@ -151,6 +166,10 @@ def test_get_builds(app, auth_env, client, db):
     assert rv_json['meta']['total'] == total_add_requests
     assert rv_json['items'][0]['request_type'] == 'add'
 
+    rv_json = client.get('/api/v1/builds?request_type=fbc-operations').json
+    assert rv_json['meta']['total'] == total_fbc_operations_requests
+    assert rv_json['items'][0]['request_type'] == 'fbc-operations'
+
     rv_json = client.get('/api/v1/builds?request_type=create-empty-index').json
     assert rv_json['meta']['total'] == total_create_requests
     assert rv_json['items'][0]['request_type'] == 'create-empty-index'
@@ -160,14 +179,22 @@ def test_get_builds(app, auth_env, client, db):
     assert rv_json['items'][0]['user'] == 'tbrady@DOMAIN.LOCAL'
 
 
-def test_index_image_filter(app, client, db, minimal_request_add, minimal_request_rm):
+def test_index_image_filter(
+    app, client, db, minimal_request_add, minimal_request_rm, minimal_request_fbc_operations
+):
     minimal_request_add.add_state('in_progress', 'Starting things up!')
     minimal_request_add.index_image = Image.get_or_create('quay.io/namespace/index@sha256:fghijk')
     minimal_request_add.add_state('complete', 'The request is complete')
 
     minimal_request_rm.add_state('in_progress', 'Starting things up!')
     minimal_request_rm.index_image = Image.get_or_create('quay.io/namespace/index@sha256:123456')
     minimal_request_rm.add_state('complete', 'The request is complete')
+
+    minimal_request_fbc_operations.add_state('in_progress', 'Starting things up!')
+    minimal_request_fbc_operations.index_image = Image.get_or_create(
+        'quay.io/namespace/index@sha256:fbcop'
+    )
+    minimal_request_fbc_operations.add_state('complete', 'The request is complete')
     db.session.commit()
 
     rv_json = client.get('/api/v1/builds?index_image=quay.io/namespace/index@sha256:fghijk').json
@@ -176,6 +203,9 @@ def test_index_image_filter(app, client, db, minimal_request_add, minimal_reques
     rv_json = client.get('/api/v1/builds?index_image=quay.io/namespace/index@sha256:123456').json
     assert rv_json['meta']['total'] == 1
 
+    rv_json = client.get('/api/v1/builds?index_image=quay.io/namespace/index@sha256:fbcop').json
+    assert rv_json['meta']['total'] == 1
+
     rv = client.get('/api/v1/builds?index_image=quay.io/namespace/index@sha256:abc')
     assert rv.json == {'error': ('quay.io/namespace/index@sha256:abc is not a valid index image')}