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

Merge pull request #354 from CartoDB/development

Browse Source 
Prepare new release of python library
This commit is contained in:
Rafa de la Torre 2017-03-13 15:07:14 +01:00 committed by GitHub
commit d8da0a3782
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/lib/python/cartodb_services/cartodb_services/metrics/user.py
View File

@ -118,12 +118,9 @@ class UserMetricsService:
for date in self.__generate_date_range(date_from, date_to): for date in self.__generate_date_range(date_from, date_to):
redis_prefix = self.__parse_redis_prefix(key_prefix, entity_name, redis_prefix = self.__parse_redis_prefix(key_prefix, entity_name,
service, metric, date) service, metric, date)
score = self._redis_connection.zscore(redis_prefix, date.day)
aggregated_metric += int(score) if score else 0
zero_padded_day = date.strftime(self.DAY_OF_MONTH_ZERO_PADDED) zero_padded_day = date.strftime(self.DAY_OF_MONTH_ZERO_PADDED)
if str(date.day) != zero_padded_day: score = self._redis_connection.zscore(redis_prefix, zero_padded_day)
score = self._redis_connection.zscore(redis_prefix, zero_padded_day) aggregated_metric += int(score) if score else 0
aggregated_metric += int(score) if score else 0
return aggregated_metric return aggregated_metric

13
server/lib/python/cartodb_services/test/test_user_service.py
View File

@ -90,19 +90,6 @@ class TestUserService(TestCase):
self.redis_conn.zincrby('user:test_user:geocoder_here:success_responses:201506', '01', 400) self.redis_conn.zincrby('user:test_user:geocoder_here:success_responses:201506', '01', 400)
assert us.used_quota(self.NOKIA_GEOCODER, date(2015, 6,1)) == 400 assert us.used_quota(self.NOKIA_GEOCODER, date(2015, 6,1)) == 400
@freeze_time("2015-06-01")
def test_should_account_for_wrongly_stored_non_padded_keys(self):
us = self.__build_user_service('test_user')
self.redis_conn.zincrby('user:test_user:geocoder_here:success_responses:201506', '1', 400)
assert us.used_quota(self.NOKIA_GEOCODER, date(2015, 6,1)) == 400
@freeze_time("2015-06-01")
def test_should_sum_amounts_from_both_key_formats(self):
us = self.__build_user_service('test_user')
self.redis_conn.zincrby('user:test_user:geocoder_here:success_responses:201506', '1', 400)
self.redis_conn.zincrby('user:test_user:geocoder_here:success_responses:201506', '01', 300)
assert us.used_quota(self.NOKIA_GEOCODER, date(2015, 6,1)) == 700
@freeze_time("2015-06-15") @freeze_time("2015-06-15")
def test_should_not_request_redis_twice_when_unneeded(self): def test_should_not_request_redis_twice_when_unneeded(self):
class MockRedisWithCounter(MockRedis): class MockRedisWithCounter(MockRedis):