Merge 0.7.2

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'),
+        ),
+    ]

migrations/0011_useradditionalinfo_is_vendor_self_declared.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-03-15 15:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ifc_validation_models', '0010_change_authoring_tool_unique_constraint'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='useradditionalinfo',
+            name='is_vendor_self_declared',
+            field=models.BooleanField(blank=True, help_text='Whether this user has self-declared an affiliation with an Authoring Tool vendor (optional)', null=True),
+        ),
+    ]

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
@@ -244,6 +245,16 @@ class Meta:
     def __str__(self):
 
         return f'{self.name}'
+    
+    def find_users_by_email_pattern(self, only_new=False):
+
+        if self.email_address_pattern:
+            matching_users = User.objects.filter(email__iregex=self.email_address_pattern)
+            if only_new: 
+                matching_users = matching_users.exclude(useradditionalinfo__company=self)
+            return matching_users if matching_users.exists() else None
+        
+        return None
 
 
 class UserAdditionalInfo(AuditedBaseModel):
@@ -261,7 +272,14 @@ class UserAdditionalInfo(AuditedBaseModel):
         null=True,
         blank=True,
         help_text='Whether this user belongs to an Authoring Tool vendor (optional)'
-    ) 
+    )
+
+    is_vendor_self_declared = models.BooleanField(
+        null=True,
+        blank=True,
+        verbose_name=("is vendor (self declared)"),
+        help_text='Whether this user has self-declared an affiliation with an Authoring Tool vendor (optional)'
+    )
 
     company = models.ForeignKey(
         Company, 
@@ -277,6 +295,19 @@ class Meta:
         verbose_name = "User Additional Info"
         verbose_name_plural = "User Additional Info"
 
+    def find_company_by_email_pattern(self):
+        
+        if self.email:
+
+            companies = Company.objects.filter(email_address_pattern__isnull=False)
+            if companies.exists():
+                for company in companies:
+                    user = User.objects.filter(id=self.id, email__iregex=company.email_address_pattern).first()
+                    if user:
+                        return company
+
+        return None
+
 
 class AuthoringTool(TimestampedBaseModel):
     """
@@ -319,7 +350,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):