retrieve latest annotation from db (#1723)

* add function to retrieve latest annotation from db, db updates

* dont create directory in s3
This commit is contained in:
Madison Dunitz
2020-08-11 15:48:12 -05:00
committed by GitHub
parent 49b89ba7af
commit 80f6137528
5 changed files with 114 additions and 22 deletions
+8 -6
View File
@@ -29,23 +29,26 @@ class TestDatabase:
def _create_test_user(self):
user = CellxGeneUser(id="test_user_id")
user2 = CellxGeneUser(id='1234')
self.db.session.add(user)
self.db.session.add(user2)
self.db.session.commit()
def _create_test_dataset(self):
dataset = CellxGeneDataset(
id="test_dataset_id",
name="test_dataset",
)
self.db.session.add(dataset)
self.db.session.commit()
def _create_test_annotation(self):
dataset = self.db.query([CellxGeneDataset],
[CellxGeneDataset.name == "test_dataset"],
)[0]
annotation = Annotation(
id="test_annotation_id",
tiledb_uri="tiledb_uri",
user_id="test_user_id",
dataset_id="test_dataset_id"
dataset_id=str(dataset.id)
)
self.db.session.add(annotation)
self.db.session.commit()
@@ -65,7 +68,7 @@ class TestDatabase:
def _create_test_datasets(self, dataset_count: int = 10):
datasets = []
for i in range(dataset_count):
datasets.append(CellxGeneDataset(id=self.get_random_string(), name=self.get_random_string()))
datasets.append(CellxGeneDataset(name=self.get_random_string()))
self.db.session.add_all(datasets)
self.db.session.commit()
@@ -78,10 +81,9 @@ class TestDatabase:
dataset = self.order_by_random(CellxGeneDataset)
user = self.order_by_random(CellxGeneUser)
annotations.append(Annotation(
id=self.get_random_string(),
tiledb_uri=self.get_random_string(),
user_id=user.id,
dataset_id=dataset.id
dataset_id=str(dataset.id)
))
self.db.session.add_all(annotations)
self.db.session.commit()