From f5411ae25dc9d38546fdedfa4fe46ed7e5921c1c Mon Sep 17 00:00:00 2001 From: Daniel Cortes Date: Sun, 14 Jun 2020 20:03:07 -0400 Subject: [PATCH] fix redis.zrange es inclusivo --- fetcher/cache.py | 6 +++--- fetcher/test.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fetcher/cache.py b/fetcher/cache.py index 1fca240..d1efc43 100644 --- a/fetcher/cache.py +++ b/fetcher/cache.py @@ -53,7 +53,7 @@ def get_discs_of_artist(mbid, limit, offset): jobs.load_artist_on_cache.delay(mbid) return None, 0 - release_ids = redis.zrange(key_releases, offset, offset + limit) + release_ids = redis.zrange(key_releases, offset, offset + limit - 1) keys = [f'release_group:{mbid}' for mbid in release_ids] if redis.exists(*keys) != len(keys): _log.debug('Aun no se cargan todas las release_groups del artista %s', mbid) @@ -108,7 +108,7 @@ def get_releases_of_disc(mbid, limit, offset): jobs.load_entities_of_release_group.delay(mbid) return None, 0 - release_ids = redis.zrange(key_releases, offset, offset + limit) + release_ids = redis.zrange(key_releases, offset, offset + limit - 1) keys = [f'release:{mbid}' for mbid in release_ids] if redis.exists(*keys) != len(keys): _log.debug('Aun no se cargan todas las releases del disco %s', mbid) @@ -215,7 +215,7 @@ def get_releases_of_recording(mbid, limit, offset): jobs.load_entities_of_recording.delay(mbid) return None, 0 - release_ids = redis.zrange(releases_key, offset, offset + limit) + release_ids = redis.zrange(releases_key, offset, offset + limit - 1) keys = [f'release:{mbid}' for mbid in release_ids] if redis.exists(*keys) != len(keys): _log.debug('No estan todas las releses') diff --git a/fetcher/test.py b/fetcher/test.py index 6808c99..6006ab0 100644 --- a/fetcher/test.py +++ b/fetcher/test.py @@ -125,7 +125,7 @@ class CacheTest(TestCase): mock_redis.__contains__.assert_called_with('artist:mbid:release_groups') mock_redis.get.assert_called_with('artist:mbid:release_groups:count') mock_redis.zcard.assert_called_with('artist:mbid:release_groups') - mock_redis.zrange.assert_called_with('artist:mbid:release_groups', 0, 10) + mock_redis.zrange.assert_called_with('artist:mbid:release_groups', 0, 9) mock_redis.exists.assert_called_with(*[f'release_group:{i}' for i in range(10)]) mock_jobs.load_artist_on_cache.delay.asert_called_once_with('mbid') @@ -152,7 +152,7 @@ class CacheTest(TestCase): mock_redis.__contains__.assert_called_with('artist:mbid:release_groups') mock_redis.get.assert_called_with('artist:mbid:release_groups:count') mock_redis.zcard.assert_called_with('artist:mbid:release_groups') - mock_redis.zrange.assert_called_with('artist:mbid:release_groups', 0, 10) + mock_redis.zrange.assert_called_with('artist:mbid:release_groups', 0, 9) mock_redis.exists.assert_called_with(*[f'release_group:{i}' for i in range(10)]) mock_jobs.load_artist_on_cache.delay.assert_not_called() @@ -270,7 +270,7 @@ class CacheTest(TestCase): mock_redis.__contains__.assert_called_with('release_group:mbid:releases') mock_redis.get.assert_called_with('release_group:mbid:releases:count') mock_redis.zcard.assert_called_with('release_group:mbid:releases') - mock_redis.zrange.assert_called_with('release_group:mbid:releases', 0, 10) + mock_redis.zrange.assert_called_with('release_group:mbid:releases', 0, 9) mock_redis.exists.assert_called_with(*[f'release:{id}' for id in range(10)]) mock_jobs.load_entities_of_release_group.delay.assert_called_with('mbid') @@ -296,7 +296,7 @@ class CacheTest(TestCase): mock_redis.__contains__.assert_called_with('release_group:mbid:releases') mock_redis.get.assert_called_with('release_group:mbid:releases:count') mock_redis.zcard.assert_called_with('release_group:mbid:releases') - mock_redis.zrange.assert_called_with('release_group:mbid:releases', 0, 10) + mock_redis.zrange.assert_called_with('release_group:mbid:releases', 0, 9) mock_redis.exists.assert_called_with(*[f'release:{id}' for id in range(10)]) mock_jobs.load_entities_of_release_group.delay.assert_not_called()