[#1633] Added partner_type_2 to DRF and Tastypie

akvo/api/resources/partnership.py

@@ -197,6 +197,7 @@ def hydrate_organisation(self, bundle):
 class PartnershipResource(ConditionalFullResource):
     organisation = ConditionalFullToOneField('akvo.api.resources.OrganisationResource', 'organisation')
     project = ConditionalFullToOneField('akvo.api.resources.ProjectResource', 'project')
+    partner_type_2 = fields.CharField(attribute='iati_role_to_partner_type')
 
     def __init__(self, api_name=None):
         """ override to be able to create custom help_text on the partner_type field

akvo/rest/serializers/partnership.py

@@ -4,6 +4,7 @@
 # See more details in the license.txt file located at the root folder of the Akvo RSR module.
 # For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
 
+from rest_framework import serializers
 
 from akvo.rsr.models import Partnership
 
@@ -12,5 +13,7 @@
 
 class PartnershipSerializer(BaseRSRSerializer):
 
+    partner_type_2 = serializers.Field(source='iati_role_to_partner_type')
+
     class Meta:
         model = Partnership

akvo/rest/views/partnership.py

@@ -17,3 +17,13 @@ class PartnershipViewSet(BaseRSRViewSet):
     queryset = Partnership.objects.all()
     serializer_class = PartnershipSerializer
     filter_fields = ('project', 'organisation', 'iati_organisation_role', )
+
+    def get_queryset(self):
+        """Allow filtering on partner_type."""
+        queryset = self.queryset
+        partner_type = self.request.QUERY_PARAMS.get('partner_type_2', None)
+        if partner_type and partner_type in Partnership.PARTNER_TYPES_TO_ROLES_MAP.keys():
+            queryset = self.queryset.filter(
+                iati_organisation_role=Partnership.PARTNER_TYPES_TO_ROLES_MAP[partner_type]
+            )
+        return queryset

akvo/rsr/models/partnership.py

@@ -124,6 +124,12 @@ class Partnership(models.Model):
     def iati_organisation_role_label(self):
         return dict(self.IATI_ROLES)[self.iati_organisation_role]
 
+    def iati_role_to_partner_type(self):
+        if self.iati_organisation_role:
+            return self.ROLES_TO_PARTNER_TYPES_MAP[int(self.iati_organisation_role)]
+        else:
+            return None
+
     class Meta:
         app_label = 'rsr'
         verbose_name = _(u'project partner')