Skip to content

Commit

Permalink
$%^&*(! spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
AmandaBirmingham committed Jul 15, 2020
1 parent 4ae412f commit 19ef65b
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions microsetta_private_api/repo/sample_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@

class SampleRepo(BaseRepo):
PARTIAL_SQL = """SELECT
ag_kit_barcodes.ag_kit_barcode_id,
ag.ag_kit_barcodes.sample_date,
ag.ag_kit_barcodes.sample_time,
ag.ag_kit_barcodes.site_sampled,
ag.ag_kit_barcodes.notes,
ag.ag_kit_barcodes.barcode,
latest_scan.scan_timestamp
FROM ag.ag_kit_barcodes
LEFT JOIN (
ag_kit_barcodes.ag_kit_barcode_id,
ag.ag_kit_barcodes.sample_date,
ag.ag_kit_barcodes.sample_time,
ag.ag_kit_barcodes.site_sampled,
ag.ag_kit_barcodes.notes,
ag.ag_kit_barcodes.barcode,
latest_scan.scan_timestamp
FROM ag.ag_kit_barcodes
LEFT JOIN (
SELECT barcode, max(scan_timestamp) AS scan_timestamp
FROM barcodes.barcode_scans
GROUP BY barcode
) latest_scan
ON ag.ag_kit_barcodes.barcode = latest_scan.barcode
LEFT JOIN ag.source
ON ag.ag_kit_barcodes.source_id = ag.source.id"""
) latest_scan
ON ag.ag_kit_barcodes.barcode = latest_scan.barcode
LEFT JOIN ag.source
ON ag.ag_kit_barcodes.source_id = ag.source.id"""

def __init__(self, transaction):
super().__init__(transaction)
Expand Down Expand Up @@ -90,8 +90,8 @@ def _get_sample_by_id(self, sample_id):

sql = "{0}{1}".format(
self.PARTIAL_SQL,
"WHERE "
"ag_kit_barcodes.ag_kit_barcode_id = %s")
" WHERE"
" ag_kit_barcodes.ag_kit_barcode_id = %s")

with self._transaction.cursor() as cur:
cur.execute(sql, (sample_id,))
Expand All @@ -101,10 +101,10 @@ def _get_sample_by_id(self, sample_id):
def get_samples_by_source(self, account_id, source_id):
sql = "{0}{1}".format(
self.PARTIAL_SQL,
"WHERE "
"source.account_id = %s "
"AND source.id = %s "
"ORDER BY ag_kit_barcodes.barcode asc")
" WHERE"
" source.account_id = %s"
" AND source.id = %s"
" ORDER BY ag_kit_barcodes.barcode asc")

with self._transaction.cursor() as cur:
acct_repo = AccountRepo(self._transaction)
Expand All @@ -125,10 +125,10 @@ def get_samples_by_source(self, account_id, source_id):
def get_sample(self, account_id, source_id, sample_id):
sql = "{0}{1}".format(
self.PARTIAL_SQL,
"WHERE "
"source.account_id = %s "
"AND source.id = %s "
"AND ag_kit_barcodes.ag_kit_barcode_id = %s ")
" WHERE"
" source.account_id = %s"
" AND source.id = %s"
" AND ag_kit_barcodes.ag_kit_barcode_id = %s ")

with self._transaction.cursor() as cur:
cur.execute(sql, (account_id, source_id, sample_id))
Expand Down

0 comments on commit 19ef65b

Please sign in to comment.