fix: package activity linking fails with 'not same trip' error

[Systemsaholic]

Summary

• Root cause: linkChildrenToPackage compared activity.tripId directly, but regular activities have trip_id = null in the DB — only floating packages store it. The migration backfilled existing data, so it worked initially but broke for any activity created after the migration.
• Fix: Resolve each child's trip through the itinerary chain (itinerary_day_id → itinerary_days → itineraries → trip_id) instead of using the trip_id column directly.

Test plan

• Bookings tab → select activities → add to package (was failing, should work now)
• Package detail → link activities (was failing, should work now)
• Cross-trip linking still correctly rejected

fixes #43

🤖 Generated with Claude Code

Summary by CodeRabbit

• Bug Fixes
  • Strengthened validation when linking activities to booking packages to ensure activities belong to the correct trip and handle edge cases appropriately.
  • Enhanced activity linking with optimistic UI updates, providing immediate visual feedback and faster response times when managing bookings.

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
tailfire-client	Ready	Preview, Comment	Mar 19, 2026 9:19pm
tailfire-ota	Ready	Preview, Comment	Mar 19, 2026 9:19pm

[coderabbitai]

Caution

Review failed

Pull request was closed or merged during review

📝 Walkthrough

Walkthrough

This PR fixes activity-to-package linking by introducing optimistic cache updates with error recovery on the frontend and enhancing backend trip ID resolution logic to infer missing trip identifiers from itinerary day references when direct trip IDs are unavailable.

Changes

Cohort / File(s)	Summary
Frontend mutation optimization apps/admin/src/hooks/use-bookings.ts	Enhanced useLinkActivities with optimistic updates: filters unlinked-activities from cache on mutation start, invalidates related queries immediately for UI responsiveness, and recovers cache state via targeted refetches on error.
Backend trip validation enhancement apps/api/src/trips/activities.service.ts	Upgraded linkChildrenToPackage trip validation to resolve missing tripId by calling getTripIdFromDayId() when itineraryDayId is present, enabling activities linked through day references to pass the same-trip check.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

Possibly related PRs

• feat: cruise library search redesign + bookings tab fixes #9: Modifies the same useLinkActivities cache invalidation and linkChildrenToPackage validation logic for handling activities across trips.
• fix: package linking, booking cascade, itinerary day validation #10: Adjusts linkChildrenToPackage cross-trip validation and unlinked-activities cache behavior in both frontend and backend services.

Poem

🐰 Hops of joy, a package dance,
Activities now get their chance,
Optimistic bounds and day-trips known,
No more errors on this home,
The rabbit cheers—bugs all flown! 🎉

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly identifies the bug fix (package activity linking fails with 'not same trip' error) and matches the core change—resolving trip validation via itinerary chain instead of direct tripId comparison.
Linked Issues check	✅ Passed	The PR addresses issue #43 by fixing the validation logic in ActivitiesService to infer tripId from itinerary relations and adding optimistic UI updates in the hook, enabling activities on the same trip to be linked regardless of null activity.tripId.
Out of Scope Changes check	✅ Passed	All changes are directly scoped to fixing package activity linking: the service resolves trip via itinerary chain for validation, and the hook adds optimistic updates and proper cache invalidation for the linking operation.
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch feature/issue-43-package-link-fix

📝 Coding Plan

• Generate coding plan for human review comments

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}