Merge a184062 into 167c645

biocore · Mar 4, 2020 · f28279a · f28279a
2 parents 167c645 + a184062
commit f28279a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/microsetta_private_api/api/tests/test_integration.py b/microsetta_private_api/api/tests/test_integration.py
@@ -518,7 +518,16 @@ def test_add_sample_from_kit(self):
         )
         check_response(response)
 
-        # Check that we can now see this sample
+        # Check that we can now see this sample in the list
+        response = self.client.get(
+            '/api/accounts/%s/sources/%s/samples?language_tag=en-US' %
+            (ACCT_ID, DOGGY_ID)
+        )
+        check_response(response)
+        dog_samples = json.loads(response.data)
+        self.assertIn(sample_id, [x["sample_id"] for x in dog_samples])
+
+        # Check that we can now see this sample individually
         response = self.client.get(
             '/api/accounts/%s/sources/%s/samples/%s?language_tag=en-US' %
             (ACCT_ID, DOGGY_ID, sample_id)

diff --git a/microsetta_private_api/repo/sample_repo.py b/microsetta_private_api/repo/sample_repo.py
@@ -40,7 +40,7 @@ def get_samples_by_source(self, account_id, source_id):
                 "WHERE "
                 "source.account_id = %s AND "
                 "source.id = %s",
-                (source_id, account_id)
+                (account_id, source_id)
             )
 
             samples = []