Break circular dependencies introduced by importing common in verbs

endpoints/api/repository.py

@@ -18,7 +18,7 @@ from endpoints.api import (truthy_bool, format_date, nickname, log_action, valid
                            request_error, require_scope, Unauthorized, NotFound, InvalidRequest,
                            path_param, ExceedsLicenseException)
 from endpoints.api.billing import lookup_allowed_private_repos, get_namespace_plan
-from endpoints.common import check_repository_usage
+from endpoints.api.subscribe import check_repository_usage
 
 from auth.permissions import (ModifyRepositoryPermission, AdministerRepositoryPermission,
                               CreateRepositoryPermission)

endpoints/api/subscribe.py

@@ -5,7 +5,6 @@ import stripe
 
 from app import billing
 from endpoints.api import request_error, log_action, NotFound
-from endpoints.common import check_repository_usage
 from data import model
 from data.billing import PLANS
 
@@ -15,6 +14,20 @@ import features
 logger = logging.getLogger(__name__)
 
 
+def check_repository_usage(user_or_org, plan_found):
+  private_repos = model.user.get_private_repo_count(user_or_org.username)
+  if plan_found is None:
+    repos_allowed = 0
+  else:
+    repos_allowed = plan_found['privateRepos']
+
+  if private_repos > repos_allowed:
+    model.notification.create_unique_notification('over_private_usage', user_or_org,
+                                           {'namespace': user_or_org.username})
+  else:
+    model.notification.delete_notifications_by_kind(user_or_org, 'over_private_usage')
+
+
 def carderror_response(exc):
   return {'carderror': exc.message}, 402