From 665671461c9b47c8b1affb50f789f821608574c5 Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Fri, 14 Dec 2018 12:39:56 +0800
Subject: [PATCH 1/2] update get event typy

---
 seahub/utils/__init__.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index 0e023fa369..9cb8722347 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -666,13 +666,20 @@ if EVENTS_CONFIG_FILE:
         return events if events else None
 
     def generate_file_audit_event_type(e):
-        return {
+
+        event_type_dict = {
             'file-download-web': ('web', ''),
             'file-download-share-link': ('share-link',''),
             'file-download-api': ('API', e.device),
             'repo-download-sync': ('download-sync', e.device),
             'repo-upload-sync': ('upload-sync', e.device),
-        }[e.etype]
+            'seadrive-download-file': ('seadrive-download', e.device),
+        }
+
+        if not event_type_dict.has_key(e.etype):
+            event_type_dict[e.etype] = (e.etype, '')
+
+        return event_type_dict[e.etype]
 
     def get_file_audit_events_by_path(email, org_id, repo_id, file_path, start, limit):
         """Return file audit events list by file path. (If no file audit, return 'None')

From 8497f075dbbbb7fbbb67bc05cc2e334ff322eb19 Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Mon, 17 Dec 2018 16:29:34 +0800
Subject: [PATCH 2/2] add test for get file audit event type/device

---
 seahub/utils/__init__.py                      |  2 +-
 .../test_generate_file_audit_event_type.py    | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/seahub/utils/test_generate_file_audit_event_type.py

diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index 9cb8722347..6cad04ac1c 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -677,7 +677,7 @@ if EVENTS_CONFIG_FILE:
         }
 
         if not event_type_dict.has_key(e.etype):
-            event_type_dict[e.etype] = (e.etype, '')
+            event_type_dict[e.etype] = (e.etype, e.device if e.device else '')
 
         return event_type_dict[e.etype]
 
diff --git a/tests/seahub/utils/test_generate_file_audit_event_type.py b/tests/seahub/utils/test_generate_file_audit_event_type.py
new file mode 100644
index 0000000000..9227cbebd0
--- /dev/null
+++ b/tests/seahub/utils/test_generate_file_audit_event_type.py
@@ -0,0 +1,36 @@
+from seahub.test_utils import BaseTestCase
+from seahub.utils import generate_file_audit_event_type
+
+class Events():
+
+    def __init__(self, etype, device):
+        self.etype = etype
+        self.device = device
+
+
+class GenerateFileAuditEventTypeTest(BaseTestCase):
+
+    def test_generate_file_audit_event_type(self):
+
+        event_type_device = {
+            'file-download-web': '',
+            'file-download-share-link': '',
+            'file-download-api': 'file-download-api-device',
+            'repo-download-sync': 'repo-download-sync-device',
+            'repo-upload-sync': 'repo-upload-sync-device',
+            'seadrive-download-file': 'seadrive-download-file-device',
+            'unknow-type-has-device': 'has-device',
+            'unknow-type-no-device': '',
+        }
+
+        for key,value in event_type_device.items():
+
+            e = Events(key, value)
+
+            assert generate_file_audit_event_type(e)[1] == value
+
+            if e.etype == 'unknow-type-has-device':
+                assert generate_file_audit_event_type(e)[1] == 'has-device'
+
+            if e.etype == 'unknow-type-no-device':
+                assert generate_file_audit_event_type(e)[1] == ''