Merge pull request #35 from buildingSMART/IVS-413_Company_Detection_Via_Email_Pattern

Author: rw-bsi

models.py

@@ -245,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):
@@ -285,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):
     """

tests.py

@@ -4,6 +4,7 @@
 
 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.models import UserAdditionalInfo
 from apps.ifc_validation_models.models import set_user_context
 
 class ValidationModelsTestCase(TestCase):
@@ -267,7 +268,7 @@ def test_add_tool_twice_should_fail(self):
     def test_add_tool_with_company_twice_should_fail(self):
 
         # arrange
-        ValidationModelsTestCase.set_user_context()        
+        ValidationModelsTestCase.set_user_context()
 
         # act/assert
         company, _ = Company.objects.get_or_create(name='Acme Inc.')
@@ -333,3 +334,101 @@ def test_task_can_navigate_back_to_model(self):
         # assert
         self.assertIsNotNone(retrieved_task)
         self.assertEqual(model.id, model_id)
+
+    def test_find_users_by_email_pattern_should_succeed(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        company = Company.objects.create(name='Acme Inc.', email_address_pattern='@acme.com')
+        user1 = User.objects.create(id=2, username='JohnDoe', email='[email protected]', is_active=True)
+        user2 = User.objects.create(id=3, username='JaneDoe', email='[email protected]', is_active=True)
+
+        # act
+        users = company.find_users_by_email_pattern()
+
+        # assert
+        self.assertIsNotNone(users)
+        self.assertEqual(1, len(users))
+        self.assertEqual(user1, users[0])
+
+    def test_find_users_by_email_pattern_should_succeed2(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        company = Company.objects.create(name='Acme Inc.', email_address_pattern='@acme.com')
+        user1 = User.objects.create(id=2, username='JohnDoe', email='[email protected]', is_active=True)
+        uai1 = UserAdditionalInfo.objects.create(user=user1, company=company)
+        user2 = User.objects.create(id=3, username='JaneDoe', email='[email protected]', is_active=True)
+
+        # act
+        users = company.find_users_by_email_pattern(only_new=True)
+
+        # assert
+        self.assertIsNotNone(users)
+        self.assertEqual(1, len(users))
+        self.assertEqual(user2, users[0])
+
+    def test_find_users_by_email_pattern_should_return_none(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        company = Company.objects.create(name='Acme Inc.', email_address_pattern='@acme.com')
+        user1 = User.objects.create(id=2, username='JohnDoe', email='[email protected]', is_active=True)
+        user2 = User.objects.create(id=3, username='JaneDoe', email='[email protected]', is_active=True)
+
+        # act
+        users = company.find_users_by_email_pattern()
+
+        # assert
+        self.assertIsNone(users)
+
+    def test_find_company_by_email_pattern_should_succeed(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        company = Company.objects.create(name='Acme Inc.', email_address_pattern='@acme.com|@looneytunes.com')
+        user1 = User.objects.create(id=2, username='JohnDoe', email='[email protected]', is_active=True)
+        user2 = User.objects.create(id=3, username='JaneDoe', email='[email protected]', is_active=True)
+
+        # act
+        company1 = UserAdditionalInfo.find_company_by_email_pattern(user1)
+        company2 = UserAdditionalInfo.find_company_by_email_pattern(user2)
+
+        # assert
+        self.assertIsNotNone(company1)
+        self.assertIsNotNone(company2)
+        self.assertEqual(company, company1)
+        self.assertEqual(company, company2)
+
+    def test_find_company_by_email_pattern_should_succeed2(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        company = Company.objects.create(name='Acme Inc.', email_address_pattern='@acme.com')
+        user1 = User.objects.create(id=2, username='JohnDoe', email='[email protected]', is_active=True)
+        user2 = User.objects.create(id=3, username='JaneDoe', email='[email protected]', is_active=True)
+
+        # act
+        company1 = UserAdditionalInfo.find_company_by_email_pattern(user1)
+        company2 = UserAdditionalInfo.find_company_by_email_pattern(user2)
+
+        # assert
+        self.assertIsNotNone(company1)
+        self.assertIsNone(company2)
+        self.assertEqual(company, company1)
+
+    def test_find_company_by_email_pattern_should_return_none(self):
+
+        # arrange
+        ValidationModelsTestCase.set_user_context()
+        company = Company.objects.create(name='Acme Inc.', email_address_pattern='@acme.com')
+        user1 = User.objects.create(id=2, username='JohnDoe', email='[email protected]', is_active=True)
+        user2 = User.objects.create(id=3, username='JaneDoe', email='[email protected]', is_active=True)
+
+        # act
+        company1 = UserAdditionalInfo.find_company_by_email_pattern(user1)
+        company2 = UserAdditionalInfo.find_company_by_email_pattern(user2)
+
+        # assert
+        self.assertIsNone(company1)
+        self.assertIsNone(company2)