remove generate_barcodes

microsetta_private_api/admin/admin_impl.py

@@ -285,41 +285,43 @@ def create_kits(body, token_info):
 def handle_barcodes(body, token_info):
     validate_admin_access(token_info)
 
-    action = body.get('action')
+    kit_ids = body['kit_ids']
 
-    if action == 'create':
-        return generate_barcodes(body, token_info)
-    elif action == 'insert':
-        return insert_barcodes(body, token_info)
-    else:
-        raise ValueError("Invalid action specified")
+    if isinstance(kit_ids, str):
+        kit_ids = [kit_ids]
 
+    for kit_id in kit_ids:
+        response, code = search_kit_id(token_info, kit_id)
+        if code == 404:
+            raise ValueError("Invalid Kit ID")
 
-def generate_barcodes(body, token_info):
-    validate_admin_access(token_info)
+    action = body.get('action')
 
-    if 'generate_barcode_single' in body:
-        if body['generate_barcode_single'] == 'on':
-            number_of_kits = 1
+    if action == 'create':
+        if 'generate_barcode_single' in body:
+            if body['generate_barcode_single'] == 'on':
+                number_of_kits = 1
+                number_of_samples = 1
+        elif 'generate_barcodes' in body:
+            number_of_kits = (body['num_kits'])
+            number_of_samples = (body['num_samples'])
+        else:
+            number_of_kits = len(body['kit_ids'])
             number_of_samples = 1
-    elif 'generate_barcodes' in body:
-        number_of_kits = (body['num_kits'])
-        number_of_samples = (body['num_samples'])
-    else:
-        number_of_kits = len(body['kit_ids'])
-        number_of_samples = 1
 
-    with Transaction() as t:
-        admin_repo = AdminRepo(t)
+        with Transaction() as t:
+            admin_repo = AdminRepo(t)
 
-        kit_names = admin_repo._generate_novel_kit_names(
-            number_of_kits, kit_prefix=None)
+            barcode = admin_repo._generate_novel_barcodes(
+                number_of_kits, number_of_samples, kit_names=kit_ids)
 
-        barcode = admin_repo._generate_novel_barcodes(
-            number_of_kits, number_of_samples, kit_names)
+        return barcode[1]
 
-        t.commit()
-    return barcode[1]
+    elif action == 'insert':
+        return insert_barcodes(body, token_info)
+
+    else:
+        raise ValueError("Invalid action specified")
 
 
 def insert_barcodes(body, token_info):

microsetta_private_api/repo/admin_repo.py

@@ -923,9 +923,6 @@ def _insert_barcodes_to_existing_kit(self,
         # integer project ids come in as strings ...
         project_ids = [int(x) for x in project_ids]
 
-        if len(set(project_ids)) > 1:
-            raise ValueError("All project_ids must be identical")
-
         is_tmi = self._are_any_projects_tmi(project_ids)
 
         with self._transaction.cursor() as cur: