haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-22 08:47:22 +00:00
Code Issues Releases Wiki Activity

replace seafevents with seafevents_api (#5310)

Browse Source 
* replace seafevents with seafevents_api

* fix test
This commit is contained in:
王健辉 2022-11-21 10:43:44 +08:00 committed by GitHub
parent 4d38b49941
commit 47d5f73b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 115 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
seahub/api2/endpoints/admin/statistics.py
View File

@ -17,7 +17,7 @@ from seaserv import ccnet_api
from seahub.utils import get_file_ops_stats_by_day, \ from seahub.utils import get_file_ops_stats_by_day, \
get_total_storage_stats_by_day, get_user_activity_stats_by_day, \ get_total_storage_stats_by_day, get_user_activity_stats_by_day, \
is_pro_version, EVENTS_ENABLED, get_system_traffic_by_day, \ is_pro_version, EVENTS_ENABLED, get_system_traffic_by_day, \
seafevents_api get_all_users_traffic_by_month, get_all_orgs_traffic_by_month
from seahub.utils.timeutils import datetime_to_isoformat_timestr from seahub.utils.timeutils import datetime_to_isoformat_timestr
from seahub.utils.ms_excel import write_xls from seahub.utils.ms_excel import write_xls
from seahub.utils.file_size import byte_to_mb from seahub.utils.file_size import byte_to_mb
@ -253,7 +253,7 @@ class SystemUserTrafficView(APIView):
# get one more item than per_page, to judge has_next_page # get one more item than per_page, to judge has_next_page
try: try:
traffics = seafevents_api.get_all_users_traffic_by_month(month_obj, traffics = get_all_users_traffic_by_month(month_obj,
start, start,
start + per_page + 1, start + per_page + 1,
order_by) order_by)
@ -330,7 +330,7 @@ class SystemOrgTrafficView(APIView):
# get one more item than per_page, to judge has_next_page # get one more item than per_page, to judge has_next_page
try: try:
traffics = seafevents_api.get_all_orgs_traffic_by_month(month_obj, traffics = get_all_orgs_traffic_by_month(month_obj,
start, start,
start + per_page + 1, start + per_page + 1,
order_by) order_by)
@ -387,7 +387,7 @@ class SystemUserTrafficExcelView(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
res_data = seafevents_api.get_all_users_traffic_by_month(month_obj, -1, -1) res_data = get_all_users_traffic_by_month(month_obj, -1, -1)
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
error_msg = 'Internal Server Error' error_msg = 'Internal Server Error'

4
seahub/base/management/commands/export_user_traffic_report.py
View File

@ -7,7 +7,7 @@ import posixpath
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from seahub.utils import seafevents_api from seahub.utils import get_all_users_traffic_by_month
from seahub.utils.ms_excel import write_xls from seahub.utils.ms_excel import write_xls
from seahub.utils.file_size import byte_to_mb from seahub.utils.file_size import byte_to_mb
@ -39,7 +39,7 @@ class Command(BaseCommand):
return return
month_obj = datetime.datetime.strptime(month, "%Y%m") month_obj = datetime.datetime.strptime(month, "%Y%m")
res_data = seafevents_api.get_all_users_traffic_by_month(month_obj, -1, -1) res_data = get_all_users_traffic_by_month(month_obj, -1, -1)
data_list = [] data_list = []
head = [_("Time"), _("User"), _("Web Download") + ('(MB)'), \ head = [_("Time"), _("User"), _("Web Download") + ('(MB)'), \

10
seahub/handlers.py
View File

@ -9,7 +9,7 @@ logger = logging.getLogger(__name__)
try: try:
import seafevents import seafevents_api
def repo_created_cb(sender, **kwargs): def repo_created_cb(sender, **kwargs):
org_id = kwargs['org_id'] org_id = kwargs['org_id']
@ -43,7 +43,7 @@ try:
from .utils import SeafEventsSession from .utils import SeafEventsSession
session = SeafEventsSession() session = SeafEventsSession()
seafevents.save_user_activity(session, record) seafevents_api.save_user_activity(session, record)
session.close() session.close()
LIBRARY_TEMPLATES = getattr(settings, 'LIBRARY_TEMPLATES', {}) LIBRARY_TEMPLATES = getattr(settings, 'LIBRARY_TEMPLATES', {})
@ -92,7 +92,7 @@ try:
from .utils import SeafEventsSession from .utils import SeafEventsSession
session = SeafEventsSession() session = SeafEventsSession()
seafevents.save_user_activity(session, record) seafevents_api.save_user_activity(session, record)
session.close() session.close()
def clean_up_repo_trash_cb(sender, **kwargs): def clean_up_repo_trash_cb(sender, **kwargs):
@ -129,7 +129,7 @@ try:
from .utils import SeafEventsSession from .utils import SeafEventsSession
session = SeafEventsSession() session = SeafEventsSession()
seafevents.save_user_activity(session, record) seafevents_api.save_user_activity(session, record)
session.close() session.close()
def repo_restored_cb(sender, **kwargs): def repo_restored_cb(sender, **kwargs):
@ -161,7 +161,7 @@ try:
from .utils import SeafEventsSession from .utils import SeafEventsSession
session = SeafEventsSession() session = SeafEventsSession()
seafevents.save_user_activity(session, record) seafevents_api.save_user_activity(session, record)
session.close() session.close()
except ImportError: except ImportError:

4
seahub/notifications/management/commands/send_file_updates.py
View File

@ -20,7 +20,7 @@ from seahub.options.models import (
KEY_FILE_UPDATES_LAST_EMAILED_TIME KEY_FILE_UPDATES_LAST_EMAILED_TIME
) )
from seahub.profile.models import Profile from seahub.profile.models import Profile
from seahub.utils import (get_site_name, seafevents_api, from seahub.utils import (get_site_name, get_user_activities_by_timestamp,
send_html_email, get_site_scheme_and_netloc) send_html_email, get_site_scheme_and_netloc)
from seahub.utils.timeutils import utc_to_local from seahub.utils.timeutils import utc_to_local
@ -228,7 +228,7 @@ class Command(BaseCommand):
# get file updates(from: last_emailed_time, to: now) for repos # get file updates(from: last_emailed_time, to: now) for repos
# user can access # user can access
res = seafevents_api.get_user_activities_by_timestamp( res = get_user_activities_by_timestamp(
username, last_emailed_time, now) username, last_emailed_time, now)
if not res: if not res:
continue continue

6
seahub/organizations/api/admin/statistics.py
View File

@ -16,7 +16,7 @@ from seaserv import ccnet_api
from seahub.utils import get_org_file_ops_stats_by_day, \ from seahub.utils import get_org_file_ops_stats_by_day, \
get_org_total_storage_stats_by_day, get_org_user_activity_stats_by_day, \ get_org_total_storage_stats_by_day, get_org_user_activity_stats_by_day, \
get_org_traffic_by_day, is_pro_version, EVENTS_ENABLED, \ get_org_traffic_by_day, is_pro_version, EVENTS_ENABLED, \
seafevents_api get_all_users_traffic_by_month
from seahub.utils.timeutils import datetime_to_isoformat_timestr from seahub.utils.timeutils import datetime_to_isoformat_timestr
from seahub.utils.ms_excel import write_xls from seahub.utils.ms_excel import write_xls
from seahub.utils.file_size import byte_to_mb from seahub.utils.file_size import byte_to_mb
@ -267,7 +267,7 @@ class OrgUserTrafficView(APIView):
# get one more item than per_page, to judge has_next_page # get one more item than per_page, to judge has_next_page
try: try:
traffics = seafevents_api.get_all_users_traffic_by_month(month_obj, traffics = get_all_users_traffic_by_month(month_obj,
start, start,
start + per_page + 1, start + per_page + 1,
order_by, order_by,
@ -322,7 +322,7 @@ class OrgUserTrafficExcelView(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
try: try:
res_data = seafevents_api.get_all_users_traffic_by_month(month_obj, res_data = get_all_users_traffic_by_month(month_obj,
-1, -1, -1, -1,
org_id=org_id) org_id=org_id)
except Exception as e: except Exception as e:

95
seahub/utils/__init__.py
View File

@ -60,7 +60,6 @@ logger = logging.getLogger(__name__)
if EVENTS_CONFIG_FILE: if EVENTS_CONFIG_FILE:
try: try:
from seafevents import seafevents_api from seafevents import seafevents_api
seafevents_api.init(EVENTS_CONFIG_FILE)
except ImportError: except ImportError:
logging.exception('Failed to import seafevents package.') logging.exception('Failed to import seafevents package.')
seafevents_api = None seafevents_api = None
@ -552,7 +551,7 @@ if EVENTS_CONFIG_FILE:
try: try:
import seafevents import seafevents
EVENTS_ENABLED = True EVENTS_ENABLED = True
SeafEventsSession = seafevents.init_db_session_class(EVENTS_CONFIG_FILE) SeafEventsSession = seafevents_api.init_db_session_class(parsed_events_conf)
except ImportError: except ImportError:
logging.exception('Failed to import seafevents package.') logging.exception('Failed to import seafevents package.')
seafevents = None seafevents = None
@ -626,7 +625,7 @@ if EVENTS_CONFIG_FILE:
events, total_count = [], 0 events, total_count = [], 0
try: try:
events = seafevents.get_user_activities(ev_session, events = seafevents_api.get_user_activities(ev_session,
username, start, count) username, start, count)
finally: finally:
ev_session.close() ev_session.close()
@ -643,11 +642,11 @@ if EVENTS_CONFIG_FILE:
next_start = start next_start = start
while True: while True:
if org_id and org_id > 0: if org_id and org_id > 0:
events = seafevents.get_org_user_events(ev_session, org_id, events = seafevents_api.get_org_user_events(ev_session, org_id,
username, next_start, username, next_start,
limit) limit)
else: else:
events = seafevents.get_user_events(ev_session, username, events = seafevents_api.get_user_events(ev_session, username,
next_start, limit) next_start, limit)
if not events: if not events:
break break
@ -657,7 +656,7 @@ if EVENTS_CONFIG_FILE:
repo = seafile_api.get_repo(ev.repo_id) repo = seafile_api.get_repo(ev.repo_id)
if not repo: if not repo:
# delete the update event for repo which has been deleted # delete the update event for repo which has been deleted
seafevents.delete_event(ev_session, ev.uuid) seafevents_api.delete_event(ev_session, ev.uuid)
continue continue
if repo.encrypted: if repo.encrypted:
repo.password_set = seafile_api.is_password_set( repo.password_set = seafile_api.is_password_set(
@ -700,13 +699,14 @@ if EVENTS_CONFIG_FILE:
""" """
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
res = seafevents.get_user_activity_stats_by_day(session, start, end, offset) res = seafevents_api.get_user_activity_stats_by_day(session, start, end, offset)
return res return res
def get_org_user_activity_stats_by_day(org_id, start, end): def get_org_user_activity_stats_by_day(org_id, start, end):
""" """
""" """
res = seafevents_api.get_org_user_activity_stats_by_day(org_id, start, end) with _get_seafevents_session() as session:
res = seafevents_api.get_org_user_activity_stats_by_day(session, org_id, start, end)
return res return res
def get_org_user_events(org_id, username, start, count): def get_org_user_events(org_id, username, start, count):
@ -716,14 +716,14 @@ if EVENTS_CONFIG_FILE:
"""Return file histories """Return file histories
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
res = seafevents.get_file_history(session, repo_id, path, start, count, history_limit) res = seafevents_api.get_file_history(session, repo_id, path, start, count, history_limit)
return res return res
def get_log_events_by_time(log_type, tstart, tend): def get_log_events_by_time(log_type, tstart, tend):
"""Return log events list by start/end timestamp. (If no logs, return 'None') """Return log events list by start/end timestamp. (If no logs, return 'None')
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
events = seafevents.get_event_log_by_time(session, log_type, tstart, tend) events = seafevents_api.get_event_log_by_time(session, log_type, tstart, tend)
return events if events else None return events if events else None
@ -753,7 +753,7 @@ if EVENTS_CONFIG_FILE:
15th events. 15th events.
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
events = seafevents.get_file_audit_events_by_path(session, events = seafevents_api.get_file_audit_events_by_path(session,
email, org_id, repo_id, file_path, start, limit) email, org_id, repo_id, file_path, start, limit)
return events if events else None return events if events else None
@ -768,7 +768,7 @@ if EVENTS_CONFIG_FILE:
15th events. 15th events.
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
events = seafevents.get_file_audit_events(session, email, org_id, repo_id, start, limit) events = seafevents_api.get_file_audit_events(session, email, org_id, repo_id, start, limit)
return events if events else None return events if events else None
@ -776,36 +776,38 @@ if EVENTS_CONFIG_FILE:
""" return file audit record of sepcifiy time group by day. """ return file audit record of sepcifiy time group by day.
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
res = seafevents.get_file_ops_stats_by_day(session, start, end, offset) res = seafevents_api.get_file_ops_stats_by_day(session, start, end, offset)
return res return res
def get_org_file_ops_stats_by_day(org_id, start, end, offset): def get_org_file_ops_stats_by_day(org_id, start, end, offset):
""" return file audit record of sepcifiy time group by day. """ return file audit record of sepcifiy time group by day.
""" """
res = seafevents_api.get_org_file_ops_stats_by_day(org_id, start, end, offset) with _get_seafevents_session() as session:
res = seafevents_api.get_org_file_ops_stats_by_day(session, org_id, start, end, offset)
return res return res
def get_total_storage_stats_by_day(start, end, offset): def get_total_storage_stats_by_day(start, end, offset):
""" """
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
res = seafevents.get_total_storage_stats_by_day(session, start, end, offset) res = seafevents_api.get_total_storage_stats_by_day(session, start, end, offset)
return res return res
def get_org_total_storage_stats_by_day(org_id, start, end, offset): def get_org_total_storage_stats_by_day(org_id, start, end, offset):
""" """
""" """
res = seafevents_api.get_org_storage_stats_by_day(org_id, start, end, offset) with _get_seafevents_session() as session:
res = seafevents_api.get_org_storage_stats_by_day(session, org_id, start, end, offset)
return res return res
def get_system_traffic_by_day(start, end, offset, op_type='all'): def get_system_traffic_by_day(start, end, offset, op_type='all'):
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
res = seafevents.get_system_traffic_by_day(session, start, end, offset, op_type) res = seafevents_api.get_system_traffic_by_day(session, start, end, offset, op_type)
return res return res
def get_org_traffic_by_day(org_id, start, end, offset, op_type='all'): def get_org_traffic_by_day(org_id, start, end, offset, op_type='all'):
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
res = seafevents.get_org_traffic_by_day(session, org_id, start, end, offset, op_type) res = seafevents_api.get_org_traffic_by_day(session, org_id, start, end, offset, op_type)
return res return res
def get_file_update_events(email, org_id, repo_id, start, limit): def get_file_update_events(email, org_id, repo_id, start, limit):
@ -818,7 +820,7 @@ if EVENTS_CONFIG_FILE:
15th events. 15th events.
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
events = seafevents.get_file_update_events(session, email, org_id, repo_id, start, limit) events = seafevents_api.get_file_update_events(session, email, org_id, repo_id, start, limit)
return events if events else None return events if events else None
def get_perm_audit_events(email, org_id, repo_id, start, limit): def get_perm_audit_events(email, org_id, repo_id, start, limit):
@ -831,37 +833,66 @@ if EVENTS_CONFIG_FILE:
15th events. 15th events.
""" """
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
events = seafevents.get_perm_audit_events(session, email, org_id, repo_id, start, limit) events = seafevents_api.get_perm_audit_events(session, email, org_id, repo_id, start, limit)
return events if events else None return events if events else None
def get_virus_files(repo_id=None, has_handled=None, start=-1, limit=-1): def get_virus_files(repo_id=None, has_handled=None, start=-1, limit=-1):
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
r = seafevents.get_virus_files(session, repo_id, has_handled, start, limit) r = seafevents_api.get_virus_files(session, repo_id, has_handled, start, limit)
return r if r else [] return r if r else []
def delete_virus_file(vid): def delete_virus_file(vid):
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
return True if seafevents.delete_virus_file(session, vid) == 0 else False return True if seafevents_api.delete_virus_file(session, vid) == 0 else False
def operate_virus_file(vid, ignore): def operate_virus_file(vid, ignore):
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
return True if seafevents.operate_virus_file(session, vid, ignore) == 0 else False return True if seafevents_api.operate_virus_file(session, vid, ignore) == 0 else False
def get_virus_file_by_vid(vid): def get_virus_file_by_vid(vid):
with _get_seafevents_session() as session: with _get_seafevents_session() as session:
return seafevents.get_virus_file_by_vid(session, vid) return seafevents_api.get_virus_file_by_vid(session, vid)
def get_file_scan_record(start=-1, limit=-1): def get_file_scan_record(start=-1, limit=-1):
records = seafevents_api.get_content_scan_results(start, limit) with _get_seafevents_session() as session:
records = seafevents_api.get_content_scan_results(session, start, limit)
return records if records else [] return records if records else []
def get_user_activities_by_timestamp(username, start, end): def get_user_activities_by_timestamp(username, start, end):
events = seafevents.get_user_activities_by_timestamp(username, start, end) with _get_seafevents_session() as session:
events = seafevents_api.get_user_activities_by_timestamp(session, username, start, end)
return events if events else [] return events if events else []
def get_all_users_traffic_by_month(month, start=-1, limit=-1, order_by='user', org_id=-1):
with _get_seafevents_session() as session:
res = seafevents_api.get_all_users_traffic_by_month(session, month, start, limit, order_by, org_id)
return res
def get_all_orgs_traffic_by_month(month, start=-1, limit=-1, order_by='user'):
with _get_seafevents_session() as session:
res = seafevents_api.get_all_orgs_traffic_by_month(session, month, start, limit, order_by)
return res
def get_user_traffic_by_month(username, month):
with _get_seafevents_session() as session:
res = seafevents_api.get_user_traffic_by_month(session, username, month)
return res
def get_file_history_suffix():
return seafevents_api.get_file_history_suffix(parsed_events_conf)
else: else:
parsed_events_conf = None
EVENTS_ENABLED = False EVENTS_ENABLED = False
def get_file_history_suffix():
pass
def get_all_users_traffic_by_month():
pass
def get_all_orgs_traffic_by_month():
pass
def get_user_traffic_by_month():
pass
def get_user_events(): def get_user_events():
pass pass
def get_user_activity_stats_by_day(): def get_user_activity_stats_by_day():
@ -1097,8 +1128,8 @@ FILE_AUDIT_ENABLED = False
if EVENTS_CONFIG_FILE: if EVENTS_CONFIG_FILE:
def check_file_audit_enabled(): def check_file_audit_enabled():
enabled = False enabled = False
if hasattr(seafevents, 'is_audit_enabled'): if hasattr(seafevents_api, 'is_audit_enabled'):
enabled = seafevents.is_audit_enabled(parsed_events_conf) enabled = seafevents_api.is_audit_enabled(parsed_events_conf)
if enabled: if enabled:
logging.debug('file audit: enabled') logging.debug('file audit: enabled')
@ -1186,8 +1217,8 @@ HAS_FILE_SEARCH = False
if EVENTS_CONFIG_FILE: if EVENTS_CONFIG_FILE:
def check_search_enabled(): def check_search_enabled():
enabled = False enabled = False
if hasattr(seafevents, 'is_search_enabled'): if hasattr(seafevents_api, 'is_search_enabled'):
enabled = seafevents.is_search_enabled(parsed_events_conf) enabled = seafevents_api.is_search_enabled(parsed_events_conf)
if enabled: if enabled:
logging.debug('search: enabled') logging.debug('search: enabled')
@ -1202,8 +1233,8 @@ ENABLE_REPO_AUTO_DEL = False
if EVENTS_CONFIG_FILE: if EVENTS_CONFIG_FILE:
def check_repo_auto_del_enabled(): def check_repo_auto_del_enabled():
enabled = False enabled = False
if hasattr(seafevents, 'is_repo_auto_del_enabled'): if hasattr(seafevents_api, 'is_repo_auto_del_enabled'):
enabled = seafevents.is_repo_auto_del_enabled(EVENTS_CONFIG_FILE) enabled = seafevents_api.is_repo_auto_del_enabled(parsed_events_conf)
if enabled: if enabled:
logging.debug('search: enabled') logging.debug('search: enabled')
else: else:

4
seahub/views/__init__.py
View File

@ -42,7 +42,7 @@ from seahub.utils import render_permission_error, render_error, \
get_user_repos, EMPTY_SHA1, gen_file_get_url, \ get_user_repos, EMPTY_SHA1, gen_file_get_url, \
new_merge_with_no_conflict, get_max_upload_file_size, \ new_merge_with_no_conflict, get_max_upload_file_size, \
is_pro_version, FILE_AUDIT_ENABLED, is_valid_dirent_name, \ is_pro_version, FILE_AUDIT_ENABLED, is_valid_dirent_name, \
is_windows_operating_system, seafevents_api, IS_EMAIL_CONFIGURED is_windows_operating_system, get_file_history_suffix, IS_EMAIL_CONFIGURED
from seahub.utils.star import get_dir_starred_files from seahub.utils.star import get_dir_starred_files
from seahub.utils.repo import get_library_storages, parse_repo_perm from seahub.utils.repo import get_library_storages, parse_repo_perm
from seahub.utils.file_op import check_file_lock from seahub.utils.file_op import check_file_lock
@ -779,7 +779,7 @@ def file_revisions(request, repo_id):
can_revert_file = False can_revert_file = False
# Whether use new file history API which read file history from db. # Whether use new file history API which read file history from db.
suffix_list = seafevents_api.get_file_history_suffix() suffix_list = get_file_history_suffix()
if suffix_list and isinstance(suffix_list, list): if suffix_list and isinstance(suffix_list, list):
suffix_list = [x.lower() for x in suffix_list] suffix_list = [x.lower() for x in suffix_list]
else: else:

68
tests/seahub/notifications/management/commands/test_send_file_updates.py
View File

@ -62,25 +62,25 @@ class CommandTest(BaseTestCase):
return [Record(**x) for x in l] return [Record(**x) for x in l]
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_dir_evs(self, mock_seafevents_api): def test_dir_evs(self, mock_get_user_activities_by_timestamp):
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._dir_evs() mock_get_user_activities_by_timestamp.return_value = self._dir_evs()
UserOptions.objects.set_file_updates_email_interval( UserOptions.objects.set_file_updates_email_interval(
self.user.email, 30) self.user.email, 30)
self.assertEqual(len(mail.outbox), 0) self.assertEqual(len(mail.outbox), 0)
call_command('send_file_updates') call_command('send_file_updates')
mock_seafevents_api.get_user_activities_by_timestamp.assert_called_once() mock_get_user_activities_by_timestamp.assert_called_once()
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 1)
assert mail.outbox[0].to[0] == self.user.username assert mail.outbox[0].to[0] == self.user.username
for op in ['Created', 'Deleted', 'Moved', 'Restored', 'Renamed', ]: for op in ['Created', 'Deleted', 'Moved', 'Restored', 'Renamed', ]:
assert op in mail.outbox[0].body assert op in mail.outbox[0].body
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_file_evs(self, mock_seafevents_api): def test_file_evs(self, mock_get_user_activities_by_timestamp):
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._file_evs() mock_get_user_activities_by_timestamp.return_value = self._file_evs()
UserOptions.objects.set_file_updates_email_interval( UserOptions.objects.set_file_updates_email_interval(
self.user.email, 30) self.user.email, 30)
@ -88,7 +88,7 @@ class CommandTest(BaseTestCase):
self.assertEqual(len(mail.outbox), 0) self.assertEqual(len(mail.outbox), 0)
call_command('send_file_updates') call_command('send_file_updates')
mock_seafevents_api.get_user_activities_by_timestamp.assert_called_once() mock_get_user_activities_by_timestamp.assert_called_once()
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 1)
assert mail.outbox[0].to[0] == self.user.username assert mail.outbox[0].to[0] == self.user.username
@ -97,9 +97,9 @@ class CommandTest(BaseTestCase):
'Renamed', ]: 'Renamed', ]:
assert op in mail.outbox[0].body assert op in mail.outbox[0].body
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_repo_evs(self, mock_seafevents_api): def test_repo_evs(self, mock_get_user_activities_by_timestamp):
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._repo_evs() mock_get_user_activities_by_timestamp.return_value = self._repo_evs()
UserOptions.objects.set_file_updates_email_interval( UserOptions.objects.set_file_updates_email_interval(
self.user.email, 30) self.user.email, 30)
@ -107,7 +107,7 @@ class CommandTest(BaseTestCase):
self.assertEqual(len(mail.outbox), 0) self.assertEqual(len(mail.outbox), 0)
call_command('send_file_updates') call_command('send_file_updates')
mock_seafevents_api.get_user_activities_by_timestamp.assert_called_once() mock_get_user_activities_by_timestamp.assert_called_once()
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 1)
assert mail.outbox[0].to[0] == self.user.username assert mail.outbox[0].to[0] == self.user.username
@ -115,9 +115,9 @@ class CommandTest(BaseTestCase):
for op in ['Created', 'Deleted', 'Renamed', 'Removed']: for op in ['Created', 'Deleted', 'Renamed', 'Removed']:
assert op in mail.outbox[0].body assert op in mail.outbox[0].body
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_seafevents_api(self, mock_seafevents_api): def test_seafevents_api(self, mock_get_user_activities_by_timestamp):
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._repo_evs() mock_get_user_activities_by_timestamp.return_value = self._repo_evs()
username = self.user.username username = self.user.username
UserOptions.objects.set_file_updates_email_interval(username, 30) UserOptions.objects.set_file_updates_email_interval(username, 30)
@ -130,8 +130,8 @@ class CommandTest(BaseTestCase):
call_command('send_file_updates') call_command('send_file_updates')
after_dt = datetime.datetime.utcnow().replace(microsecond=0) after_dt = datetime.datetime.utcnow().replace(microsecond=0)
mock_seafevents_api.get_user_activities_by_timestamp.assert_called_once() mock_get_user_activities_by_timestamp.assert_called_once()
args = mock_seafevents_api.get_user_activities_by_timestamp.call_args[0] args = mock_get_user_activities_by_timestamp.call_args[0]
assert args[0] == username assert args[0] == username
assert args[1] == today assert args[1] == today
@ -140,37 +140,37 @@ class CommandTest(BaseTestCase):
assert last_emailed_dt <= after_dt assert last_emailed_dt <= after_dt
assert last_emailed_dt == args[2] assert last_emailed_dt == args[2]
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_email_interval(self, mock_seafevents_api): def test_email_interval(self, mock_get_user_activities_by_timestamp):
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._repo_evs() mock_get_user_activities_by_timestamp.return_value = self._repo_evs()
username = self.user.username username = self.user.username
assert UserOptions.objects.get_file_updates_last_emailed_time(username) is None assert UserOptions.objects.get_file_updates_last_emailed_time(username) is None
# assume this command will be finished in 5 seconds # assume this command will be finished in 5 seconds
UserOptions.objects.set_file_updates_email_interval(username, 5) UserOptions.objects.set_file_updates_email_interval(username, 5)
assert mock_seafevents_api.get_user_activities_by_timestamp.called is False assert mock_get_user_activities_by_timestamp.called is False
call_command('send_file_updates') call_command('send_file_updates')
assert mock_seafevents_api.get_user_activities_by_timestamp.called is True assert mock_get_user_activities_by_timestamp.called is True
# still within 5 seconds ... # still within 5 seconds ...
mock_seafevents_api.get_user_activities_by_timestamp.reset_mock() mock_get_user_activities_by_timestamp.reset_mock()
assert mock_seafevents_api.get_user_activities_by_timestamp.called is False assert mock_get_user_activities_by_timestamp.called is False
call_command('send_file_updates') call_command('send_file_updates')
assert mock_seafevents_api.get_user_activities_by_timestamp.called is False assert mock_get_user_activities_by_timestamp.called is False
time.sleep(5) # 5 seconds passed time.sleep(5) # 5 seconds passed
mock_seafevents_api.get_user_activities_by_timestamp.reset_mock() mock_get_user_activities_by_timestamp.reset_mock()
assert mock_seafevents_api.get_user_activities_by_timestamp.called is False assert mock_get_user_activities_by_timestamp.called is False
call_command('send_file_updates') call_command('send_file_updates')
assert mock_seafevents_api.get_user_activities_by_timestamp.called is True assert mock_get_user_activities_by_timestamp.called is True
@override_settings(TIME_ZONE='Asia/Shanghai') @override_settings(TIME_ZONE='Asia/Shanghai')
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_timezone_in_email_body(self, mock_seafevents_api): def test_timezone_in_email_body(self, mock_get_user_activities_by_timestamp):
assert timezone.get_default_timezone_name() == 'Asia/Shanghai' assert timezone.get_default_timezone_name() == 'Asia/Shanghai'
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._repo_evs() mock_get_user_activities_by_timestamp.return_value = self._repo_evs()
UserOptions.objects.set_file_updates_email_interval( UserOptions.objects.set_file_updates_email_interval(
self.user.email, 30) self.user.email, 30)
@ -180,9 +180,9 @@ class CommandTest(BaseTestCase):
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 1)
assert '2018-11-05 14:46:02' in mail.outbox[0].body assert '2018-11-05 14:46:02' in mail.outbox[0].body
@patch('seahub.notifications.management.commands.send_file_updates.seafevents_api') @patch('seahub.notifications.management.commands.send_file_updates.get_user_activities_by_timestamp')
def test_invalid_option_vals(self, mock_seafevents_api): def test_invalid_option_vals(self, mock_get_user_activities_by_timestamp):
mock_seafevents_api.get_user_activities_by_timestamp.return_value = self._repo_evs() mock_get_user_activities_by_timestamp.return_value = self._repo_evs()
UserOptions.objects.set_file_updates_email_interval( UserOptions.objects.set_file_updates_email_interval(
self.user.email, 'a') self.user.email, 'a')