update with PR suggestion

Author: jameslinnell

scripts/administration/id_generator.py

@@ -13,14 +13,6 @@
 }
 
 
-def save_to_set(id, ids):
-    if id in ids:
-        return False
-
-    ids.add(id)
-    return ids
-
-
 def generator(id_type="product"):
     id_class = ID_CLASS_MAP.get(id_type)
     generator = id_class.create()
@@ -41,13 +33,9 @@ def save_file(ids, id_type="product"):
 
 def bulk_generator(id_count=1, id_type="product"):
     ids = open_file(id_type=id_type)
-    for _ in range(id_count):
-        saved = False
-        while not saved:
-            generated_id = generator()
-            saved = save_to_set(generated_id, ids)
-        ids = saved
-
+    starting_id_count = len(ids)
+    while len(ids) - starting_id_count < id_count:
+        ids.add(generator())
     save_file(ids, id_type)
     return ids
 

src/layers/domain/core/cpm_system_id/tests/test_cpm_system_id_v1.py

@@ -10,7 +10,7 @@
 generated_product_ids = set()
 
 
-@pytest.fixture(scope="module", autouse=True)
+@pytest.fixture(scope="module")
 def _get_generated_ids():
     global generated_product_ids
     if os.path.exists(PRODUCT_IDS_GENERATED_FILE):
@@ -88,7 +88,7 @@ def test_asid_generator_increment_number():
 
 
 @pytest.mark.repeat(50)
-def test_product_id_generator_format_key():
+def test_product_id_generator_format_key(_get_generated_ids):
     generator = ProductId.create()
     assert generator.id is not None
     assert generator.id not in generated_product_ids