AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-30 01:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [trackers] items by daterange

Browse source
This commit is contained in:
Terrtia 2021-08-23 15:24:34 +02:00
parent d64633cb2d
commit 31619a1f45
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
2 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
bin/lib/Tracker.py
View file

@ -131,6 +131,10 @@ def get_tracker_metedata(tracker_uuid, user_id=False, description=False, level=F
dict_uuid['uuid'] = tracker_uuid dict_uuid['uuid'] = tracker_uuid
return dict_uuid return dict_uuid
################################################################################
################################################################################
################################################################################
# # TODO: FIXME
def get_tracker_sparkline(tracker_uuid, num_day=6): def get_tracker_sparkline(tracker_uuid, num_day=6):
date_range_sparkline = Date.get_date_range(num_day) date_range_sparkline = Date.get_date_range(num_day)
sparklines_value = [] sparklines_value = []
@ -141,14 +145,38 @@ def get_tracker_sparkline(tracker_uuid, num_day=6):
sparklines_value.append(int(nb_seen_this_day)) sparklines_value.append(int(nb_seen_this_day))
return sparklines_value return sparklines_value
def get_tracker_items_by_daterange(tracker_uuid, date_from, date_to):
all_item_id = set()
if date_from and date_to:
l_date_match = r_serv_tracker.zrange(f'tracker:stat:{tracker_uuid}', 0, -1, withscores=True)
if l_date_match:
dict_date_match = dict(l_date_match)
for date_day in Date.substract_date(date_from, date_to):
if date_day in dict_date_match:
all_item_id |= r_serv_tracker.smembers(f'tracker:item:{tracker_uuid}:{date_day}')
return all_item_id
def add_tracked_item(tracker_uuid, item_id): def add_tracked_item(tracker_uuid, item_id):
item_date = item_basic.get_item_date(item_id) item_date = item_basic.get_item_date(item_id)
# track item # track item
# r_serv_tracker.sadd(f'obj:trackers:item:{item_id}', tracker_uuid)
res = r_serv_tracker.sadd(f'tracker:item:{tracker_uuid}:{item_date}', item_id) res = r_serv_tracker.sadd(f'tracker:item:{tracker_uuid}:{item_date}', item_id)
# track nb item by date # track nb item by date
if res == 1: if res == 1:
r_serv_tracker.zincrby('tracker:stat:{}'.format(tracker_uuid), int(item_date), 1) r_serv_tracker.zincrby('tracker:stat:{}'.format(tracker_uuid), int(item_date), 1)
def remove_tracked_item(item_id):
item_date = item_basic.get_item_date(item_id)
for tracker_uuid in get_item_all_trackers_uuid(item_id):
r_serv_tracker.srem(f'obj:trackers:item:{item_id}', tracker_uuid)
res = r_serv_tracker.srem(f'tracker:item:{tracker_uuid}:{item_date}', item_id)
if res:
r_serv_tracker.zincrby('tracker:stat:{}'.format(tracker_uuid), int(item_date), -1)
def get_item_all_trackers_uuid(obj_id):
#obj_type = 'item'
return r_serv_tracker.smembers(f'obj:trackers:item:{obj_id}')
def get_email_subject(tracker_uuid): def get_email_subject(tracker_uuid):
tracker_description = get_tracker_description(tracker_uuid) tracker_description = get_tracker_description(tracker_uuid)
@ -207,6 +235,18 @@ def api_is_allowed_to_edit_tracker(tracker_uuid, user_id):
##-- ACL --## ##-- ACL --##
#### FIX DB ####
def fix_tracker_stats_per_day(tracker_uuid):
date_from = get_tracker_first_seen(tracker_uuid)
date_to = get_tracker_last_seen(tracker_uuid)
# delete stats
r_serv_tracker.delete(f'tracker:stat:{tracker_uuid}')
# create new stats
for date_day in Date.substract_date(date_from, date_to):
pass
##-- FIX DB --##
#### CREATE TRACKER #### #### CREATE TRACKER ####
def api_validate_tracker_to_add(tracker , tracker_type, nb_words=1): def api_validate_tracker_to_add(tracker , tracker_type, nb_words=1):
if tracker_type=='regex': if tracker_type=='regex':

2
bin/packages/Term.py
View file

@ -410,7 +410,7 @@ def parse_get_tracker_term_item(dict_input, user_id):
if date_from > date_to: if date_from > date_to:
date_from = date_to date_from = date_to
all_item_id = get_tracked_term_list_item(term_uuid, date_from, date_to) all_item_id = Tracker.get_tracker_items_by_daterange(term_uuid, date_from, date_to)
all_item_id = Item.get_item_list_desc(all_item_id) all_item_id = Item.get_item_list_desc(all_item_id)
res_dict = {} res_dict = {}