Update controllers/fetch_microsoft_mails.py

controllers/fetch_microsoft_mails.py

@@ -62,9 +62,9 @@ def get_company_type(company_name:str)->str:
 
 async def get_messages(code: str,websocket:WebSocket,brand_name: Optional[str] = None):
     access_token = code
-    g_query = 'subject:"your order" OR subject:"receipts" OR subject:"receipt" OR subject:"aankoopbon" OR subject:"reçu" OR subject:"invoice" OR subject:"invoices" hasattachment:yes'
+    g_query = '"your order" OR "receipts" OR "receipt" OR "aankoopbon" OR "reçu" OR "invoice" OR "invoices" hasattachment:yes'
     if brand_name is not None:
-        g_query = f'(subject:"your order" OR subject:"receipts" OR subject:"receipt" OR  subject: "aankoopbon"  OR subject:"reçu" OR subject:"invoice" OR subject:"invoices" OR from:{brand_name}) AND subject:{brand_name} has:attachment'    
+        g_query = f'(subject:"your order" OR subject:"receipts" OR subject:"receipt" OR  subject: "aankoopbon"  OR subject:"reçu" OR subject:"invoice" OR subject:"invoices" OR from:{brand_name}) AND subject:{brand_name} hasattachment:yes'    
     messages = []
     def fetch_message_wrapper(message_data):
         message_id = message_data.get("id")
@@ -77,7 +77,7 @@ async def get_messages(code: str,websocket:WebSocket,brand_name: Optional[str] =
         return None
 
     while True:
-        outlook_url = f"https://graph.microsoft.com/v1.0/me/messages?$search={g_query}"
+        outlook_url = f"https://graph.microsoft.com/v1.0/me/messages?$filter=subject eq '{g_query}'"
 
         outlook_response = requests.get(outlook_url, headers={"Authorization": f"Bearer {access_token}"})
         outlook_data = outlook_response.json()