fix duplicate message

app/main.py

@@ -176,15 +176,15 @@ async def process_message(message_data: Dict[str, Any]):
 
     log_kwargs = {
         'conversation_id': None,
-        'user_id': sender_id,
+        'recipient_id': sender_id,
         'page_id': page_id,
         'originaltext': message_text,
-        'command': '',
-        'content': '',
-        'attachments': attachments,
-        'vehicle': '',
-        'action': '',
-        'purpose': '',
+        'originalcommand': '',
+        'originalcontent': '',
+        'originalattachments': attachments,
+        'originalvehicle': '',
+        'originalaction': '',
+        'originalpurpose': '',
         'timestamp': [timestamp],
         'isdone': False
     }
@@ -207,15 +207,15 @@ async def process_message(message_data: Dict[str, Any]):
                 return
             conv = {
                 'conversation_id': row.get('conversation_id'),
-                'user_id': row.get('recipient_id'),
+                'recipient_id': row.get('recipient_id'),
                 'page_id': row.get('page_id'),
                 'originaltext': row.get('originaltext'),
-                'command': row.get('originalcommand'),
-                'content': row.get('originalcontent'),
-                'attachments': row.get('originalattachments'),
-                'vehicle': row.get('originalvehicle'),
-                'action': row.get('originalaction'),
-                'purpose': row.get('originalpurpose'),
+                'originalcommand': row.get('originalcommand'),
+                'originalcontent': row.get('originalcontent'),
+                'originalattachments': row.get('originalattachments'),
+                'originalvehicle': row.get('originalvehicle'),
+                'originalaction': row.get('originalaction'),
+                'originalpurpose': row.get('originalpurpose'),
                 'timestamp': row_timestamps,
                 'isdone': row.get('isdone')
             }
@@ -277,15 +277,15 @@ async def process_message(message_data: Dict[str, Any]):
     # 4. Update lại conversation với thông tin đầy đủ
     update_kwargs = {
         'conversation_id': conv['conversation_id'],
-        'user_id': sender_id,
+        'recipient_id': sender_id,
         'page_id': page_id,
         'originaltext': message_text,
-        'command': command,
-        'content': remaining_text,
-        'attachments': attachments,
-        'vehicle': ','.join(keywords),
-        'action': hanh_vi_vi_pham,
-        'purpose': muc_dich,
+        'originalcommand': command,
+        'originalcontent': remaining_text,
+        'originalattachments': attachments,
+        'originalvehicle': ','.join(keywords),
+        'originalaction': hanh_vi_vi_pham,
+        'originalpurpose': muc_dich,
         'timestamp': conv['timestamp'],
         'isdone': False
     }
@@ -306,9 +306,9 @@ async def process_business_logic(log_kwargs: Dict[str, Any], page_token: str) ->
     """
     Xử lý logic nghiệp vụ dựa trên thông tin conversation.
     """
-    command = log_kwargs.get('command', '')
-    vehicle = log_kwargs.get('vehicle', '')
-    action = log_kwargs.get('action', '')
+    command = log_kwargs.get('originalcommand', '')
+    vehicle = log_kwargs.get('originalvehicle', '')
+    action = log_kwargs.get('originalaction', '')
     message = log_kwargs.get('originaltext', '')
     
     # Tách vehicle thành list keywords
@@ -340,7 +340,7 @@ async def process_business_logic(log_kwargs: Dict[str, Any], page_token: str) ->
         if command == "xong":
             # Tạo bài viết mới trên page (placeholder)
             # TODO: Thay thế hàm này bằng logic thực tế
-            post_url = await create_facebook_post(page_token, log_kwargs['user_id'], [log_kwargs])
+            post_url = await create_facebook_post(page_token, log_kwargs['recipient_id'], [log_kwargs])
             if post_url:
                 response = f"Bài viết đã được tạo thành công! Bạn có thể xem tại: {post_url}"
             else:

app/sheets.py

@@ -119,21 +119,21 @@ class SheetsClient:
     def log_conversation(
         self,
         conversation_id: str,
-        user_id: str,
+        recipient_id: str,
         page_id: str,
         originaltext: str = "",
-        command: str = "",
-        content: str = "",
-        attachments: Optional[List[str]] = None,
-        vehicle: str = "",
-        action: str = "",
-        purpose: str = "",
+        originalcommand: str = "",
+        originalcontent: str = "",
+        originalattachments: Optional[List[str]] = None,
+        originalvehicle: str = "",
+        originalaction: str = "",
+        originalpurpose: str = "",
         timestamp: str = "",
         isdone: bool = False
     ) -> Optional[Dict[str, Any]]:
         """
         Ghi log hội thoại vào Google Sheets.
-        Dùng originaltext cho cột message trong sheet và các logic liên quan.
+        Dùng các trường original* cho các cột tương ứng trong sheet và các logic liên quan.
         """
         try:
             if not self.service:
@@ -157,11 +157,11 @@ class SheetsClient:
                         row_timestamps = json.loads(row[10]) if row[10] else []
                         if isinstance(row_timestamps, list) and len(row_timestamps) == 1 and isinstance(row_timestamps[0], list):
                             row_timestamps = row_timestamps[0]
-                        row_user_id = row[4]
+                        row_recipient_id = row[4]
                         row_page_id = row[5]
-                        if (str(timestamp) in [str(ts) for ts in row_timestamps] and str(row_user_id) == str(user_id) and str(row_page_id) == str(page_id)):
+                        if (str(timestamp) in [str(ts) for ts in row_timestamps] and str(row_recipient_id) == str(recipient_id) and str(row_page_id) == str(page_id)):
                             # Found duplicate, return existing conversation
-                            logger.info(f"Found duplicate conversation for user {user_id}, page {page_id}, timestamp {timestamp}")
+                            logger.info(f"Found duplicate conversation for user {recipient_id}, page {page_id}, timestamp {timestamp}")
                             return {
                                 'conversation_id': row[0],
                                 'originalcommand': row[1],
@@ -178,18 +178,18 @@ class SheetsClient:
                             }
 
                 # No duplicate found, create new conversation
-                conversation_id = generate_conversation_id(user_id, page_id, ts)
+                conversation_id = generate_conversation_id(recipient_id, page_id, ts)
                 new_row = [
                     conversation_id,
-                    command,
-                    content,
-                    json.dumps(attachments or []),
-                    user_id,
+                    originalcommand,
+                    originalcontent,
+                    json.dumps(originalattachments or []),
+                    recipient_id,
                     page_id,
                     originaltext,
-                    vehicle,
-                    action,
-                    purpose,
+                    originalvehicle,
+                    originalaction,
+                    originalpurpose,
                     json.dumps(timestamp),
                     str(isdone).lower()
                 ]
@@ -206,20 +206,20 @@ class SheetsClient:
                     body=body
                 ).execute()
 
-                logger.info(f"Thêm mới conversation: {conversation_id} | Giá trị: {dict(zip(['conversation_id','command','content','attachments','user_id','page_id','originaltext','vehicle','action','purpose','timestamp','isdone'], new_row))}")
+                logger.info(f"Thêm mới conversation: {conversation_id} | Giá trị: {dict(zip(['conversation_id','originalcommand','originalcontent','originalattachments','recipient_id','page_id','originaltext','originalvehicle','originalaction','originalpurpose','timestamp','isdone'], new_row))}")
 
                 # Return the conversation data directly
                 return {
                     'conversation_id': conversation_id,
-                    'originalcommand': command,
-                    'originalcontent': content,
-                    'originalattachments': attachments or [],
-                    'recipient_id': user_id,
+                    'originalcommand': originalcommand,
+                    'originalcontent': originalcontent,
+                    'originalattachments': originalattachments or [],
+                    'recipient_id': recipient_id,
                     'page_id': page_id,
                     'originaltext': originaltext,
-                    'originalvehicle': vehicle,
-                    'originalaction': action,
-                    'originalpurpose': purpose,
+                    'originalvehicle': originalvehicle,
+                    'originalaction': originalaction,
+                    'originalpurpose': originalpurpose,
                     'timestamp': timestamp,
                     'isdone': isdone
                 }
@@ -248,15 +248,15 @@ class SheetsClient:
                         current_timestamps.append(timestamp)
                     new_row = [
                         conversation_id,
-                        command if command else current_row[1],
-                        content if content else current_row[2],
-                        json.dumps(attachments) if attachments is not None else current_row[3],
-                        user_id if user_id else current_row[4],
+                        originalcommand if originalcommand else current_row[1],
+                        originalcontent if originalcontent else current_row[2],
+                        json.dumps(originalattachments) if originalattachments is not None else current_row[3],
+                        recipient_id if recipient_id else current_row[4],
                         page_id if page_id else current_row[5],
                         originaltext if originaltext else current_row[6],
-                        vehicle if vehicle else current_row[7],
-                        action if action else current_row[8],
-                        purpose if purpose else current_row[9],
+                        originalvehicle if originalvehicle else current_row[7],
+                        originalaction if originalaction else current_row[8],
+                        originalpurpose if originalpurpose else current_row[9],
                         json.dumps(current_timestamps),
                         str(isdone).lower() if isdone is not None else current_row[11]
                     ]
@@ -271,7 +271,7 @@ class SheetsClient:
                         valueInputOption='RAW',
                         body=body
                     ).execute()
-                    changed_cols = ['conversation_id','command','content','attachments','user_id','page_id','originaltext','vehicle','action','purpose','timestamp','isdone']
+                    changed_cols = ['conversation_id','originalcommand','originalcontent','originalattachments','recipient_id','page_id','originaltext','originalvehicle','originalaction','originalpurpose','timestamp','isdone']
                     for idx, (old, new) in enumerate(zip(current_row, new_row)):
                         if old != new:
                             changed_cols.append(changed_cols[idx])