Merge pull request #33 from buildingSMART/fix/IVS-442_ParseInfo_Fails_With_Unique_Constraint_Error

IVS-442 - Parse info fails with unique constraint error

Author: Ghesselink

migrations/0010_change_authoring_tool_unique_constraint.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.6 on 2025-03-13 18:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ifc_validation_models', '0009_company_email_address_pattern'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='authoringtool',
+            name='unique_name_version',
+        ),
+        migrations.AddConstraint(
+            model_name='authoringtool',
+            constraint=models.UniqueConstraint(fields=('name', 'version', 'company_id'), name='unique_name_version_company_id'),
+        ),
+        migrations.AddConstraint(
+            model_name='authoringtool',
+            constraint=models.UniqueConstraint(condition=models.Q(('company_id__isnull', True)), fields=('name', 'version'), name='unique_name_version_company_id_null'),
+        ),
+    ]

models.py

@@ -2,6 +2,7 @@
 import threading
 
 from django.db import models
+from django.db.models import Q
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import timezone
@@ -319,7 +320,17 @@ class Meta:
         verbose_name_plural = "Authoring Tools"
 
         constraints = [
-            models.UniqueConstraint(fields=['name', 'version'], name='unique_name_version')
+            # Postgres supports NULLS DISTINCT, but not all DB's do (Sqlite does not!) - hence workaround using two constraints
+            # models.UniqueConstraint(fields=['name', 'version', 'company_id'], name='unique_name_version_company', nulls_distinct=False)
+            models.UniqueConstraint(
+                name='unique_name_version_company_id',
+                fields=['name', 'version', 'company_id']
+            ),
+            models.UniqueConstraint(
+                name='unique_name_version_company_id_null',
+                fields=['name', 'version'],
+                condition=Q(company_id__isnull=True)
+            )
         ]
 
     def __str__(self):

tests.py

@@ -224,6 +224,22 @@ def test_find_tool_by_full_name_should_succeed3(self):
         self.assertEqual(found_tool.name, tool1.name)
         self.assertIsNone(found_tool.company)
 
+    def test_find_tool_by_full_name_should_succeed4(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        tool1 = AuthoringTool.objects.create(name='MyFabTool', version='1.0')
+
+        # act
+        name_to_find = 'MyFabTool - 1.0'
+        found_tool = AuthoringTool.find_by_full_name(name_to_find)
+
+        # assert
+        self.assertIsNotNone(found_tool)
+        self.assertIsInstance(found_tool, AuthoringTool)
+        self.assertEqual(found_tool.name, tool1.name)
+        self.assertIsNone(found_tool.company)
+
     def test_find_tool_by_full_name_should_return_none(self):
 
         # arrange
@@ -248,6 +264,18 @@ def test_add_tool_twice_should_fail(self):
         with self.assertRaises(IntegrityError):
             AuthoringTool.objects.create(name='Test Application', version='0.11') # should fail
 
+    def test_add_tool_with_company_twice_should_fail(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()        
+
+        # act/assert
+        company, _ = Company.objects.get_or_create(name='Acme Inc.')
+        AuthoringTool.objects.create(name='Test Application', version='0.10', company=company) # should succeed
+        AuthoringTool.objects.create(name='Test Application', version='0.11', company=company) # should succeed
+        with self.assertRaises(IntegrityError):
+            AuthoringTool.objects.create(name='Test Application', version='0.11', company=company) # should fail
+
     def test_model_can_navigate_back_to_request(self):
 
         # arrange
@@ -305,4 +333,3 @@ def test_task_can_navigate_back_to_model(self):
         # assert
         self.assertIsNotNone(retrieved_task)
         self.assertEqual(model.id, model_id)
-