Compare commits
6 Commits
python-0.1
...
python-0.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a64557b50e | ||
|
|
d8da0a3782 | ||
|
|
01b96fe276 | ||
|
|
26d025a5d1 | ||
|
|
80e7ed90a8 | ||
|
|
7e90529a00 |
5
NEWS.md
5
NEWS.md
@@ -1,3 +1,8 @@
|
|||||||
|
March 13th, 2017
|
||||||
|
================
|
||||||
|
* Version `0.14.1` of the python library:
|
||||||
|
* Clean up code that reads from non zero padded date keys #206
|
||||||
|
|
||||||
March 8th, 2017
|
March 8th, 2017
|
||||||
===============
|
===============
|
||||||
* Version 0.22.0 of the server and version 0.14.0 of the python library
|
* Version 0.22.0 of the server and version 0.14.0 of the python library
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ from setuptools import setup, find_packages
|
|||||||
setup(
|
setup(
|
||||||
name='cartodb_services',
|
name='cartodb_services',
|
||||||
|
|
||||||
version='0.14.0',
|
version='0.14.1',
|
||||||
|
|
||||||
description='CartoDB Services API Python Library',
|
description='CartoDB Services API Python Library',
|
||||||
|
|
||||||
|
|||||||
@@ -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):
|
||||||
|
|||||||
Reference in New Issue
Block a user