Merge release/0.7.1

Author: Ghesselink

migrations/0008_company_legal_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-22 14:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ifc_validation_models', '0007_alter_useradditionalinfo_table'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='company',
+            name='legal_name',
+            field=models.CharField(blank=True, help_text='Legal name of the Company (optional).', max_length=1024, null=True),
+        ),
+    ]

migrations/0009_company_email_address_pattern.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-22 16:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ifc_validation_models', '0008_company_legal_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='company',
+            name='email_address_pattern',
+            field=models.CharField(blank=True, help_text='Email address pattern(s) of the Company (optional).', max_length=1024, null=True, unique=True),
+        ),
+    ]

models.py

@@ -219,6 +219,22 @@ class Company(TimestampedBaseModel):
         help_text="Name of the Company."
     )
 
+    legal_name = models.CharField(
+        max_length=1024,
+        null=True,
+        blank=True,
+        unique=False,
+        help_text="Legal name of the Company (optional)."
+    )
+
+    email_address_pattern = models.CharField(
+        max_length=1024,
+        null=True,
+        blank=True,
+        unique=True,
+        help_text="Email address pattern(s) of the Company (optional)."
+    )
+
     class Meta:
 
         db_table = "ifc_company"

test_settings.py

@@ -6,7 +6,6 @@
 INSTALLED_APPS = [
     "django.contrib.auth",
     "django.contrib.contenttypes",
-
     "apps.ifc_validation_models"
 ]
 
@@ -16,6 +15,7 @@
     DB_SQLITE: {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": "test_django_db.sqlite3",
+        "MIGRATE": False,
     }
 }
 

tests.py

@@ -5,91 +5,96 @@
 
 from apps.ifc_validation_models.models import ValidationRequest, ValidationTask  # TODO: for now needs to be absolute!
 from apps.ifc_validation_models.models import Company, AuthoringTool, Model
-from apps.ifc_validation_models.decorators import requires_django_user_context
-
+from apps.ifc_validation_models.models import set_user_context
 
 class ValidationModelsTestCase(TestCase):
 
-    @classmethod
-    def setUpTestData(cls):
-
-        """
-        Creates a SYSTEM user in the (in-memory) database.
-        Runs once for the whole test case.
-        """
-
+    def set_user_context():
         user = User.objects.create(id=1, username='SYSTEM', is_active=True)
-        user.save()
+        set_user_context(user)
 
-    @requires_django_user_context
     def test_created_request_has_status_pending(self):
 
+        # arrange
+        ValidationModelsTestCase.set_user_context()
         request = ValidationRequest.objects.create(
             file_name='test.ifc',
             file='test.ifc', 
             size=1024
         )
 
+        # act
         request2 = ValidationRequest.objects.get(id=request.id)
 
+        # assert
         self.assertEqual(request2.status, ValidationRequest.Status.PENDING)
 
-    @requires_django_user_context
     def test_created_request_has_created_fields(self):
 
+        # arrange
+        ValidationModelsTestCase.set_user_context()
         request = ValidationRequest.objects.create(
             file_name='test2.ifc',
             file='test2.ifc', 
             size=1024
         )
 
+        # act
         request2 = ValidationRequest.objects.get(id=request.id)
 
+        # assert
         self.assertEqual(request2.created.date(), datetime.date.today())
         self.assertEqual(request2.created_by.username, 'SYSTEM')
         self.assertEqual(request2.created_by.id, 1)
         self.assertTrue(request2.updated is None)
         self.assertTrue(request2.updated_by is None)
 
-    @requires_django_user_context
     def test_updated_request_has_updated_fields(self):
 
+        # arrange
+        ValidationModelsTestCase.set_user_context()
         request = ValidationRequest.objects.create(
             file_name='test3.ifc',
             file='test3.ifc',
             size=1024
         )
 
+        # act
         request2 = ValidationRequest.objects.get(id=request.id)
         request2.save()  # simulate update
 
+        # assert
         self.assertEqual(request2.created.date(), datetime.date.today())
         self.assertEqual(request2.created_by.username, 'SYSTEM')
         self.assertEqual(request2.created_by.id, 1)
         self.assertEqual(request2.updated.date(), datetime.date.today())
         self.assertEqual(request2.updated_by.username, 'SYSTEM')
         self.assertEqual(request2.updated_by.id, 1)
 
-    @requires_django_user_context
     def test_created_task_has_status_pending(self):
 
+        # arrange
+        ValidationModelsTestCase.set_user_context()
         request = ValidationRequest.objects.create(
             file_name='test4.ifc',
             file='test4.ifc',
             size=1024
         )
 
+        # act
         task = ValidationTask.objects.create(
             request=request
         )
 
         task2 = ValidationTask.objects.get(id=task.id)
 
+        # assert
         self.assertEqual(task2.status, ValidationTask.Status.PENDING)
 
-    @requires_django_user_context
     def test_created_tasks_can_be_navigated(self):
 
+        # arrange
+        ValidationModelsTestCase.set_user_context()
         request = ValidationRequest.objects.create(file_name='test5.ifc', file='test5.ifc', size=1024)
         task1 = ValidationTask.objects.create(request=request)
         task2 = ValidationTask.objects.create(request=request)
@@ -99,26 +104,31 @@ def test_created_tasks_can_be_navigated(self):
         ValidationTask.objects.create(request=request2)
         ValidationTask.objects.create(request=request2)
 
+        # act
         all_tasks = ValidationTask.objects.all()
         tasks = ValidationTask.objects.filter(request__id=request.id)
 
+        # assert
         self.assertEqual(all_tasks.count(), 5)
         self.assertEqual(tasks.count(), 3)
         self.assertEqual(task1.id, tasks[0].id)
         self.assertEqual(task2.id, tasks[1].id)
         self.assertEqual(task3.id, tasks[2].id)
 
-    @requires_django_user_context
     def test_newly_created_tool_and_model_can_be_navigated(self):
 
+        # arrange
+        ValidationModelsTestCase.set_user_context()
         user = User.objects.get(id=1)
         company = Company.objects.create(name='Acme Inc.')
         tool = AuthoringTool.objects.create(name='Tool XYZ', version='1.0-alpha', company=company)
         model = Model.objects.create(file_name='test_123.ifc', size=2048, produced_by=tool, uploaded_by=user)
         model2 = Model.objects.create(file_name='test_xyz.ifc', size=4096, produced_by=tool, uploaded_by=user)
 
+        # act
         all_tools = AuthoringTool.objects.all()
 
+        # assert
         self.assertEqual(all_tools.count(), 1)
         self.assertEqual(all_tools[0].id, tool.id)
         self.assertEqual(tool.company.name, company.name)
@@ -128,9 +138,9 @@ def test_newly_created_tool_and_model_can_be_navigated(self):
         self.assertEqual(user.models.count(), 2)
         self.assertEqual(user.models.all()[1].file_name, model2.file_name)
 
-    @requires_django_user_context
     def test_find_tool_by_full_name_should_succeed(self):
 
+        ValidationModelsTestCase.set_user_context()
         company1 = Company.objects.create(name='Acme Inc.')
         tool1 = AuthoringTool.objects.create(name='Tool ABC', version='1.0', company=company1)
         tool2 = AuthoringTool.objects.create(name='Tool ABC', version='2.0-alpha', company=company1)
@@ -139,13 +149,13 @@ def test_find_tool_by_full_name_should_succeed(self):
         tool3 = AuthoringTool.objects.create(name='App', version=None, company=company2)
         tool4 = AuthoringTool.objects.create(name='App', version='2024', company=company2)
 
-        name_to_find = 'Acme Inc. Tool ABC - 1.0'
+        name_to_find = 'Acme Inc. - Tool ABC - 1.0'
         found_tool = AuthoringTool.find_by_full_name(name_to_find)
         self.assertIsNotNone(found_tool)
         self.assertIsInstance(found_tool, AuthoringTool)
         self.assertEqual(found_tool.name, tool1.name)
 
-        name_to_find = 'Acme Inc. Tool ABC 1.0'
+        name_to_find = 'Acme Inc. - Tool ABC 1.0'
         found_tool = AuthoringTool.find_by_full_name(name_to_find)
         self.assertIsNotNone(found_tool)
         self.assertIsInstance(found_tool, AuthoringTool)
@@ -161,7 +171,7 @@ def test_find_tool_by_full_name_should_succeed(self):
         self.assertIsInstance(found_tool, AuthoringTool)
         self.assertEqual(found_tool.name, tool3.name)
 
-        name_to_find = 'PyCAD Limited App 2024'
+        name_to_find = 'PyCAD Limited - App 2024'
         found_tool = AuthoringTool.find_by_full_name(name_to_find)
         self.assertIsNotNone(found_tool)
         self.assertIsInstance(found_tool, AuthoringTool)
@@ -171,9 +181,9 @@ def test_find_tool_by_full_name_should_succeed(self):
         found_tool = AuthoringTool.find_by_full_name(name_to_find)
         self.assertIsNone(found_tool)
 
-    @requires_django_user_context
     def test_find_tool_by_full_name_should_succeed2(self):
 
+        ValidationModelsTestCase.set_user_context()
         tool1 = AuthoringTool.objects.create(name='Test Application', version='0.10')        
 
         name_to_find = 'Test Application 0.10'
@@ -192,9 +202,9 @@ def test_find_tool_by_full_name_should_succeed2(self):
         self.assertIsInstance(found_tool, AuthoringTool)
         self.assertEqual(found_tool.name, tool2.name)
 
-    @requires_django_user_context
     def test_find_tool_by_full_name_should_succeed3(self):
 
+        ValidationModelsTestCase.set_user_context()
         tool1 = AuthoringTool.objects.create(name='IfcOpenShell-v0.7.0-6c9e130ca', version='v0.7.0-6c9e130ca')        
 
         name_to_find = 'IfcOpenShell-v0.7.0-6c9e130ca v0.7.0-6c9e130ca'
@@ -204,10 +214,15 @@ def test_find_tool_by_full_name_should_succeed3(self):
         self.assertIsInstance(found_tool, AuthoringTool)
         self.assertEqual(found_tool.name, tool1.name)
 
-    @requires_django_user_context
     def test_model_can_navigate_back_to_request(self):
 
-        request = ValidationRequest.objects.create(file_name='test.ifc', file='test.ifc', size=1024)
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        request = ValidationRequest.objects.create(
+            file_name='test.ifc', 
+            file='test.ifc', 
+            size=1024
+        )
 
         model, _ =  Model.objects.get_or_create(
             file_name = request.file_name,
@@ -218,17 +233,27 @@ def test_model_can_navigate_back_to_request(self):
         request.model = model
         request.save()
 
+        # act
         request2 = ValidationRequest.objects.get(id=request.id)
+        
+        # assert
         self.assertIsNotNone(request2.model)
         self.assertEqual(request.id, model.request.id)
         self.assertEqual(request2.id, model.request.id)
 
-    @requires_django_user_context
     def test_task_can_navigate_back_to_model(self):
 
         # arrange
-        request = ValidationRequest.objects.create(file_name='test.ifc', file='test.ifc', size=1024)        
-        task = ValidationTask.objects.create(request=request, type=ValidationTask.Type.PARSE_INFO)
+        ValidationModelsTestCase.set_user_context()
+        request = ValidationRequest.objects.create(
+            file_name='test.ifc', 
+            file='test.ifc', 
+            size=1024
+        )        
+        task = ValidationTask.objects.create(
+            request=request, 
+            type=ValidationTask.Type.PARSE_INFO
+        )
         model, _ =  Model.objects.get_or_create(
             file_name = request.file_name,
             file = request.file,