find work based on tag IDs rather than image IDs

data/model/tag.py

@@ -2,7 +2,7 @@ import logging
 
 from uuid import uuid4
 
-from peewee import IntegrityError, JOIN_LEFT_OUTER
+from peewee import IntegrityError, JOIN_LEFT_OUTER, fn
 from data.model import (image, db_transaction, DataModelException, _basequery,
                         InvalidManifestException, TagAlreadyCreatedException, StaleTagException)
 from data.database import (RepositoryTag, Repository, Image, ImageStorage, Namespace, TagManifest,
@@ -13,13 +13,32 @@ from data.database import (RepositoryTag, Repository, Image, ImageStorage, Names
 logger = logging.getLogger(__name__)
 
 
+def get_max_id_for_sec_scan():
+  """ Gets the maximum id for security scanning """
+  return RepositoryTag.select(fn.Max(RepositoryTag.id)).scalar()
+
+
+def get_min_id_for_sec_scan(version):
+  """ Gets the minimum id for a security scanning """
+  return (RepositoryTag
+          .select(fn.Min(RepositoryTag.id))
+          .join(Image)
+          .where(Image.security_indexed_engine < version)
+          .scalar())
+
+
+def get_tag_pk_field():
+  """ Returns the primary key for Image DB model """
+  return RepositoryTag.id
+
+
 def get_tags_images_eligible_for_scan(clair_version):
   Parent = Image.alias()
   ParentImageStorage = ImageStorage.alias()
 
-  return _tag_alive(Image
+  return _tag_alive(RepositoryTag
                     .select(Image, ImageStorage, Parent, ParentImageStorage, RepositoryTag)
-                    .join(RepositoryTag, on=(RepositoryTag.image == Image.id))
+                    .join(Image, on=(RepositoryTag.image == Image.id))
                     .join(ImageStorage, on=(Image.storage == ImageStorage.id))
                     .switch(Image)
                     .join(Parent, JOIN_LEFT_OUTER, on=(Image.parent == Parent.id))