diff --git a/app/api/services/file_upload.py b/app/api/services/file_upload.py index 8c963a7..d522930 100644 --- a/app/api/services/file_upload.py +++ b/app/api/services/file_upload.py @@ -15,6 +15,7 @@ import time from app.api.helpers.response_helper import ResponseHelper from app.api.schemas.user import UserSchema + class FileUploadService(BaseService): UPLOAD_FOLDER = settings.UPLOAD_FOLDER # '/app/uploads' # '/uploads' ALLOWED_EXTENSIONS = {'txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'} @@ -32,7 +33,7 @@ class FileUploadService(BaseService): if not member_data: return jsonify({"message": "User not found"}), 500 - member_id=member_data.id + member_id = member_data.id result_file_list = MembersWebfiles.get_member_webfiles_by_member_id(20) file_list = [] @@ -64,7 +65,6 @@ class FileUploadService(BaseService): logger.error(f"An error occurred getting file list: {str(e)}", exc_info=True) return jsonify({"message": "Internal Server Error"}), 500 - # return file_list @staticmethod @@ -83,7 +83,7 @@ class FileUploadService(BaseService): if not member_data: return jsonify({"message": "User not found"}), 500 - member_id=member_data.id + member_id = member_data.id final_folder = f"W{member_id:010d}" save_path = FileUploadService.UPLOAD_FOLDER + "/WEBSITE" @@ -103,25 +103,25 @@ class FileUploadService(BaseService): logger.info(f'POST CALLED 6 {final_save_path}') file.save(final_save_path) - - # Confirm file was created before stamping + save_result = [] + # Confirm file was created before stamping if os.path.isfile(final_save_path): - print(f"'{final_save_path}' was found in the folder '{final_save_path}'") + logger.info(f"'{final_save_path}' was found in the folder '{final_save_path}'") + + save_file_props = MemberFileData() + save_file_props.member_uid = member_uid + save_file_props.filename = filename + save_file_props.save_filename = save_filename + save_file_props.file_group = "WEBSITE" + save_file_props.member_id = member_id + save_file_props.file_size = 0 + save_file_props.file_type = filename.rsplit('.', 1)[1].lower() + + save_result = MembersWebfiles.create_file_profile(save_file_props) + logger.info(f"After Insert Members File Data {save_result} ") + else: - print(f"'{final_save_path}' was not found as a file in '{final_save_path}'") - - - save_file_props = MemberFileData() - save_file_props.member_uid = member_uid - save_file_props.filename = filename - save_file_props.save_filename = save_filename - save_file_props.file_group="WEBSITE" - save_file_props.member_id = member_id - save_file_props.file_size = 0 - save_file_props.file_type = filename.rsplit('.', 1)[1].lower() - - save_result = MembersWebfiles.create_file_profile(save_file_props) - logger.info(f"After Insert Members File Data {save_result} ") + logger.info(f"'{final_save_path}' was not found as a file in '{final_save_path}'") response_data = { "save_result": save_result, @@ -136,4 +136,4 @@ class FileUploadService(BaseService): def allowed_file(filename): return '.' in filename and \ - filename.rsplit('.', 1)[1].lower() in FileUploadService.ALLOWED_EXTENSIONS \ No newline at end of file + filename.rsplit('.', 1)[1].lower() in FileUploadService.ALLOWED_EXTENSIONS