refactor: update msg object

Author: pipech

raven/omni_channel_chat/models/messages.py

@@ -7,43 +7,36 @@ class StdMessage(ABC):
 	user_id: str
 	metadata: dict
 
+	@property
 	@abstractmethod
-	def to_raven(self) -> dict:
+	def type(self) -> str:
 		pass
 
 
 @dataclass
 class TextMessage(StdMessage):
 	text: str
 
-	def to_raven(self):
-		return {
-			"type": "Text",
-			"text": self.text,
-		}
+	@property
+	def type(self) -> str:
+		return "Text"
 
 
 @dataclass
 class FileMessage(StdMessage):
 	file_name: str
 	file_content: bytes
 
-	def to_raven(self):
-		return {
-			"type": "File",
-			"file_name": self.file_name,
-			"file_content": self.file_content,
-		}
+	@property
+	def type(self) -> str:
+		return "File"
 
 
 @dataclass
 class ImageMessage(StdMessage):
 	file_name: str
 	file_content: bytes
 
-	def to_raven(self):
-		return {
-			"type": "Image",
-			"file_name": self.file_name,
-			"file_content": self.file_content,
-		}
+	@property
+	def type(self) -> str:
+		return "Image"

raven/omni_channel_chat/omni_channel_raven_connector.py

@@ -171,25 +171,26 @@ def receive_from_provider(self, message: StdMessage) -> "RavenChannel":
 		return raven_channel
 
 	def _save_inbound_message(self, *, raven_channel: "RavenChannel", message: StdMessage) -> None:
-		msg = message.to_raven()
+		from raven.omni_channel_chat.models.messages import FileMessage, ImageMessage, TextMessage
+
 		doc = frappe.new_doc(doctype="Raven Message")
 		doc.update(
 			{
 				"channel_id": raven_channel.name,
-				"message_type": msg["type"],
+				"message_type": message.type,
 				"is_customer_message": True,
 				"owner": raven_channel.customer_user,
 				"omni_channel_msg_meta": message.metadata,
 			}
 		)
-		if msg["type"] == "Text":
-			doc.text = msg["text"]
-		elif msg["type"] in ("Image", "File"):
+		if isinstance(message, TextMessage):
+			doc.text = message.text
+		elif isinstance(message, (ImageMessage, FileMessage)):
 			file_doc = frappe.get_doc(
 				{
 					"doctype": "File",
-					"file_name": msg["file_name"],
-					"content": msg["file_content"],
+					"file_name": message.file_name,
+					"content": message.file_content,
 					"is_private": 0,
 				}
 			)