fix incorrect version value in responce of get_file_info() and rewrite get_file_version() in utile.py.

Author: yosaka

addons/onlyoffice/tests/test_view.py

@@ -90,6 +90,7 @@ def test_check_file_info(self):
         mock_filenode.name = 'filename.docx'
         mock_user_info = {'user_id': 'userid', 'full_name': 'fullname', 'display_name': 'dispname'}
         mock_file_info = {'name': 'filename.docx', 'mtime': '202501010000'}
+        mock_file_version = ''
         mock_access_token = {websettings.COOKIE_NAME: 'cookie'}
 
         with mock.patch.object(BaseFileNode.objects, 'get', return_value=mock_filenode):
@@ -98,6 +99,7 @@ def test_check_file_info(self):
                     with mock.patch.object(onlyoffice_token, 'decrypt', return_value=mock_jsonobj):
                         with mock.patch.object(onlyoffice_token, 'check_token', return_value=mock_check_token):
                             with mock.patch.object(onlyoffice_util, 'get_file_info', return_value=mock_file_info):
-                                with mock.patch.object(onlyoffice_util, 'check_proof_key', return_value=mock_proof_key):
-                                    res = onlyoffice_check_file_info(file_id='ABCDEFG')
+                                with mock.patch.object(onlyoffice_util, 'get_file_version', return_value=mock_file_version):
+                                    with mock.patch.object(onlyoffice_util, 'check_proof_key', return_value=mock_proof_key):
+                                        res = onlyoffice_check_file_info(file_id='ABCDEFG')
         assert res['BaseFileName'] == 'filename.docx'

addons/onlyoffice/util.py

@@ -2,7 +2,7 @@
 import logging
 import requests
 from lxml import etree
-from osf.models import BaseFileNode, OSFUser
+from osf.models import OSFUser
 from osf.utils.permissions import WRITE
 from requests.exceptions import RequestException
 
@@ -58,12 +58,10 @@ def get_file_info(file_node, file_version, cookies):
     return file_info
 
 
-def get_file_version(file_id):
+def get_file_version(file_node):
     file_version = ''
-    base_file_data = BaseFileNode.objects.filter(_id=file_id)
-    if base_file_data.exists():
-        base_file_data = base_file_data.get()
-        file_versions = base_file_data.versions.all()
+    if file_node.provider == 'osfstorage':
+        file_versions = file_node.versions.all()
         if file_versions is not None and file_versions.exists():
             file_version = file_versions.latest('id').identifier
     return file_version

addons/onlyoffice/views.py

@@ -54,7 +54,7 @@ def onlyoffice_check_file_info(**kwargs):
 
     logger.debug('onlyoffice: check_file_info file_id = {}, file_node.name = {}'.format(file_id, file_node.name))
 
-    file_version = onlyoffice_util.get_file_version(file_id)
+    file_version = onlyoffice_util.get_file_version(file_node)
     cookies = {websettings.COOKIE_NAME: cookie}
     file_info = onlyoffice_util.get_file_info(file_node, file_version, cookies)
     if file_info is None:
@@ -150,9 +150,9 @@ def onlyoffice_file_content_view(**kwargs):
         logger.warning('onlyoffice: user: {} BaseFileNode None.'.format(user_info['user_id']))
         return Response(response='onlyoffice file_content_view exception in BaseFileNode.objects.get.', status=500)
 
-    # logger.info('onlyoffice: file_content_view file_id = {}, file_node.name = {}'.format(file_id, file_node.name))
+    logger.debug('onlyoffice: file_content_view file_id = {}, file_node.name = {}'.format(file_id, file_node.name))
 
-    file_version = onlyoffice_util.get_file_version(file_id)
+    file_version = onlyoffice_util.get_file_version(file_node)
     cookies = {websettings.COOKIE_NAME: cookie}
     file_info = onlyoffice_util.get_file_info(file_node, file_version, cookies)
     if file_info is None: