[#224] Fix bug where Cordaid is field partner

When Cordaid is a field partner to a project two partnership objects get
the same internal ID and IATI activity ID. Fix by only allowing support
partners to have internal ID.

akvo/api/resources/partnership.py

@@ -31,6 +31,7 @@
 FIELD_NAME = 'name'
 FIELD_LONG_NAME = 'long_name'
 FIELD_NEW_ORGANISATION_TYPE = 'new_organisation_type'
+FIELD_PARTNER_TYPE = 'partner_type'
 ORG_FIELDS = [FIELD_IATI_ORG_ID, FIELD_NAME, FIELD_LONG_NAME, FIELD_NEW_ORGANISATION_TYPE]
 # InternalOrganisationID
 FIELD_INTERNAL_ORG_ID = 'internal_org_id'
@@ -171,7 +172,10 @@ def hydrate(self, bundle):
         organisation = get_organisation(bundle)
         if organisation:
             bundle.data[FIELD_ORGANISATION] = organisation
-            if organisation.iati_org_id != bundle.data[FIELD_REPORTING_ORG]:
+            if (
+                organisation.iati_org_id != bundle.data[FIELD_REPORTING_ORG] or
+                bundle.data[FIELD_PARTNER_TYPE] != Partnership.SUPPORT_PARTNER
+            ):
                 bundle.data[FIELD_IATI_ACTIVITY_ID] = None
                 bundle.data[FIELD_INTERNAL_ID] = None
         else:

akvo/scripts/cordaid/cordaid_project_upload.py

@@ -18,7 +18,7 @@
 from akvo import settings
 setup_environ(settings)
 
-from akvo.scripts.cordaid import log, API_VERSION, CORDAID_IATI_ACTIVITIES_XML, CORDAID_UPLOAD_CSV_FILE, ACTION_CREATE_PROJECT, ERROR_EXCEPTION, ERROR_UPLOAD_ACTIVITY, ERROR_CREATE_ACTIVITY, ERROR_UPDATE_ACTIVITY, ACTION_UPDATE_PROJECT, CORDAID_ACTIVITIES_CSV_FILE, print_log, init_log
+from akvo.scripts.cordaid import log, API_VERSION, CORDAID_IATI_ACTIVITIES_XML, CORDAID_UPLOAD_CSV_FILE, ACTION_CREATE_PROJECT, ERROR_EXCEPTION, ERROR_UPLOAD_ACTIVITY, ERROR_CREATE_ACTIVITY, ERROR_UPDATE_ACTIVITY, ACTION_UPDATE_PROJECT, CORDAID_ACTIVITIES_CSV_FILE, print_log, init_log, ERROR_MULTIPLE_OBJECTS
 from requester import Requester
 
 
@@ -212,7 +212,7 @@ def upload_activities(argv):
                     log(message, data)
                     print message.format(**data)
                 elif project_count > 1:
-                    data = dict(iati_id=iati_id, extra=internal_id)
+                    data = dict(iati_id=iati_id, event=ERROR_MULTIPLE_OBJECTS, extra=internal_id)
                     log(None, data)
                     print(
                         "**** Error updating iati-activity: {iati_id}. "