Skip to content

♻️ refactor(payments): use Notification service for emails ⚠️ 🚨#9042

Merged
giancarloromeo merged 56 commits intoITISFoundation:masterfrom
giancarloromeo:refactor/use-notification-service-for-emails-in-payments
Apr 23, 2026
Merged

♻️ refactor(payments): use Notification service for emails ⚠️ 🚨#9042
giancarloromeo merged 56 commits intoITISFoundation:masterfrom
giancarloromeo:refactor/use-notification-service-for-emails-in-payments

Conversation

@giancarloromeo
Copy link
Copy Markdown
Contributor

@giancarloromeo giancarloromeo commented Apr 20, 2026 •
edited
Loading

What do these changes do?

This pull request refactors payment confirmation emails to be sent through the notifications service (via RabbitMQ RPC + notifications worker) instead of direct SMTP rendering/sending in the payments service, and introduces support for email BCC and attachments across the notifications pipeline.

Before

image

After

image

Related issue/s

How to test

cd services/payments
make install-dev

pytest -vv --pdb tests/unit/test_services_notifier.py
pytest -vv --pdb tests/unit/test_services_notifier_email.py

cd services/notifications
make install-dev

pytest -vv --pdb tests/unit/test_api_celery_send_email.py
pytest -vv --pdb tests/unit/test_api_rpc_template.py
pytest -vv --pdb test_channel_handlers_email.py

Dev-ops

  • PAYMENTS_EMAIL env var is not used anymore (MR 1989).

@giancarloromeo giancarloromeo added this to the Etna milestone Apr 20, 2026
@giancarloromeo giancarloromeo self-assigned this Apr 20, 2026
@giancarloromeo giancarloromeo added a:payments area: payments service a:notifications labels Apr 20, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 20, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 96.87500% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.41%. Comparing base (4ed60a0) to head (7565171).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #9042      +/-   ##
==========================================
+ Coverage   87.40%   87.41%   +0.01%     
==========================================
  Files        2057     2058       +1     
  Lines       81070    81063       -7     
  Branches     1461     1461              
==========================================
+ Hits        70856    70860       +4     
+ Misses       9803     9792      -11     
  Partials      411      411
Flag Coverage Δ
integrationtests 63.89% <ø> (-0.01%) ⬇️
unittests 86.27% <96.87%> (+<0.01%) ⬆️
Components Coverage Δ
pkg_aws_library 95.29% <ø> (ø)
pkg_celery_library 77.72% <ø> (ø)
pkg_dask_task_models_library 79.65% <ø> (ø)
pkg_models_library 92.66% <100.00%> (+<0.01%) ⬆️
pkg_notifications_library 84.48% <ø> (ø)
pkg_postgres_database 89.91% <ø> (ø)
pkg_service_integration 72.81% <ø> (ø)
pkg_service_library 70.41% <ø> (ø)
pkg_settings_library 90.48% <ø> (ø)
pkg_simcore_sdk 86.00% <ø> (ø)
agent 93.26% <ø> (ø)
api_server 91.40% <ø> (ø)
autoscaling 95.48% <ø> (ø)
catalog 92.10% <ø> (ø)
clusters_keeper 98.59% <ø> (ø)
dask_sidecar 91.53% <ø> (-0.22%) ⬇️
datcore_adapter 97.95% <ø> (ø)
director 75.45% <ø> (ø)
director_v2 91.71% <ø> (+0.01%) ⬆️
dynamic_scheduler 95.77% <ø> (ø)
dynamic_sidecar 87.96% <ø> (ø)
efs_guardian 89.73% <ø> (ø)
invitations 90.93% <ø> (ø)
payments 92.43% <95.23%> (-0.44%) ⬇️
resource_usage_tracker 92.87% <ø> (+0.41%) ⬆️
storage 86.94% <ø> (+0.16%) ⬆️
webclient ∅ <ø> (∅)
webserver 86.79% <ø> (+0.01%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4ed60a0...7565171. Read the comment docs.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@giancarloromeo giancarloromeo requested a review from Copilot April 22, 2026 07:44

This comment was marked as resolved.

Sign in to view

@giancarloromeo
revert
fd4f6b9
@giancarloromeo
Merge branch 'refactor/use-notification-service-for-emails-in-payment…
ec6f0c7 
…s' of github.com:giancarloromeo/osparc-simcore into refactor/use-notification-service-for-emails-in-payments
@giancarloromeo
update payment gateway
b8a956d
@giancarloromeo giancarloromeo requested a review from Copilot April 22, 2026 09:01

This comment was marked as resolved.

Sign in to view

@giancarloromeo giancarloromeo requested a review from Copilot April 22, 2026 09:20

This comment was marked as resolved.

Sign in to view

@giancarloromeo giancarloromeo changed the title ♻️ refactor(payments): use notification service for emails ♻️ refactor(payments): use notification service for emails ⚠️ Apr 22, 2026
@giancarloromeo
fix
415f525
@giancarloromeo
fix bytes issue
0a356fa
@giancarloromeo
add test
1e8b641
@giancarloromeo
Merge branch 'refactor/use-notification-service-for-emails-in-payment…
a5d07a1 
…s' of github.com:giancarloromeo/osparc-simcore into refactor/use-notification-service-for-emails-in-payments
@giancarloromeo giancarloromeo requested review from GitHK and Copilot April 23, 2026 05:26
@giancarloromeo giancarloromeo requested a review from odeimaiz April 23, 2026 05:28
Copilot AI reviewed Apr 23, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 23 out of 23 changed files in this pull request and generated 2 comments.

Comment thread services/notifications/src/simcore_service_notifications/models/template_contexts/_paid.py
Comment thread packages/notifications-library/src/notifications_library/templates/email/paid/body_html.j2
odeimaiz
odeimaiz approved these changes Apr 23, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@odeimaiz odeimaiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💅

GitHK
GitHK reviewed Apr 23, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@GitHK GitHK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please have a look at my comment and thanks for considering it.

Comment thread services/payments/scripts/example_payment_gateway.py
@giancarloromeo giancarloromeo changed the title ♻️ refactor(payments): use notification service for emails ⚠️ 🚨 ♻️ refactor(payments): use Notification service for emails ⚠️ 🚨 Apr 23, 2026
matusdrobuliak66
matusdrobuliak66 approved these changes Apr 23, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@matusdrobuliak66 matusdrobuliak66 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I reviewed properly this time ;) looking good, lets test it in aws master when it is deployed - you can buy credits with a fake credit card and this should initialize this email .

We can test both cases, successful but also unsuccessful payment - please let me know when it is in master and we can do it together.

@giancarloromeo
Copy link
Copy Markdown
Contributor Author

giancarloromeo commented Apr 23, 2026

Thanks! I reviewed properly this time ;) looking good, lets test it in aws master when it is deployed - you can buy credits with a fake credit card and this should initialize this email .

Yep, I know. Already tested with example_payments_gateway locally... but I put 🚨 in the title to remember that it will require Manual tests also when deployed :)

Thanks for reviewing it 🙏

pcrespov
pcrespov approved these changes Apr 23, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@pcrespov pcrespov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx.

Left some comments. Please keep an eye on them.

Comment thread services/payments/src/simcore_service_payments/services/notifier_email.py Outdated
Comment thread services/payments/src/simcore_service_payments/services/notifier_email.py Outdated
Comment thread services/payments/src/simcore_service_payments/services/notifier_email.py Outdated
Comment thread services/payments/src/simcore_service_payments/services/notifier_email.py Outdated
giancarloromeo and others added 7 commits April 23, 2026 16:40
@giancarloromeo
fix
647c06b
@giancarloromeo
fix
2a14982 
Co-authored-by: Copilot <[email protected]>
@giancarloromeo
fix
9340f5b 
Co-authored-by: Copilot <[email protected]>
@giancarloromeo
fix
7c85847 
Co-authored-by: Copilot <[email protected]>
@giancarloromeo
Merge branch 'master' into refactor/use-notification-service-for-emai…
63eb845 
…ls-in-payments
@giancarloromeo
fix
37be72c 
Co-authored-by: Copilot <[email protected]>
@giancarloromeo
fix tests
7565171
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Apr 23, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@giancarloromeo giancarloromeo enabled auto-merge (squash) April 23, 2026 17:29
@giancarloromeo
Copy link
Copy Markdown
Contributor Author

giancarloromeo commented Apr 23, 2026

@mergify queue

@giancarloromeo giancarloromeo added the 🤖-automerge marks PR as ready to be merged for Mergify label Apr 23, 2026
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Apr 23, 2026 •
edited
Loading

Merge Queue Status

  • 🟠 Waiting for queue conditions
  • ⏳ Enter queue
  • ⏳ Run checks
  • ⏳ Merge
Waiting for:
  • -closed
All conditions
  • -closed [📌 queue requirement]
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • any of [📌 queue -> configuration change requirements]:
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of [📌 queue requirement]:
    • check-neutral = Mergify Merge Protections
    • check-skipped = Mergify Merge Protections
    • check-success = Mergify Merge Protections
  • any of [🔀 queue conditions]:
    • all of [📌 queue conditions of queue rule default]:
      • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
      • #approved-reviews-by>=2
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0
      • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
      • #review-threads-unresolved=0
      • -conflict
      • -draft
      • base=master
      • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
      • label!=🤖-do-not-merge
      • label=🤖-automerge
      • any of [🛡 GitHub branch protection]:
        • check-skipped = deploy to dockerhub
        • check-neutral = deploy to dockerhub
        • check-success = deploy to dockerhub
      • any of [🛡 GitHub branch protection]:
        • check-success = system-tests
        • check-neutral = system-tests
        • check-skipped = system-tests
      • any of [🛡 GitHub branch protection]:
        • check-success = unit-tests
        • check-neutral = unit-tests
        • check-skipped = unit-tests
      • any of [🛡 GitHub branch protection]:
        • check-success = check OAS' are up to date
        • check-neutral = check OAS' are up to date
        • check-skipped = check OAS' are up to date
      • any of [🛡 GitHub branch protection]:
        • check-success = integration-tests
        • check-neutral = integration-tests
        • check-skipped = integration-tests
      • any of [🛡 GitHub branch protection]:
        • check-success = build-test-images (frontend) / build-test-images
        • check-neutral = build-test-images (frontend) / build-test-images
        • check-skipped = build-test-images (frontend) / build-test-images
      • any of [🛡 GitHub branch protection]:
        • check-success = SonarCloud Code Analysis
        • check-neutral = SonarCloud Code Analysis
        • check-skipped = SonarCloud Code Analysis

@giancarloromeo
Copy link
Copy Markdown
Contributor Author

giancarloromeo commented Apr 23, 2026

@mrnicegyu11 review, bitte

mrnicegyu11
mrnicegyu11 approved these changes Apr 23, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@mrnicegyu11 mrnicegyu11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm thx

@giancarloromeo giancarloromeo merged commit 018115f into ITISFoundation:master Apr 23, 2026
146 of 148 checks passed
@giancarloromeo giancarloromeo deleted the refactor/use-notification-service-for-emails-in-payments branch April 23, 2026 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GitHK GitHK GitHK left review comments

Copilot code review Copilot Copilot left review comments

@mrnicegyu11 mrnicegyu11 mrnicegyu11 approved these changes

@pcrespov pcrespov pcrespov approved these changes

@odeimaiz odeimaiz odeimaiz approved these changes

@matusdrobuliak66 matusdrobuliak66 matusdrobuliak66 approved these changes

@sanderegg sanderegg Awaiting requested review from sanderegg sanderegg is a code owner

@YuryHrytsuk YuryHrytsuk Awaiting requested review from YuryHrytsuk YuryHrytsuk is a code owner

Assignees

@giancarloromeo giancarloromeo

Labels

🤖-automerge marks PR as ready to be merged for Mergify a:notifications a:payments area: payments service

Projects

None yet

Milestone

Etna

Development

Successfully merging this pull request may close these issues.

7 participants

@giancarloromeo @GitHK @mrnicegyu11 @pcrespov @odeimaiz @matusdrobuliak66