Skip to content

feat: Integrate Subscription and Attendance Log contracts - #313

Merged
truthixify merged 8 commits into
DistinctCodes:mainfrom
Jayy4rl:feat/subscription-attendance-integration-218
Oct 4, 2025
Merged

feat: Integrate Subscription and Attendance Log contracts#313
truthixify merged 8 commits into
DistinctCodes:mainfrom
Jayy4rl:feat/subscription-attendance-integration-218

Conversation

@Jayy4rl

@Jayy4rl Jayy4rl commented Oct 2, 2025

Copy link
Copy Markdown
Contributor
  • Add cross-contract calls from subscription.rs to attendance_log.rs

  • Implement log_attendance on subscription create/renew events

  • Add new error types for subscription and attendance integration

  • Add comprehensive test suite for subscription-attendance integration

  • All tests passing, contract compiles successfully

  • Closes [CONTRACT] Integrate Subscription and Attendance Log Contracts #218

…des#218)

- Add cross-contract calls from subscription.rs to attendance_log.rs
- Implement log_attendance on subscription create/renew events
- Add new error types for subscription and attendance integration
- Add comprehensive test suite for subscription-attendance integration
- All tests passing, contract compiles successfully

Closes DistinctCodes#218
@vercel

vercel Bot commented Oct 2, 2025

Copy link
Copy Markdown

@Jayy4rl is attempting to deploy a commit to the naijabuz's projects Team on Vercel.

A member of the Team first needs to authorize it.

@Jayy4rl

Jayy4rl commented Oct 2, 2025

Copy link
Copy Markdown
Contributor Author

@truthixify review and let me know

- Fix Vec::collect() error in test_multiple_subscription_events_logged
- Remove unused 'amount' parameter warning in log_subscription_event
- All 26 tests now passing successfully
@truthixify

Copy link
Copy Markdown
Contributor

@Jayy4rl

Resolve conflicts and make the CI pass.

Jayy4rl and others added 4 commits October 4, 2025 13:13
- Fix imports: Add SubscriptionContract and Subscription to lib.rs
- Update attendance_log API: Change from log_event to log_attendance
- Add AttendanceAction parameter to subscription logging
- Create log_attendance_internal to avoid double auth in cross-contract calls
- Update tests: Replace get_events_by_user with get_logs_for_user
- Fix test field names: user -> user_id for AttendanceLog
- Add MembershipStatus import to tests
- All 15 tests now passing
- Format and clippy checks passing
@Jayy4rl

Jayy4rl commented Oct 4, 2025

Copy link
Copy Markdown
Contributor Author

CI passing now @truthixify

@truthixify
truthixify merged commit 3d772b4 into DistinctCodes:main Oct 4, 2025
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CONTRACT] Integrate Subscription and Attendance Log Contracts

2 participants