Merge branch 'master' of https://bitbucket.org/yackob03/quay

data/model.py

@@ -1,6 +1,7 @@
 import bcrypt
 import logging
 import dateutil.parser
+import operator
 
 from database import *
 from util.validation import (validate_email, validate_username,
@@ -28,9 +29,27 @@ def create_user(username, password, email):
   try:
     new_user = User.create(username=username, password_hash=pw_hash,
                            email=email)
+    return new_user
   except Exception as ex:
     raise DataModelException(ex.message)
-  return new_user
+
+
+def create_confirm_email_code(user):
+  code = EmailConfirmation.create(user=user, email_confirm=True)
+  return code
+
+
+def confirm_user_email(code):
+  code = EmailConfirmation.get(EmailConfirmation.code == code,
+                               EmailConfirmation.email_confirm == True)
+
+  user = code.user
+  user.verified = True
+  user.save()
+
+  code.delete_instance()
+
+  return user
 
 
 def get_user(username):
@@ -40,8 +59,10 @@ def get_user(username):
     return None
 
 
-def get_matching_users(username_prefix):  
-  return list(User.select().where(User.username ** (username_prefix + '%')).limit(10))
+def get_matching_users(username_prefix):
+  query = User.select().where(User.username ** (username_prefix + '%'))
+  return list(query.limit(10))
+
 
 def verify_user(username, password):
   try:
@@ -75,8 +96,28 @@ def get_token(code):
   return AccessToken.get(AccessToken.code == code)
 
 
-def get_matching_repositories(repo_term):
-  return list(Repository.select().where(Repository.name ** ('%' + repo_term + '%') | Repository.namespace ** ('%' + repo_term + '%') | Repository.description ** ('%' + repo_term + '%')).limit(10))
+def get_visible_repositories(username=None):
+  query = Repository.select().distinct().join(Visibility)
+  or_clauses = [(Visibility.name == 'public')]
+
+  if username:
+    with_perms = query.switch(Repository).join(RepositoryPermission,
+                                               JOIN_LEFT_OUTER)
+    query = with_perms.join(User)
+    or_clauses.append(User.username == username)
+
+  return query.where(reduce(operator.or_, or_clauses))
+
+
+def get_matching_repositories(repo_term, username=None):
+  visible = get_visible_repositories(username)
+  search_clauses = (Repository.name ** ('%' + repo_term + '%') |
+                    Repository.namespace ** ('%' + repo_term + '%') |
+                    Repository.description ** ('%' + repo_term + '%'))
+
+
+  final = visible.where(search_clauses).limit(10)
+  return list(final)
 
 
 def change_password(user, new_password):
@@ -108,20 +149,20 @@ def get_all_repo_users(namespace_name, repository_name):
                          Repository.name == repository_name)
 
 
-def get_repository(namespace, name):
+def get_repository(namespace_name, repository_name):
   try:
-    return Repository.get(Repository.name == name,
-                          Repository.namespace == namespace)
+    return Repository.get(Repository.name == repository_name,
+                          Repository.namespace == namespace_name)
   except Repository.DoesNotExist:
     return None
 
 
-def get_user_repositories(user):
-  select = RepositoryPermission.select(RepositoryPermission, Repository, Role)
-  with_user = select.join(User).where(User.username == user.username)
-  with_role = with_user.switch(RepositoryPermission).join(Role)
-  with_repo = with_role.switch(RepositoryPermission).join(Repository)
-  return with_repo
+def repository_is_public(namespace_name, repository_name):
+  joined = Repository.select().join(Visibility)
+  query = joined.where(Repository.namespace == namespace_name,
+                       Repository.name == repository_name,
+                       Visibility.name == 'public')
+  return len(list(query)) > 0
 
 
 def create_repository(namespace, name, owner):
@@ -151,8 +192,8 @@ def set_image_metadata(image_id, namespace_name, repository_name,
                        created_date_str, comment):
   joined = Image.select().join(Repository)
   image_list = list(joined.where(Repository.name == repository_name,
-                            Repository.namespace == namespace_name,
-                            Image.image_id == image_id))
+                                 Repository.namespace == namespace_name,
+                                 Image.image_id == image_id))
 
   if not image_list:
     raise DataModelException('No image with specified id and repository')
@@ -169,6 +210,7 @@ def get_repository_images(namespace_name, repository_name):
   return joined.where(Repository.name == repository_name,
                       Repository.namespace == namespace_name)
 
+
 def get_tag_images(namespace_name, repository_name, tag_name):
   joined = Image.select().join(RepositoryTag).join(Repository)
   fetched = list(joined.where(Repository.name == repository_name,
@@ -177,6 +219,7 @@ def get_tag_images(namespace_name, repository_name, tag_name):
 
   return fetched
 
+
 def list_repository_tags(namespace_name, repository_name):
   select = RepositoryTag.select(RepositoryTag, Image)
   with_repo = select.join(Repository)
@@ -272,6 +315,7 @@ def set_user_repo_permission(username, namespace_name, repository_name,
                                            role=new_role)
     return new_perm
 
+
 def delete_user_permission(username, namespace_name, repository_name):
   if username == namespace_name:
     raise DataModelException('Namespace owner must always be admin.')