Fix property names

Author: ekampf

graphene_gae/ndb/converter.py

@@ -17,6 +17,11 @@
 p = inflect.engine()
 
 
+def rreplace(s, old, new, occurrence):
+    li = s.rsplit(old, occurrence)
+    return new.join(li)
+
+
 def convert_ndb_scalar_property(graphene_type, ndb_prop, **kwargs):
     description = "%s %s property" % (ndb_prop._name, graphene_type)
     result = graphene_type(description=description, **kwargs)
@@ -61,28 +66,28 @@ def convert_ndb_key_propety(ndb_key_prop, meta):
             store_key = ndb.KeyProperty(...)
 
         Result is 2 fields:
-            store_key = graphene.String() -> resolves to store_key.urlsafe()
+            store_id  = graphene.String() -> resolves to store_key.urlsafe()
             store     = NdbKeyField()     -> resolves to entity
 
     #2.
         Given:
             store = ndb.KeyProperty(...)
 
         Result is 2 fields:
-            store_key = graphene.String() -> resolves to store_key.urlsafe()
+            store_id = graphene.String() -> resolves to store_key.urlsafe()
             store     = NdbKeyField()     -> resolves to entity
 
     """
     name = ndb_key_prop._code_name
 
     if name.endswith('_key') or name.endswith('_keys'):
         # Case #1 - name is of form 'store_key' or 'store_keys'
-        string_prop_name = name
+        string_prop_name = rreplace(name, '_key', '_id', 1)
         resolved_prop_name = name[:-4] if name.endswith('_key') else p.plural(name[:-5])
     else:
         # Case #2 - name is of form 'store'
         singular_name = p.singular_noun(name) if p.singular_noun(name) else name
-        string_prop_name = singular_name + '_keys' if ndb_key_prop._repeated else singular_name + '_key'
+        string_prop_name = singular_name + '_ids' if ndb_key_prop._repeated else singular_name + '_id'
         resolved_prop_name = name
 
     string_field = NdbKeyStringField(name)
@@ -105,7 +110,6 @@ def convert_ndb_key_propety(ndb_key_prop, meta):
     ]
 
 
-
 def convert_local_structured_property(ndb_structured_prop, meta):
     is_required = ndb_structured_prop._required
     is_repeated = ndb_structured_prop._repeated

tests/_ndb/test_converter.py

@@ -83,7 +83,7 @@ def testKeyProperty_withSuffix(self):
 
         self.assertLength(conversion, 2)
 
-        self.assertEqual(conversion[0].name, 'user_key')
+        self.assertEqual(conversion[0].name, 'user_id')
         self.assertIsInstance(conversion[0].field, NdbKeyStringField)
 
         self.assertEqual(conversion[1].name, 'user')
@@ -97,7 +97,7 @@ def testKeyProperty_withSuffix_repeated(self):
 
         self.assertLength(conversion, 2)
 
-        self.assertEqual(conversion[0].name, 'user_keys')
+        self.assertEqual(conversion[0].name, 'user_ids')
         self.assertIsInstance(conversion[0].field, List)
         self.assertIsInstance(conversion[0].field.of_type, NdbKeyStringField)
 
@@ -113,7 +113,7 @@ def testKeyProperty_withSuffix_required(self):
 
         self.assertLength(conversion, 2)
 
-        self.assertEqual(conversion[0].name, 'user_key')
+        self.assertEqual(conversion[0].name, 'user_id')
         self.assertIsInstance(conversion[0].field, NonNull)
         self.assertIsInstance(conversion[0].field.of_type, NdbKeyStringField)
 
@@ -129,7 +129,7 @@ def testKeyProperty_withoutSuffix(self):
 
         self.assertLength(conversion, 2)
 
-        self.assertEqual(conversion[0].name, 'user_key')
+        self.assertEqual(conversion[0].name, 'user_id')
         self.assertIsInstance(conversion[0].field, NdbKeyStringField)
 
         self.assertEqual(conversion[1].name, 'user')