test: fix test cases and add new one for duplicate model registration

Author: matmoncon

README.md

@@ -24,7 +24,6 @@
 Things to come in the future. Truly exiting stuff! If you have feature requests which you think might improve `pyneo4j-ogm`, feel free to open up a feature request.
 
 - [ ] [MemGraph](https://memgraph.com/) support.
-- [ ] Usage examples for `pyneo4j-ogm` in different environments.
 
 ## 📦 Installation
 
@@ -369,16 +368,16 @@ In the following we are going to take a closer look at the different parts of `p
 
 ### Running the test suite
 
-To run the test suite, you have to install the development dependencies and run the tests using `pytest`. The tests are located in the `tests` directory. Any tests located in the `tests/integration` directory will require you to have a Neo4j instance running on `localhost:7687` with the credentials (`neo4j:password`). This can easily be done using the provided `docker-compose.yml` file.
+To run the test suite, you have to install the development dependencies and run the tests using `pytest`. The tests are located in the `tests` directory. Some tests will require you to have a Neo4j instance running on `localhost:7687` with the credentials (`neo4j:password`). This can easily be done using the provided `docker-compose.yml` file.
 
 ```bash
 poetry run pytest tests --asyncio-mode=auto -W ignore::DeprecationWarning
 ```
 
 > **Note:** The `-W ignore::DeprecationWarning` can be omitted but will result in a lot of deprication warnings by Neo4j itself about the usage of the now deprecated `ID`.
 
-As for running the tests with a different pydantic version, you can just run the following command locally:
+As for running the tests with a different pydantic version, you can just install a different pydantic version with the following command:
 
 ```bash
-poetry add pydantic@1.10
+poetry add pydantic@<version>
 ```

pyneo4j_ogm/core/client.py

@@ -153,22 +153,22 @@ async def register_models(self, models: List[Type[Union[NodeModel, RelationshipM
         logger.info("Registering models %s with client %s", models, self)
 
         for model in models:
-            # for registered_model in self.models:
-            #     registered_model_settings = registered_model.model_settings()
-            #     model_settings = model.model_settings()
-
-            #     if (
-            #         isinstance(registered_model_settings, RelationshipModelSettings)
-            #         and isinstance(model_settings, RelationshipModelSettings)
-            #         and registered_model_settings.type == model_settings.type
-            #     ):
-            #         raise AlreadyRegistered(cast(str, model_settings.type))
-            #     elif (
-            #         isinstance(registered_model_settings, NodeModelSettings)
-            #         and isinstance(model_settings, NodeModelSettings)
-            #         and set(registered_model_settings.labels) == set(model_settings.labels)
-            #     ):
-            #         raise AlreadyRegistered(cast(str, model_settings.labels))
+            for registered_model in self.models:
+                registered_model_settings = registered_model.model_settings()
+                model_settings = model.model_settings()
+
+                if (
+                    isinstance(registered_model_settings, RelationshipModelSettings)
+                    and isinstance(model_settings, RelationshipModelSettings)
+                    and registered_model_settings.type == model_settings.type
+                ):
+                    raise AlreadyRegistered(cast(str, model_settings.type))
+                elif (
+                    isinstance(registered_model_settings, NodeModelSettings)
+                    and isinstance(model_settings, NodeModelSettings)
+                    and set(registered_model_settings.labels) == set(model_settings.labels)
+                ):
+                    raise AlreadyRegistered(cast(str, model_settings.labels))
 
             if issubclass(model, (NodeModel, RelationshipModel)):
                 logger.debug("Found valid mode %s, registering with client", model.__name__)

tests/core/test_client.py

@@ -14,6 +14,7 @@
 from pyneo4j_ogm.core.node import NodeModel
 from pyneo4j_ogm.core.relationship import RelationshipModel
 from pyneo4j_ogm.exceptions import (
+    AlreadyRegistered,
     InvalidEntityType,
     InvalidLabelOrType,
     MissingDatabaseURI,
@@ -40,6 +41,19 @@ class Settings:
         type = "TEST_RELATIONSHIP"
 
 
+async def test_duplicate_model_register(client: Pyneo4jClient):
+    class TestNode(NodeModel):
+        name: str
+
+        class Settings:
+            labels = {"TestNode"}
+
+    await client.register_models([TestNode])
+
+    with pytest.raises(AlreadyRegistered):
+        await client.register_models([TestNode])
+
+
 async def test_batch(client: Pyneo4jClient, session: AsyncSession):
     async with client.batch():
         await client.cypher("CREATE (n:Node) SET n.name = $name", parameters={"name": "TestName"})

tests/core/test_node.py

@@ -972,8 +972,6 @@ async def test_delete_one_invalid_filter(setup_test_data):
 
 
 async def test_delete_one_no_results(client: Pyneo4jClient, session: AsyncSession, setup_test_data):
-    await client.register_models([CoffeeShop])
-
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]
 
@@ -1001,8 +999,6 @@ async def test_delete_many(session: AsyncSession, setup_test_data):
 
 
 async def test_delete_many_no_match(client: Pyneo4jClient, session: AsyncSession, setup_test_data):
-    await client.register_models([CoffeeShop])
-
     count = await CoffeeShop.delete_many({"tags": {"$in": ["oh-no"]}})
     assert count == 0
 
@@ -1022,8 +1018,6 @@ async def test_delete_many_no_match(client: Pyneo4jClient, session: AsyncSession
 
 
 async def test_delete_many_no_results(client: Pyneo4jClient, session: AsyncSession, setup_test_data):
-    await client.register_models([CoffeeShop])
-
     with patch.object(client, "cypher") as mock_cypher:
         mock_cypher.return_value = [[], []]