bug: Number Resource Pool Skips Increment After Object Creation Fails

Component

API Server / GraphQL

Infrahub version

0.16.0

Current Behavior

When attempting to create a DummyNumber object with a Number Resource Pool, if the creation fails for a reason unrelated to the number pool (such as a validation error or missing required fields), the next number generated from the pool increments by the number of failed attempts instead of only incrementing by 1.

Expected Behavior

The number generated from the Number Resource Pool should only increment by 1 after each successful creation.
If object creation fails, the number from the pool should not be incremented, and the same number should be attempted again until the creation is successful.

Steps to Reproduce

Start an instance of Infrahub
Load this schema

version: "1.0"

nodes:
  - name: Number
    namespace: Dummy
    description: "A dummy model to demonstrate number resource pool."
    label: "Dummy Number"
    icon: mdi:numeric
    attributes:
      - name: name
        kind: Text
        unique: true
      - name: random
        kind: Number
        description: "A number generated from the number pool."

Create a new Number Resource Pool

mutation AddNumberPool {
CoreNumberPoolCreate(
data: {
  name: {value: "dummy-number-pool"},
  node: {value: "DummyNumber"},
  node_attribute: {value: "random"},
  start_range: {value: 1},
  end_range: {value: 100}
}
) {
ok
object {
  hfid
}
}
}

Create a new DummyNumber with this query

mutation DummyNumberCreate {
InfraDummyNumberCreate(
data: {
  name: {value: "tmp"}
  random: {from_pool: {id: "YOUR_POOL_ID"}},
}
) {
ok
object {
  hfid
}
}
}

Re-run the same query a second time to get a fail (due to unicity of the name)
Re-run the query with another name like tmp1 or tmp2
Check the Number used

Additional Information

No response

I'd guess that this is due to how the transaction is setup in the base mutation. Here we use a transaction for the save operation and we might need to move that so that the transaction begins before calling .new()

    @classmethod
    @retry_db_transaction(name="object_create")
    async def mutate_create_object(
        cls,
        data: InputObjectType,
        db: InfrahubDatabase,
        branch: Branch,
        at: str,
    ) -> Node:
        component_registry = get_component_registry()
        node_constraint_runner = await component_registry.get_component(NodeConstraintRunner, db=db, branch=branch)
        node_class = Node
        if cls._meta.schema.kind in registry.node:
            node_class = registry.node[cls._meta.schema.kind]

        try:
            obj = await node_class.init(db=db, schema=cls._meta.schema, branch=branch, at=at)
            await obj.new(db=db, **data)
            fields_to_validate = list(data)
            await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
            if db.is_transaction:
                await obj.save(db=db)
            else:
                async with db.start_transaction() as dbt:
                    await obj.save(db=dbt)

opsmill / infrahub