vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changes to reflect PR comments (not finished)

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-02-24 17:50:54 -05:00
parent 758158391c
commit fb0d3d69c2
8 changed files with 32 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/database.py
View file

@ -303,8 +303,8 @@ class Repository(BaseModel):
class Star(BaseModel): class Star(BaseModel):
user = ForeignKeyField(User, index=True, related_name="stars") user = ForeignKeyField(User, index=True)
repository = ForeignKeyField(Repository, index=True, related_name="stargazers") repository = ForeignKeyField(Repository, index=True)
created = DateTimeField(default=datetime.now) created = DateTimeField(default=datetime.now)
class Meta: class Meta:

11
data/model/legacy.py
View file

@ -2550,17 +2550,12 @@ def unstar_repository(user, repository):
""" Unstars a repository. """ """ Unstars a repository. """
try: try:
star = (Star star = (Star
.select() .delete()
.join(Repository) .where(Star.repository == repository.id, Star.user == user.id)
.switch(Star) .execute())
.join(User)
.where(Repository.id == repository.id, User.id == user.id)
.get())
except Star.DoesNotExist: except Star.DoesNotExist:
raise DataModelException('Star not found.') raise DataModelException('Star not found.')
star.delete_instance()
def get_user_starred_repositories(user, limit=None, page=None): def get_user_starred_repositories(user, limit=None, page=None):
""" Retrieves all of the repositories a user has starred. """ """ Retrieves all of the repositories a user has starred. """

8
endpoints/api/repository.py
View file

@ -110,11 +110,13 @@ class RepositoryList(ApiResource):
def get(self, args): def get(self, args):
"""Fetch the list of repositories under a variety of situations.""" """Fetch the list of repositories under a variety of situations."""
username = None username = None
if get_authenticated_user() and args['private']: if get_authenticated_user():
username = get_authenticated_user().username
starred_repos = model.get_user_starred_repositories(get_authenticated_user()) starred_repos = model.get_user_starred_repositories(get_authenticated_user())
star_lookup = set([repo.id for repo in starred_repos]) star_lookup = set([repo.id for repo in starred_repos])
if args['private']:
username = get_authenticated_user().username
response = {} response = {}
repo_count = None repo_count = None
@ -133,7 +135,7 @@ class RepositoryList(ApiResource):
'description': repo_obj.description, 'description': repo_obj.description,
'is_public': repo_obj.visibility.name == 'public', 'is_public': repo_obj.visibility.name == 'public',
} }
if get_authenticated_user() and args['private']: if get_authenticated_user():
repo['is_starred'] = repo_obj.id in star_lookup repo['is_starred'] = repo_obj.id in star_lookup
return repo return repo

6
endpoints/api/user.py
View file

@ -709,9 +709,9 @@ class StarredRepositoryList(ApiResource):
""" List all starred repositories. """ """ List all starred repositories. """
page = args['page'] page = args['page']
limit = args['limit'] limit = args['limit']
starred_repos = list(model.get_user_starred_repositories(get_authenticated_user(), starred_repos = model.get_user_starred_repositories(get_authenticated_user(),
page=page, page=page,
limit=limit)) limit=limit)
def repo_view(repo_obj): def repo_view(repo_obj):
return { return {
'namespace': repo_obj.namespace_user.username, 'namespace': repo_obj.namespace_user.username,

137
static/js/controllers/repolist.js
View file

@ -1,137 +0,0 @@
function RepoListCtrl($scope, $sanitize, Restangular, UserService, ApiService) {
$scope.namespace = null;
$scope.page = 1;
$scope.publicPageCount = null;
// When loading the UserService, if the user is logged in, create a list of
// relevant namespaces for later collecting relevant repositories.
UserService.load(function() {
var user = UserService.currentUser();
if (!user.anonymous) {
$scope.namespaces = [user];
for (var i = 0; i < user.organizations.length; i++) {
$scope.namespaces.push(user.organizations[i]);
}
//loadStarredRepos();
//loadRepos();
}
});
// If someone signs in on this page, we have to watch the user and re-load
// their repositories after they've signed in to actually have any content
// on the page.
$scope.$watch(function(scope) { return scope.user },
function(user) {
if (!user.anonymous) {
$scope.namespaces = [user];
for (var i = 0; i < user.organizations.length; i++) {
$scope.namespaces.push(user.organizations[i]);
}
loadStarredRepos();
loadRepos();
}
});
$scope.toggleStar = function(repo) {
if (repo.is_starred) {
unstarRepo(repo);
} else {
starRepo(repo);
}
}
var starRepo = function(repo) {
var data = {
'namespace': repo.namespace,
'repository': repo.name
};
ApiService.createStar(data).then(function(result) {
updateReposAfterStar(repo);
}, ApiService.errorDisplay('Could not star repository'));
};
var unstarRepo = function(repo) {
var data = {
'repository': repo.namespace + '/' + repo.name
};
ApiService.deleteStar(null, data).then(function(result) {
updateReposAfterUnstar(repo);
}, ApiService.errorDisplay('Could not unstar repository'));
};
// Finds a repository within the list of namespaces attached to $scope.
var findRepoInList = function(repoNamespace, repoName) {
var namespaceIndex = $scope.namespaces.map(function (n) {
return n.username || n.name;
}).indexOf(repoNamespace);
var namespace = $scope.namespaces[namespaceIndex]
var repoIndex = namespace.repositories.value.map(function (r) {
return r.namespace + '/' + r.name;
}).indexOf(repoNamespace + '/' + repoName);
return repoIndex != -1 ? namespace.repositories.value[repoIndex] : null;
}
// Add a starred repository to the list starred repository list and make
// sure it appears starred elsewhere on the page.
var updateReposAfterStar = function(repository) {
$scope.starred_repositories.value.push(repository);
var repo = findRepoInList(repository.namespace, repository.name);
if (repo != null) {
repo.is_starred = true;
}
}
// Remove a repository from the starred repository list and make sure that
// it doesn't appear starred elsewhere on the page.
var updateReposAfterUnstar = function(repository) {
// Remove from the starred listings
var index = $scope.starred_repositories.value.map(function(r) {
return r.namespace + '/' + r.name;
}).indexOf(repository.namespace + '/' + repository.name);
$scope.starred_repositories.value.splice(index, 1);
// Set repo from the normal listings to unstarred.
var repo = findRepoInList(repository.namespace, repository.name);
if (repo != null) {
repo.is_starred = false;
}
};
var loadStarredRepos = function() {
if (!$scope.user || $scope.user.anonymous) {
return;
}
$scope.starred_repositories = ApiService.listStarredReposAsResource().get(function(resp) {
return resp.repositories.map(function(repo) {
repo.is_starred = true;
return repo;
});
});
};
// Iterate over all of the $scope.namespaces and collect their respective
// repositories.
var loadRepos = function() {
if ($scope.namespaces.length == 0 || $scope.user.anonymous) {
return;
}
for (var i = 0; i < $scope.namespaces.length; i++) {
var namespace = $scope.namespaces[i];
var namespaceName = namespace.username || namespace.name;
var options = {
'public': false,
'sort': true,
'namespace': namespaceName,
};
namespace.repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
return resp.repositories;
});
}
};
}

23
static/js/pages/repo-list.js
View file

@ -30,8 +30,6 @@
for (var i = 0; i < user.organizations.length; i++) { for (var i = 0; i < user.organizations.length; i++) {
$scope.namespaces.push(user.organizations[i]); $scope.namespaces.push(user.organizations[i]);
} }
//loadStarredRepos();
//loadRepos();
} }
}); });
@ -39,16 +37,17 @@
// their repositories after they've signed in to actually have any content // their repositories after they've signed in to actually have any content
// on the page. // on the page.
$scope.$watch(function(scope) { return scope.user }, $scope.$watch(function(scope) { return scope.user },
function(user) { function(user) {
if (!user.anonymous) { if (!user.anonymous) {
$scope.namespaces = [user]; $scope.namespaces = [user];
for (var i = 0; i < user.organizations.length; i++) { for (var i = 0; i < user.organizations.length; i++) {
$scope.namespaces.push(user.organizations[i]); $scope.namespaces.push(user.organizations[i]);
} }
loadStarredRepos(); loadStarredRepos();
loadRepos(); loadRepos();
} }
}); }
);
$scope.toggleStar = function(repo) { $scope.toggleStar = function(repo) {
if (repo.is_starred) { if (repo.is_starred) {

6
test/test_api_security.py
View file

@ -175,13 +175,13 @@ class TestUserStarredRepository(ApiTestCase):
self._run_test('DELETE', 401, None, None) self._run_test('DELETE', 401, None, None)
def test_delete_freshuser(self): def test_delete_freshuser(self):
self._run_test('DELETE', 400, 'freshuser', None) self._run_test('DELETE', 204, 'freshuser', None)
def test_delete_reader(self): def test_delete_reader(self):
self._run_test('DELETE', 400, 'reader', None) self._run_test('DELETE', 204, 'reader', None)
def test_delete_devtable(self): def test_delete_devtable(self):
self._run_test('DELETE', 400, 'devtable', None) self._run_test('DELETE', 204, 'devtable', None)
class TestUserNotification(ApiTestCase): class TestUserNotification(ApiTestCase):

9
test/test_api_usage.py
View file

@ -224,6 +224,7 @@ class TestLoggedInUser(ApiTestCase):
assert json['anonymous'] == False assert json['anonymous'] == False
assert json['username'] == READ_ACCESS_USER assert json['username'] == READ_ACCESS_USER
class TestUserStarredRepositoryList(ApiTestCase): class TestUserStarredRepositoryList(ApiTestCase):
def test_get_stars_guest(self): def test_get_stars_guest(self):
self.getJsonResponse(StarredRepositoryList, expected_code=401) self.getJsonResponse(StarredRepositoryList, expected_code=401)
@ -240,9 +241,6 @@ class TestUserStarredRepositoryList(ApiTestCase):
}, },
expected_code=401) expected_code=401)
def test_unstar_repo_guest(self):
self.deleteResponse(StarredRepository, params=dict(repository='public/publicrepo'), expected_code=401)
def test_star_and_unstar_repo_user(self): def test_star_and_unstar_repo_user(self):
self.login(READ_ACCESS_USER) self.login(READ_ACCESS_USER)
json = self.getJsonResponse(StarredRepositoryList) json = self.getJsonResponse(StarredRepositoryList)
@ -257,8 +255,11 @@ class TestUserStarredRepositoryList(ApiTestCase):
assert json['namespace'] == 'public' assert json['namespace'] == 'public'
assert json['repository'] == 'publicrepo' assert json['repository'] == 'publicrepo'
self.deleteResponse(StarredRepository, params=dict(repository='public/publicrepo'), expected_code=204) self.deleteResponse(StarredRepository, params=dict(repository='public/publicrepo'),
expected_code=204)
json = self.getJsonResponse(StarredRepositoryList)
assert json['repositories'] == []
class TestUserNotification(ApiTestCase): class TestUserNotification(ApiTestCase):