diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/__init__.py b/server/lib/python/cartodb_services/cartodb_services/metrics/__init__.py index b0a4181..edca0ee 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/__init__.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/__init__.py @@ -1,4 +1,4 @@ -from config import GeocoderConfig, IsolinesRoutingConfig, InternalGeocoderConfig, RoutingConfig, ConfigException, ObservatorySnapshotConfig, ObservatoryConfig +from config import GeocoderConfig, IsolinesRoutingConfig, InternalGeocoderConfig, RoutingConfig, ConfigException, ObservatoryConfig from quota import QuotaService from user import UserMetricsService from log import metrics, MetricsDataGatherer, Traceable diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py index f0594bc..3e45694 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py @@ -86,28 +86,6 @@ class DataObservatoryConfig(ServiceConfig): return 'data observatory' -class ObservatorySnapshotConfig(DataObservatoryConfig): - - SOFT_LIMIT_KEY = 'soft_obs_snapshot_limit' - QUOTA_KEY = 'obs_snapshot_quota' - PERIOD_END_DATE = 'period_end_date' - - def __init__(self, redis_connection, db_conn, username, orgname=None): - super(ObservatorySnapshotConfig, self).__init__(redis_connection, db_conn, - username, orgname) - self._period_end_date = date_parse(self._redis_config[self.PERIOD_END_DATE]) - if self.SOFT_LIMIT_KEY in self._redis_config and self._redis_config[self.SOFT_LIMIT_KEY].lower() == 'true': - self._soft_limit = True - else: - self._soft_limit = False - self._monthly_quota = self._get_effective_monthly_quota(self.QUOTA_KEY) - self._connection_str = self._db_config.data_observatory_connection_str - - @property - def service_type(self): - return 'obs_snapshot' - - class ObservatoryConfig(DataObservatoryConfig): SOFT_LIMIT_KEY = 'soft_obs_general_limit' @@ -890,7 +868,6 @@ class ServicesRedisConfig: QUOTA_KEY = 'geocoding_quota' ISOLINES_QUOTA_KEY = 'here_isolines_quota' ROUTING_QUOTA_KEY = 'mapzen_routing_quota' - OBS_SNAPSHOT_QUOTA_KEY = 'obs_snapshot_quota' OBS_GENERAL_QUOTA_KEY = 'obs_general_quota' PERIOD_END_DATE = 'period_end_date' GEOCODER_PROVIDER_KEY = 'geocoder_provider' @@ -934,8 +911,6 @@ class ServicesRedisConfig: user_config[self.ISOLINES_QUOTA_KEY] = org_config[self.ISOLINES_QUOTA_KEY] if self.ROUTING_QUOTA_KEY in org_config: user_config[self.ROUTING_QUOTA_KEY] = org_config[self.ROUTING_QUOTA_KEY] - if self.OBS_SNAPSHOT_QUOTA_KEY in org_config: - user_config[self.OBS_SNAPSHOT_QUOTA_KEY] = org_config[self.OBS_SNAPSHOT_QUOTA_KEY] if self.OBS_GENERAL_QUOTA_KEY in org_config: user_config[self.OBS_GENERAL_QUOTA_KEY] = org_config[self.OBS_GENERAL_QUOTA_KEY] if self.PERIOD_END_DATE in org_config: diff --git a/server/lib/python/cartodb_services/test/metrics/test_config.py b/server/lib/python/cartodb_services/test/metrics/test_config.py index 4a14a8a..bf7d6b5 100644 --- a/server/lib/python/cartodb_services/test/metrics/test_config.py +++ b/server/lib/python/cartodb_services/test/metrics/test_config.py @@ -344,41 +344,7 @@ class TestDataObservatoryUserConfig(TestCase): self.redis_conn = MockRedis() plpy_mock_config() - def test_should_return_config_for_obs_snapshot(self): - yesterday = datetime.today() - timedelta(days=1) - build_redis_user_config(self.redis_conn, 'test_user', 'data_observatory', - quota=100, end_date=yesterday) - do_config = ObservatorySnapshotConfig(self.redis_conn, plpy_mock, - 'test_user') - assert do_config.monthly_quota == 100 - assert do_config.soft_limit is False - assert do_config.period_end_date.date() == yesterday.date() - - def test_should_return_true_if_soft_limit_is_true_in_redis(self): - yesterday = datetime.today() - timedelta(days=1) - build_redis_user_config(self.redis_conn, 'test_user', 'data_observatory', - quota=0, soft_limit=True, end_date=yesterday) - do_config = ObservatorySnapshotConfig(self.redis_conn, plpy_mock, - 'test_user') - assert do_config.soft_limit is True - - def test_should_return_0_if_quota_is_0_in_redis(self): - yesterday = datetime.today() - timedelta(days=1) - build_redis_user_config(self.redis_conn, 'test_user', 'data_observatory', - quota=0, end_date=yesterday) - do_config = ObservatorySnapshotConfig(self.redis_conn, plpy_mock, - 'test_user') - assert do_config.monthly_quota == 0 - - def test_should_return_0_if_quota_is_empty_in_redis(self): - yesterday = datetime.today() - timedelta(days=1) - build_redis_user_config(self.redis_conn, 'test_user', 'data_observatory', - quota='', end_date=yesterday) - do_config = ObservatorySnapshotConfig(self.redis_conn, plpy_mock, - 'test_user') - assert do_config.monthly_quota == 0 - - def test_should_return_config_for_obs_snapshot(self): + def test_should_return_config_for_obs_config(self): yesterday = datetime.today() - timedelta(days=1) build_redis_user_config(self.redis_conn, 'test_user', 'data_observatory', quota=100, end_date=yesterday) diff --git a/server/lib/python/cartodb_services/test/test_helper.py b/server/lib/python/cartodb_services/test/test_helper.py index d8bccea..dcdbbf5 100644 --- a/server/lib/python/cartodb_services/test/test_helper.py +++ b/server/lib/python/cartodb_services/test/test_helper.py @@ -28,9 +28,7 @@ def build_redis_user_config(redis_conn, username, service, quota=100, redis_conn.hset(user_redis_name, 'mapzen_routing_quota', str(quota)) redis_conn.hset(user_redis_name, 'soft_mapzen_routing_limit', str(soft_limit).lower()) elif service is 'data_observatory': - redis_conn.hset(user_redis_name, 'obs_snapshot_quota', str(quota)) redis_conn.hset(user_redis_name, 'obs_general_quota', str(quota)) - redis_conn.hset(user_redis_name, 'soft_obs_snapshot_limit', str(soft_limit).lower()) redis_conn.hset(user_redis_name, 'soft_obs_general_limit', str(soft_limit).lower()) redis_conn.hset(user_redis_name, 'google_maps_client_id', '') @@ -57,7 +55,6 @@ def build_redis_org_config(redis_conn, orgname, service, quota=100, redis_conn.hset(org_redis_name, 'mapzen_routing_quota', str(quota)) elif service is 'data_observatory': if quota is not None: - redis_conn.hset(org_redis_name, 'obs_snapshot_quota', str(quota)) redis_conn.hset(org_redis_name, 'obs_general_quota', str(quota)) redis_conn.hset(org_redis_name, 'google_maps_client_id', '') diff --git a/server/lib/python/cartodb_services/test/test_quota_service.py b/server/lib/python/cartodb_services/test/test_quota_service.py index a3aa4f4..ce1ca21 100644 --- a/server/lib/python/cartodb_services/test/test_quota_service.py +++ b/server/lib/python/cartodb_services/test/test_quota_service.py @@ -181,28 +181,6 @@ class TestQuotaService(TestCase): # 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): - qs = self.__build_obs_snapshot_quota_service('test_user') - qs.increment_success_service_use() - assert qs.check_user_quota() is True - qs.increment_success_service_use(amount=100000) - assert qs.check_user_quota() is True - - def test_should_check_org_obs_snapshot_quota_correctly(self): - qs = self.__build_obs_snapshot_quota_service('test_user', - orgname='testorg') - qs.increment_success_service_use() - assert qs.check_user_quota() is True - qs.increment_success_service_use(amount=100000) - assert qs.check_user_quota() is True - - def test_should_check_user_obs_quota_correctly(self): - qs = self.__build_obs_snapshot_quota_service('test_user') - qs.increment_success_service_use() - assert qs.check_user_quota() is True - qs.increment_success_service_use(amount=100000) - assert qs.check_user_quota() is True - def test_should_check_org_obs_quota_correctly(self): qs = self.__build_obs_quota_service('test_user', orgname='testorg') @@ -249,17 +227,6 @@ class TestQuotaService(TestCase): username, orgname) return QuotaService(isolines_config, redis_connection=self.redis_conn) - def __build_obs_snapshot_quota_service(self, username, quota=100, - provider='obs_snapshot', - orgname=None, - soft_limit=False, - end_date=datetime.today()): - self.__prepare_quota_service(username, 'data_observatory', quota, - None, orgname, soft_limit, end_date) - do_config = ObservatorySnapshotConfig(self.redis_conn, plpy_mock, - username, orgname) - return QuotaService(do_config, redis_connection=self.redis_conn) - def __build_obs_quota_service(self, username, quota=100, provider='obs_general', orgname=None,