From 6317b16408d8725c64490e721b67fe096db0b238 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 20 Aug 2021 13:11:04 -0400 Subject: [PATCH] assure that --- communicator/api/admin.py | 4 ++-- communicator/services/ivy_service.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/communicator/api/admin.py b/communicator/api/admin.py index 91624d3..cac28c7 100644 --- a/communicator/api/admin.py +++ b/communicator/api/admin.py @@ -158,9 +158,9 @@ def get_imported_files(page = "0"): func.count(case([(Sample.email_notified == "f" , 1)])).label("failed_emails"), func.count(case([(Sample.text_notified == "t" , 1)])).label("successful_texts"), func.count(case([(Sample.text_notified == "f" , 1)])).label("failed_texts")] - + query = db.session.query(IvyFile.date_added,IvyFile.file_name,IvyFile.sample_count, - *cases).order_by(IvyFile.date_added.desc()).join(Sample, Sample.ivy_file.like("%" + IvyFile.file_name))\ + *cases).order_by(IvyFile.date_added.desc()).join(Sample, Sample.ivy_file == IvyFile.file_name)\ .group_by(IvyFile.file_name)[int(page) * 10:(int(page) * 10) + 10] return query diff --git a/communicator/services/ivy_service.py b/communicator/services/ivy_service.py index c8d3bc5..e340fd3 100644 --- a/communicator/services/ivy_service.py +++ b/communicator/services/ivy_service.py @@ -42,7 +42,7 @@ class IvyService(object): samples = [] files = [] for file_name in onlyfiles: - file_samples = IvyService.samples_from_ivy_file(join(self.path, file_name)) + file_samples = IvyService.samples_from_ivy_file(self.path, file_name) ivy_file = db.session.query(IvyFile).filter(IvyFile.file_name == file_name).first() if not ivy_file: ivy_file = IvyFile(file_name=file_name, sample_count=len(file_samples)) @@ -56,9 +56,9 @@ class IvyService(object): return files, samples @staticmethod - def samples_from_ivy_file(file_name): + def samples_from_ivy_file(path, file_name): rows = [] - with open(file_name, 'r') as csv_file: + with open(join(path, file_name), 'r') as csv_file: reader = csv.DictReader(csv_file, delimiter='|') for row in reader: sample = IvyService.record_to_sample(row, file_name)