cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deactivated DO credits usage for users that have quota

Browse Source 
See https://github.com/CartoDB/bigmetadata/issues/215
This commit is contained in:
Mario de Frutos
2017-08-24 14:35:20 +02:00
parent 55cd62f6dc
commit c13dba71a4
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/python/cartodb_services/cartodb_services/metrics/quota.py
+4 -1
View File
@@ -134,7 +134,10 @@ class QuotaChecker:
service_type = self._user_service_config.service_type service_type = self._user_service_config.service_type
current_used = self._user_service.used_quota(service_type, today) current_used = self._user_service.used_quota(service_type, today)
if soft_limit or (user_quota > 0 and current_used < user_quota): # Quick workaround so we don't take into account numer of credits
# spent for users that have defined the quota.
# See https://github.com/CartoDB/bigmetadata/issues/215
if soft_limit or (user_quota > 0):
return True return True
else: else:
return False return False
server/lib/python/cartodb_services/setup.py
+1 -1
View File
@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
setup( setup(
name='cartodb_services', name='cartodb_services',
version='0.15.2', version='0.15.3',
description='CartoDB Services API Python Library', description='CartoDB Services API Python Library',
server/lib/python/cartodb_services/test/test_quota_service.py
+7 -4
View File
@@ -126,12 +126,15 @@ class TestQuotaService(TestCase):
qs.increment_isolines_service_use(amount=1500000) qs.increment_isolines_service_use(amount=1500000)
assert qs.check_user_quota() is False assert qs.check_user_quota() is False
# Quick workaround so we don't take into account numer of credits
# spent for users that have defined the quota.
# See https://github.com/CartoDB/bigmetadata/issues/215
def test_should_check_user_obs_snapshot_quota_correctly(self): def test_should_check_user_obs_snapshot_quota_correctly(self):
qs = self.__build_obs_snapshot_quota_service('test_user') qs = self.__build_obs_snapshot_quota_service('test_user')
qs.increment_success_service_use() qs.increment_success_service_use()
assert qs.check_user_quota() is True assert qs.check_user_quota() is True
qs.increment_success_service_use(amount=100000) qs.increment_success_service_use(amount=100000)
assert qs.check_user_quota() is False assert qs.check_user_quota() is True
def test_should_check_org_obs_snapshot_quota_correctly(self): def test_should_check_org_obs_snapshot_quota_correctly(self):
qs = self.__build_obs_snapshot_quota_service('test_user', qs = self.__build_obs_snapshot_quota_service('test_user',
@@ -139,14 +142,14 @@ class TestQuotaService(TestCase):
qs.increment_success_service_use() qs.increment_success_service_use()
assert qs.check_user_quota() is True assert qs.check_user_quota() is True
qs.increment_success_service_use(amount=100000) qs.increment_success_service_use(amount=100000)
assert qs.check_user_quota() is False assert qs.check_user_quota() is True
def test_should_check_user_obs_quota_correctly(self): def test_should_check_user_obs_quota_correctly(self):
qs = self.__build_obs_snapshot_quota_service('test_user') qs = self.__build_obs_snapshot_quota_service('test_user')
qs.increment_success_service_use() qs.increment_success_service_use()
assert qs.check_user_quota() is True assert qs.check_user_quota() is True
qs.increment_success_service_use(amount=100000) qs.increment_success_service_use(amount=100000)
assert qs.check_user_quota() is False assert qs.check_user_quota() is True
def test_should_check_org_obs_quota_correctly(self): def test_should_check_org_obs_quota_correctly(self):
qs = self.__build_obs_quota_service('test_user', qs = self.__build_obs_quota_service('test_user',
@@ -154,7 +157,7 @@ class TestQuotaService(TestCase):
qs.increment_success_service_use() qs.increment_success_service_use()
assert qs.check_user_quota() is True assert qs.check_user_quota() is True
qs.increment_success_service_use(amount=100000) qs.increment_success_service_use(amount=100000)
assert qs.check_user_quota() is False assert qs.check_user_quota() is True
def __prepare_quota_service(self, username, service, quota, provider, def __prepare_quota_service(self, username, service, quota, provider,
orgname, soft_limit, end_date): orgname, soft_limit, end_date):