From f5d8d4963b7ff5bf8434dc4cc67ab816f97d72b4 Mon Sep 17 00:00:00 2001 From: Keiron O'Shea Date: Tue, 19 Jan 2021 16:31:48 +0000 Subject: [PATCH] Aliquot --- services/web/app/sample/api/aliquot.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/web/app/sample/api/aliquot.py b/services/web/app/sample/api/aliquot.py index 8968ae70..ff936883 100644 --- a/services/web/app/sample/api/aliquot.py +++ b/services/web/app/sample/api/aliquot.py @@ -70,6 +70,7 @@ def _validate_aliquots(aliquots: list) -> bool: valid = True if len(aliquots) == 0: return False + for aliquot in aliquots: for key in ["container", "volume", "barcode"]: try: @@ -79,7 +80,6 @@ def _validate_aliquots(aliquots: list) -> bool: return valid values = request.get_json() - print('values: ', values) if not values: return no_values_response() @@ -130,15 +130,13 @@ def _validate_aliquots(aliquots: list) -> bool: except ValidationError as err: return validation_error_response(err) + + # TODO: Use existing API endpoint. # T1: new protocol event for parent sample new_event = SampleProtocolEvent(**event_result) - new_event.is_locked = True # ??to indicate events involving new sample creation db.session.add(new_event) db.session.flush() - print('new_event id: ', new_event.id) - print('base_type: ', base_type) - print('type_values: ', type_values) for aliquot in values["aliquots"]: # T2. New sampletotypes for subsamples: store data on sample type and container ali_sampletotype = SampleToType(**type_values) @@ -161,7 +159,7 @@ def _validate_aliquots(aliquots: list) -> bool: except Exception as err: return transaction_error_response(err) - # T3. New subsuamples + # T3. New subsamples ali_sample = Sample(**sample_values) ali_sample.id = None @@ -175,7 +173,6 @@ def _validate_aliquots(aliquots: list) -> bool: db.session.add(ali_sample) db.session.flush() - print('ali_sample.id: ', ali_sample.id) # T4. New subsampletosample ssts = SubSampleToSample(