update tests

microsetta_private_api/admin/tests/test_admin_repo.py

@@ -1392,8 +1392,8 @@ def test_generate_novel_barcodes_admin_success(self):
 
         with Transaction() as t:
             admin_repo = AdminRepo(t)
-            new_barcodes = admin_repo._generate_novel_barcodes_admin(
-                number_of_kits, number_of_samples)
+            new_barcodes = admin_repo._generate_novel_barcodes(
+                number_of_kits, number_of_samples, kit_names=None)
             self.assertEqual(len(new_barcodes),
                              number_of_kits * number_of_samples)
             self.assertTrue(all(barcode.startswith('X')
@@ -1405,8 +1405,8 @@ def test_generate_novel_barcodes_admin_failure(self):
 
         with Transaction() as t:
             admin_repo = AdminRepo(t)
-            new_barcodes = admin_repo._generate_novel_barcodes_admin(
-                number_of_kits, number_of_samples)
+            new_barcodes = admin_repo._generate_novel_barcodes(
+                number_of_kits, number_of_samples, kit_names=None)
             self.assertTrue(new_barcodes == [])
 
     def test_insert_barcodes_admin_success(self):
@@ -1415,8 +1415,8 @@ def test_insert_barcodes_admin_success(self):
 
         with Transaction() as t:
             admin_repo = AdminRepo(t)
-            new_barcode = admin_repo._generate_novel_barcodes_admin(
-                    number_of_kits, number_of_samples)
+            new_barcode = admin_repo._generate_novel_barcodes(
+                    number_of_kits, number_of_samples, kit_names=None)
 
         kit_barcode = [['test', new_barcode[0]]]
         project_ids = '1'

microsetta_private_api/repo/admin_repo.py

@@ -863,24 +863,6 @@ def _generate_novel_barcodes(self, number_of_kits, number_of_samples,
             else:
                 return new_barcodes
 
-    def _generate_novel_barcodes_admin(self,
-                                       number_of_kits,
-                                       number_of_samples):
-        """Generate specified number of random barcodes for admin"""
-
-        total_barcodes = number_of_kits * number_of_samples
-
-        with self._transaction.cursor() as cur:
-            cur.execute(
-                "SELECT max(right(barcode,8)::integer) "
-                "FROM barcodes.barcode "
-                "WHERE barcode LIKE 'X%' OR barcode LIKE '0%'"
-            )
-            start_bc = cur.fetchone()[0] + 1
-            new_barcodes = ['X%0.8d' % (start_bc + i)
-                            for i in range(total_barcodes)]
-        return new_barcodes
-
     def _insert_barcodes_to_existing_kit(self,
                                          kit_name_and_barcode_tuples_list,
                                          project_ids):