Merge pull request #322 from sartography/data-store-refactor-330

Data store refactor #330

crc/api/data_store.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from crc import session
 from crc.api.common import ApiError
 from crc.models.data_store import DataStoreModel, DataStoreSchema
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 
 
 def study_multi_get(study_id):

crc/scripts/file_data_get.py

@@ -1,7 +1,7 @@
 from flask import g
 
 from crc.api.common import ApiError
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 from crc.scripts.script import Script
 
 

crc/scripts/file_data_set.py

@@ -1,7 +1,7 @@
 from flask import g
 
 from crc.api.common import ApiError
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 from crc.scripts.script import Script
 from crc.services.file_service import FileService
 

crc/scripts/study_data_get.py

@@ -1,4 +1,4 @@
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 from crc.scripts.script import Script
 
 

crc/scripts/study_data_set.py

@@ -1,4 +1,4 @@
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 from crc.scripts.script import Script
 
 

crc/scripts/user_data_get.py

@@ -1,6 +1,6 @@
 from flask import g
 
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 from crc.scripts.script import Script
 
 

crc/scripts/user_data_set.py

@@ -1,6 +1,6 @@
 from flask import g
 
-from crc.scripts.data_store_base import DataStoreBase
+from crc.services.data_store_service import DataStoreBase
 from crc.scripts.script import Script
 
 

crc/services/data_store_service.py

@@ -1,6 +1,3 @@
-import importlib
-import os
-import pkgutil
 from crc import session
 from crc.api.common import ApiError
 from crc.models.data_store import DataStoreModel

tests/test_datastore_api.py

@@ -1,15 +1,10 @@
-import json
-from profile import Profile
-
 from tests.base_test import BaseTest
 
-from datetime import datetime, timezone
-from unittest.mock import patch
 from crc.models.data_store import DataStoreModel, DataStoreSchema
 from crc.models.file import FileModel
-from crc import session, app
-
+from crc import session
 
+import json
 
 
 class DataStoreTest(BaseTest):
@@ -186,5 +181,3 @@ class DataStoreTest(BaseTest):
         self.assertEqual(2, len(data_2))
         self.assertEqual(value_1, data_2[0]['value'])
         self.assertEqual(value_2, data_2[1]['value'])
-
-        print('test_datastore_files')