Respect partner when updating organizations

An organization key is only unique in combination with a partner.

LEARNER-583

course_discovery/apps/course_metadata/data_loaders/api.py

@@ -63,7 +63,7 @@ class OrganizationsApiDataLoader(AbstractDataLoader):
                 'logo_image_url': logo,
             })
 
-        Organization.objects.update_or_create(key__iexact=key, defaults=defaults)
+        Organization.objects.update_or_create(key__iexact=key, partner=self.partner, defaults=defaults)
         logger.info('Processed organization "%s"', key)
 
 

course_discovery/apps/course_metadata/data_loaders/tests/test_api.py

@@ -123,6 +123,24 @@ class OrganizationsApiDataLoaderTests(ApiClientTestMixin, DataLoaderTestMixin, T
         # Verify multiple calls to ingest data do NOT result in data integrity errors.
         self.loader.ingest()
 
+    @responses.activate
+    def test_ingest_respects_partner(self):
+        """
+        Existing organizations with the same key but linked to different partners
+        shouldn't cause organization data loading to fail.
+        """
+        api_data = self.mock_api()
+        key = api_data[1]['short_name']
+
+        OrganizationFactory(key=key, partner=self.partner)
+        OrganizationFactory(key=key)
+
+        assert Organization.objects.count() == 2
+
+        self.loader.ingest()
+
+        assert Organization.objects.count() == len(api_data) + 1
+
 
 @ddt.ddt
 class CoursesApiDataLoaderTests(ApiClientTestMixin, DataLoaderTestMixin, TestCase):