From 216c15ed1c9e6dfc337391bad0a89049b4363630 Mon Sep 17 00:00:00 2001
From: mike cullerton <michaelc@cullerton.com>
Date: Wed, 13 Apr 2022 08:15:23 -0400
Subject: [PATCH] FileModel => DocumentModel

---
 crc/scripts/delete_task_data.py   | 12 ++++++------
 crc/scripts/get_zipped_files.py   |  8 ++++----
 crc/scripts/modify_spreadsheet.py | 15 ++++++---------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/crc/scripts/delete_task_data.py b/crc/scripts/delete_task_data.py
index 7c7cbe60..88968717 100644
--- a/crc/scripts/delete_task_data.py
+++ b/crc/scripts/delete_task_data.py
@@ -1,7 +1,7 @@
 from crc import session
 from crc.api.common import ApiError
 from crc.models.data_store import DataStoreModel
-from crc.models.file import FileModel
+from crc.models.file import DocumentModel
 from crc.models.task_event import TaskEventModel
 from crc.scripts.script import Script
 from crc.services.document_service import DocumentService
@@ -38,14 +38,14 @@ class DeleteTaskData(Script):
             TaskEventModel.study_id == study_id).filter(TaskEventModel.task_name == task_spec_name).filter_by(
             action=WorkflowService.TASK_ACTION_COMPLETE).delete()
 
-        files_to_delete = session.query(FileModel). \
-            filter(FileModel.workflow_id == workflow_id). \
-            filter(FileModel.task_spec == task_spec_name).all()
+        files_to_delete = session.query(DocumentModel). \
+            filter(DocumentModel.workflow_id == workflow_id). \
+            filter(DocumentModel.task_spec == task_spec_name).all()
 
         # delete files
         for file in files_to_delete:
             UserFileService().delete_file(file.id)
 
             # delete the data store
-            session.query(DataStoreModel). \
-                filter(DataStoreModel.file_id == file.id).delete()
\ No newline at end of file
+            # session.query(DataStoreModel). \
+            #     filter(DataStoreModel.file_id == file.id).delete()
\ No newline at end of file
diff --git a/crc/scripts/get_zipped_files.py b/crc/scripts/get_zipped_files.py
index 0e0148a5..21f036de 100644
--- a/crc/scripts/get_zipped_files.py
+++ b/crc/scripts/get_zipped_files.py
@@ -1,7 +1,7 @@
 from crc import session
 from crc.api.common import ApiError
 from crc.api.file import to_file_api
-from crc.models.file import FileModel, FileDataModel, FileSchema
+from crc.models.file import DocumentModel, FileSchema
 from crc.scripts.script import Script
 from crc.services.study_service import StudyService
 
@@ -36,7 +36,7 @@ class GetZippedFiles(Script):
                 zip_filename = 'attachments.zip'
 
             file_ids = kwargs['file_ids']
-            files = session.query(FileModel).filter(FileModel.id.in_(file_ids)).all()
+            files = session.query(DocumentModel).filter(DocumentModel.id.in_(file_ids)).all()
             if files:
                 # Create a temporary zipfile with the requested files
                 with tempfile.NamedTemporaryFile() as temp_file:
@@ -44,8 +44,8 @@ class GetZippedFiles(Script):
                         for file in files:
                             zip_key_words = doc_info[file.irb_doc_code]['zip_key_words']
                             file_name = f'{study_id} {zip_key_words} {file.name}'
-                            file_data = session.query(FileDataModel).filter(FileDataModel.file_model_id == file.id).first()
-                            zfw.writestr(file_name, file_data.data)
+                            # file_data = session.query(FileDataModel).filter(FileDataModel.file_model_id == file.id).first()
+                            zfw.writestr(file_name, file.data)
 
                     with open(temp_file.name, mode='rb') as handle:
                         if 'doc_code' in kwargs:
diff --git a/crc/scripts/modify_spreadsheet.py b/crc/scripts/modify_spreadsheet.py
index 6eb8ce6b..99d4161d 100644
--- a/crc/scripts/modify_spreadsheet.py
+++ b/crc/scripts/modify_spreadsheet.py
@@ -1,6 +1,6 @@
 from crc import session
 from crc.api.common import ApiError
-from crc.models.file import FileModel, FileDataModel
+from crc.models.file import DocumentModel
 from crc.scripts.script import Script
 
 from io import BytesIO
@@ -44,19 +44,16 @@ class ModifySpreadsheet(Script):
         parameters = self.get_parameters(args, kwargs)
         if len(parameters) == 3:
 
-            spreadsheet = session.query(FileModel). \
-                filter(FileModel.workflow_id == workflow_id). \
-                filter(FileModel.irb_doc_code == parameters['irb_doc_code']).\
+            spreadsheet = session.query(DocumentModel). \
+                filter(DocumentModel.workflow_id == workflow_id). \
+                filter(DocumentModel.irb_doc_code == parameters['irb_doc_code']).\
                 first()
             if spreadsheet:
-                spreadsheet_data = session.query(FileDataModel).\
-                    filter(FileDataModel.file_model_id==spreadsheet.id).\
-                    first()
-                workbook = load_workbook(BytesIO(spreadsheet_data.data))
+                workbook = load_workbook(BytesIO(spreadsheet.data))
                 sheet = workbook.active
                 sheet[parameters['cell']] = parameters['text']
                 data_string = save_virtual_workbook(workbook)
-                spreadsheet_data.data = data_string
+                spreadsheet.data = data_string
                 session.commit()
             else:
                 raise ApiError(code='missing_spreadsheet',