Miscellaneous bug fixes for message and versioning compatibility

proteanhq · Feb 18, 2022 · 4734377 · 4734377
1 parent 017ea5e
commit 4734377
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/protean/adapters/broker/celery.py b/src/protean/adapters/broker/celery.py
@@ -96,7 +96,7 @@ def register(self, initiator_cls, consumer_cls):
 
     def publish(self, message: Message) -> None:
         event_cls = fetch_element_cls_from_registry(
-            message["name"], (DomainObjects.EVENT,)
+            message.type, (DomainObjects.EVENT,)
         )
         for subscriber in self._subscribers[fully_qualified_name(event_cls)]:
             if self.conn_info["IS_ASYNC"]:

diff --git a/src/protean/adapters/repository/elasticsearch.py b/src/protean/adapters/repository/elasticsearch.py
@@ -91,8 +91,9 @@ def to_entity(cls, item: "ElasticsearchModel"):
         id_field_name = id_field(cls.meta_.entity_cls).field_name
         item_dict[id_field_name] = identifier
 
-        # Set version from document meta
-        item_dict["_version"] = item.meta.version
+        # Set version from document meta, only if `_version` attr is present
+        if hasattr(cls.meta_.entity_cls, "_version"):
+            item_dict["_version"] = item.meta.version
 
         entity_obj = cls.meta_.entity_cls(item_dict)