keeping linter happy, adding test

Author: slorello89

aredis_om/model/model.py

@@ -625,13 +625,13 @@ def expand_tag_value(value):
 
     @classmethod
     def resolve_value(
-            cls,
-            field_name: str,
-            field_type: RediSearchFieldTypes,
-            field_info: PydanticFieldInfo,
-            op: Operators,
-            value: Any,
-            parents: List[Tuple[str, "RedisModel"]],
+        cls,
+        field_name: str,
+        field_type: RediSearchFieldTypes,
+        field_info: PydanticFieldInfo,
+        op: Operators,
+        value: Any,
+        parents: List[Tuple[str, "RedisModel"]],
     ) -> str:
         # The 'field_name' should already include the correct prefix
         result = ""
@@ -800,7 +800,7 @@ def resolve_redisearch_query(cls, expression: ExpressionOrNegated) -> str:
             return "*"
 
         if isinstance(expression.left, Expression) or isinstance(
-                expression.left, NegatedExpression
+            expression.left, NegatedExpression
         ):
             result += f"({cls.resolve_redisearch_query(expression.left)})"
         elif isinstance(expression.left, ModelField):

tests/test_json_model.py

@@ -1157,3 +1157,19 @@ class TestLiterals(JsonModel):
     await item.save()
     rematerialized = await TestLiterals.find(TestLiterals.flavor == "pumpkin").first()
     assert rematerialized.pk == item.pk
+
+
+@py_test_mark_asyncio
+async def test_merged_model_error():
+    class Player(EmbeddedJsonModel):
+        username: str = Field(index=True)
+
+    class Game(JsonModel):
+        player1: Optional[Player]
+        player2: Optional[Player]
+
+    q = Game.find(
+        (Game.player1.username == "username") | (Game.player2.username == "username")
+    )
+    print(q.query)
+    assert q.query == "(@player1_username:{username})| (@player2_username:{username})"