From 38b02c761556074baf610cc70a936f756306aca7 Mon Sep 17 00:00:00 2001 From: Yevgeny Kazakov Date: Wed, 9 Oct 2024 10:37:24 +0200 Subject: [PATCH] Fix adding objects to database, fixes #169 --- ngshare/database/test_database.py | 6 ++++++ ngshare/ngshare.py | 2 ++ setup.py | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ngshare/database/test_database.py b/ngshare/database/test_database.py index b7f68a8..1160870 100644 --- a/ngshare/database/test_database.py +++ b/ngshare/database/test_database.py @@ -54,6 +54,10 @@ def init_db(db, storage_path): ua = User('abigail') ul = User('lawrence') ue = User('eric') + db.add(uk) + db.add(ua) + db.add(ul) + db.add(ue) course1 = Course('course1', [uk]) course2 = Course('course2', [ua]) db.add(course1) @@ -132,6 +136,8 @@ def test_legacy(): assignment = Assignment("ps1", course) submission = Submission(student, assignment) db.add(course) + db.add(assignment) + db.add(submission) db.commit() print(submission) diff --git a/ngshare/ngshare.py b/ngshare/ngshare.py index 13b4d3c..b330f83 100644 --- a/ngshare/ngshare.py +++ b/ngshare/ngshare.py @@ -786,6 +786,7 @@ def post(self, course_id, assignment_id): assignment = Assignment(assignment_id, course) files = self.get_argument('files', None) self.json_files_unpack(files, assignment.files) + self.db.add(assignment) self.db.commit() self.json_success() @@ -857,6 +858,7 @@ def post(self, course_id, assignment_id): submission = Submission(self.user, assignment) files = self.get_body_argument('files', None) self.json_files_unpack(files, submission.files) + self.db.add(submission) self.db.commit() self.json_success(timestamp=self.strftime(submission.timestamp)) diff --git a/setup.py b/setup.py index 5170087..2b8b25f 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def get_version(rel_path): ], python_requires='>=3.8', install_requires=[ - 'SQLAlchemy>=1.3.12,<2.0', + 'SQLAlchemy>=1.3.12', 'alembic>=1.3.2', 'tornado>=6.0.3', 'jupyterhub>=1.1.0',