Moved the pluralization of the relation names to the formatting method

Author: schtibe

rest_framework_json_api/utils.py

@@ -139,7 +139,8 @@ def format_relation_name(value, format_type=None):
         value = inflection.camelize(value)
     elif format_type == 'underscore':
         value = inflection.underscore(value)
-    return value
+
+    return inflection.pluralize(value)
 
 
 def build_json_resource_obj(fields, resource, resource_instance, resource_name):
@@ -182,7 +183,7 @@ def get_related_resource_type(relation):
             relation_model = parent_model_relation.field.related.model
         else:
             raise APIException('Unable to find related model for relation {relation}'.format(relation=relation))
-    return inflection.pluralize(format_relation_name(relation_model.__name__))
+    return format_relation_name(relation_model.__name__)
 
 
 def extract_id_from_url(url):
@@ -294,7 +295,7 @@ def extract_relationships(fields, resource, resource_instance):
 
             serializer = field.child
             relation_model = serializer.Meta.model
-            relation_type = inflection.pluralize(format_relation_name(relation_model.__name__))
+            relation_type = format_relation_name(relation_model.__name__)
 
             # Get the serializer fields
             serializer_fields = get_serializer_fields(serializer)
@@ -311,7 +312,7 @@ def extract_relationships(fields, resource, resource_instance):
 
         if isinstance(field, ModelSerializer):
             relation_model = field.Meta.model
-            relation_type = inflection.pluralize(format_relation_name(relation_model.__name__))
+            relation_type = format_relation_name(relation_model.__name__)
 
             # Get the serializer fields
             serializer_fields = get_serializer_fields(field)
@@ -345,7 +346,7 @@ def extract_included(fields, resource, resource_instance):
 
             serializer = field.child
             model = serializer.Meta.model
-            relation_type = inflection.pluralize(format_relation_name(model.__name__))
+            relation_type = format_relation_name(model.__name__)
 
             # Get the serializer fields
             serializer_fields = get_serializer_fields(serializer)
@@ -364,7 +365,7 @@ def extract_included(fields, resource, resource_instance):
         if isinstance(field, ModelSerializer):
 
             model = field.Meta.model
-            relation_type = inflection.pluralize(format_relation_name(model.__name__))
+            relation_type = format_relation_name(model.__name__)
 
             # Get the serializer fields
             serializer_fields = get_serializer_fields(field)