Update app.py

app.py

@@ -275,6 +275,34 @@ def calculate_shipping_cost(address: str) -> int:
             return cost
     return TOWN_SHIPPING_COSTS["default"]  # Default shipping cost for unknown areas
 
+# ... (rest of your imports and setup)
+
+async def update_user_profile(user_id: str, phone_number: str = None, address: str = None) -> UserProfile:
+    """
+    Update or create a user profile with the provided phone number and address.
+    """
+    async with async_session() as session:
+        result = await session.execute(
+            select(UserProfile).where(UserProfile.user_id == user_id)
+        )
+        profile = result.scalars().first()
+        if profile is None:
+            profile = UserProfile(
+                user_id=user_id,
+                phone_number=phone_number,
+                address=address,
+                last_interaction=datetime.utcnow()
+            )
+        else:
+            if phone_number:
+                profile.phone_number = phone_number
+            if address:
+                profile.address = address
+            profile.last_interaction = datetime.utcnow()
+        session.add(profile)
+        await session.commit()
+        return profile
+
 def process_order_flow(user_id: str, message: str) -> str:
     """
     Implements an FSM-based order flow with shipping cost calculation.
@@ -369,39 +397,47 @@ def process_order_flow(user_id: str, message: str) -> str:
             state.step = 3
             return f"Got it. {quantity} serving(s) of {state.data.get('dish')}. Please provide your phone number and delivery address."
 
-        # --- Step 3: Requesting Phone Number and Address ---
+        # --- Step 3: Parse Phone Number and Address from Message ---
         if state.step == 3:
-            # Regular expression to extract phone number and address
+            # Extract phone number using regex
             phone_pattern = r'(\+?\d{10,15})'
-            address_pattern = r'address:\s*(.+)'
-            
             phone_match = re.search(phone_pattern, message)
-            address_match = re.search(address_pattern, message, re.IGNORECASE)
             
-            if phone_match and address_match:
+            # Extract address (assume it follows the phone number, separated by a comma)
+            address = None
+            if phone_match:
                 phone_number = phone_match.group(1)
-                address = address_match.group(1)
+                # Assume the address starts after the phone number
+                address_start = phone_match.end()
+                address = message[address_start:].strip()
+                # Remove any leading/trailing commas or spaces
+                address = re.sub(r'^[,\s]+|[,\s]+$', '', address)
+            
+            if phone_match and address:
                 state.data["phone_number"] = phone_number
                 state.data["address"] = address
+                # Save phone number and address to the user's profile
+                asyncio.create_task(update_user_profile(user_id, phone_number, address))
                 # Calculate shipping cost based on the address
                 shipping_cost = calculate_shipping_cost(address)
                 state.data["shipping_cost"] = shipping_cost
                 state.step = 5
-                return (f"Thanks. Your phone number is recorded as: {phone_number}.\n"
+                return (f"Thanks! Your phone number is recorded as: {phone_number}.\n"
                         f"Your delivery address is: {address}.\n"
                         f"Your delivery cost is N{shipping_cost}. Would you like to add any extras such as sides or drinks? (yes/no)")
             elif phone_match:
                 state.data["phone_number"] = phone_match.group(1)
+                # Save phone number to the user's profile
+                asyncio.create_task(update_user_profile(user_id, phone_number))
                 return "Thank you. Please provide your delivery address."
-            elif address_match:
-                state.data["address"] = address_match.group(1)
-                return "Thank you. Please provide your phone number."
             else:
-                return "Please provide both your phone number and delivery address. For example: 'Phone: 08123456789, Address: 123 Main St, Lagos'."
+                return "Please provide both your phone number and delivery address. For example: '09162409591, 1, Iyana Isashi, Isashi, Ojo, Lagos'."
 
         # --- Step 4: Requesting Delivery Address ---
         if state.step == 4:
             state.data["address"] = message
+            # Save address to the user's profile
+            asyncio.create_task(update_user_profile(user_id, address=message))
             # Calculate shipping cost based on the address
             shipping_cost = calculate_shipping_cost(message)
             state.data["shipping_cost"] = shipping_cost
@@ -527,7 +563,6 @@ def process_order_flow(user_id: str, message: str) -> str:
                 return "Order canceled. Let me know if you'd like to try again."
 
     return ""
-
 # --- User Profile Functions ---
 async def get_or_create_user_profile(user_id: str, phone_number: str = None) -> UserProfile:
     async with async_session() as session: