Remove error notification when user deletes repos
Also prevent duplicate notifications of that type. fixes #493
This commit is contained in:
parent
5f49c4da7c
commit
4d81567a0c
3 changed files with 23 additions and 11 deletions
|
@ -18,15 +18,14 @@ import features
|
|||
import uuid
|
||||
import json
|
||||
|
||||
def lookup_allowed_private_repos(namespace):
|
||||
""" Returns false if the given namespace has used its allotment of private repositories. """
|
||||
# Lookup the namespace and verify it has a subscription.
|
||||
def get_namespace_plan(namespace):
|
||||
""" Returns the plan of the given namespace. """
|
||||
namespace_user = model.user.get_namespace_user(namespace)
|
||||
if namespace_user is None:
|
||||
return False
|
||||
return None
|
||||
|
||||
if not namespace_user.stripe_id:
|
||||
return False
|
||||
return None
|
||||
|
||||
# Ask Stripe for the subscribed plan.
|
||||
# TODO: Can we cache this or make it faster somehow?
|
||||
|
@ -36,14 +35,20 @@ def lookup_allowed_private_repos(namespace):
|
|||
abort(503, message='Cannot contact Stripe')
|
||||
|
||||
if not cus.subscription:
|
||||
return None
|
||||
|
||||
return get_plan(cus.subscription.plan.id)
|
||||
|
||||
|
||||
def lookup_allowed_private_repos(namespace):
|
||||
""" Returns false if the given namespace has used its allotment of private repositories. """
|
||||
current_plan = get_namespace_plan(namespace)
|
||||
if current_plan is None:
|
||||
return False
|
||||
|
||||
# Find the number of private repositories used by the namespace and compare it to the
|
||||
# plan subscribed.
|
||||
private_repos = model.user.get_private_repo_count(namespace)
|
||||
current_plan = get_plan(cus.subscription.plan.id)
|
||||
if current_plan is None:
|
||||
return False
|
||||
|
||||
return private_repos < current_plan['privateRepos']
|
||||
|
||||
|
|
Reference in a new issue