Default KC groups adjustment

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.0
+current_version = 1.6.1
 commit = False
 tag = False
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rasenmaeher_api"
-version = "1.6.0"
+version = "1.6.1"
 description = "python-rasenmaeher-api"
 authors = [
     "Aciid <703382+Aciid@users.noreply.github.com>",

src/rasenmaeher_api/__init__.py

@@ -1,2 +1,2 @@
 """ python-rasenmaeher-api """
-__version__ = "1.6.0"  # NOTE Use `bump2version --config-file patch` to bump versions correctly
+__version__ = "1.6.1"  # NOTE Use `bump2version --config-file patch` to bump versions correctly

src/rasenmaeher_api/kchelpers.py

@@ -210,14 +210,16 @@ async def ensure_product_groups(self) -> Optional[bool]:
             subgroups_by_name: Dict[str, Dict[str, Any]] = {
                 subgroup["name"]: subgroup for subgroup in group["subGroups"]
             }
-            subgrpname = f"{productname}_dflt"
-            if subgrpname not in subgroups_by_name:
-                LOGGER.info("Creating KC group /{}/{}".format(productname, subgrpname))
-                new_id = await self.kcadmin.a_create_group({"name": subgrpname}, parent=group["id"])
-                subgroups_by_name[subgrpname] = await self.kcadmin.a_get_group(new_id)
-                created = True
-            if self._product_initial_grps is None:
-                self._product_initial_grps = {}
-            self._product_initial_grps[productname] = subgroups_by_name[subgrpname]
+            for suffix in ("default", "admins"):
+                subgrpname = f"{productname}_{suffix}"
+                if subgrpname not in subgroups_by_name:
+                    LOGGER.info("Creating KC group /{}/{}".format(productname, subgrpname))
+                    new_id = await self.kcadmin.a_create_group({"name": subgrpname}, parent=group["id"])
+                    subgroups_by_name[subgrpname] = await self.kcadmin.a_get_group(new_id)
+                    created = True
+                if self._product_initial_grps is None:
+                    self._product_initial_grps = {}
+                if suffix == "default":
+                    self._product_initial_grps[productname] = subgroups_by_name[subgrpname]
         LOGGER.debug("Product initial KC groups: {}".format(self._product_initial_grps))
         return created

tests/test_rasenmaeher_api.py

@@ -15,7 +15,7 @@
 
 def test_version() -> None:
     """Make sure version matches expected"""
-    assert __version__ == "1.6.0"
+    assert __version__ == "1.6.1"
 
 
 @pytest.mark.asyncio(loop_scope="session")