get primary key field using the key method

Signed-off-by: wiseaidev <[email protected]>

Author: wiseaidev

aredis_om/model/model.py

@@ -1110,7 +1110,7 @@ def __init__(__pydantic_self__, **data: Any) -> None:
 
     def __lt__(self, other):
         """Default sort: compare primary key of models."""
-        return self.pk < other.pk
+        return self.key() < other.key()
 
     def key(self):
         """Return the Redis key for this model."""
@@ -1149,7 +1149,7 @@ async def expire(
         db = self._get_db(pipeline)
 
         # TODO: Wrap any Redis response errors in a custom exception?
-        await db.expire(self.make_primary_key(self.pk), num_seconds)
+        await db.expire(self.make_primary_key(self.key()), num_seconds)
 
     @validator("pk", always=True, allow_reuse=True)
     def validate_pk(cls, v):
@@ -1274,7 +1274,7 @@ async def delete_many(
         db = cls._get_db(pipeline)
 
         for chunk in ichunked(models, 100):
-            pks = [cls.make_primary_key(model.pk) for model in chunk]
+            pks = [cls.make_primary_key(model.key()) for model in chunk]
             await cls._delete(db, *pks)
 
         return len(models)

tests/test_hash_model.py

@@ -618,7 +618,7 @@ async def test_delete_many(m):
     result = await m.Member.delete_many(members)
     assert result == 2
     with pytest.raises(NotFoundError):
-        await m.Member.get(pk=member1.id)
+        await m.Member.get(pk=member1.key())
 
 
 @py_test_mark_asyncio