Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🎨 improvements: return user email in licensed items, error msg, expose pricing plans πŸ—ƒοΈ #7068

Merged
merged 28 commits into from
Jan 28, 2025
Merged

🎨 improvements: return user email in licensed items, error msg, expose pricing plans πŸ—ƒοΈ #7068

merged 28 commits into from
Jan 28, 2025

Conversation

matusdrobuliak66
Copy link
Contributor

@matusdrobuliak66 matusdrobuliak66 commented Jan 22, 2025 •
edited
Loading

What do these changes do?

As required by @odeimaiz

  • 🎨 return user email on the licensed items checkouts and purchases πŸ—ƒοΈ
  • 🎨 improve error messages when project is in DEBT
  • 🎨 expose pricing plans API for users (for now it was available only for admins)
  • πŸ› update DEBT -> BILLED wallet transactions in special corner case when transaction finishes in "NOT_BILLED" status (which might cause the wallet coming back to positive credits)

Related issue/s

How to test

Dev-ops checklist

@matusdrobuliak66 matusdrobuliak66 changed the title WIP: minor improvements WIP: minor improvements πŸ—ƒοΈ Jan 22, 2025
@codecov Codecov
Copy link

codecov bot commented Jan 22, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 91.41104% with 14 lines in your changes missing coverage. Please review.

Project coverage is 87.54%. Comparing base (a53b33e) to head (d911b4c).
Report is 1 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7068      +/-   ##
==========================================
- Coverage   87.66%   87.54%   -0.13%     
==========================================
  Files        1633     1575      -58     
  Lines       63809    62278    -1531     
  Branches     2054     1798     -256     
==========================================
- Hits        55939    54521    -1418     
+ Misses       7533     7445      -88     
+ Partials      337      312      -25
Flag Coverage Ξ”
integrationtests 64.73% <61.47%> (-0.04%) ⬇️
unittests 85.77% <91.41%> (-0.17%) ⬇️
Components Coverage Ξ”
api 76.84% <ΓΈ> (ΓΈ)
pkg_aws_library βˆ… <ΓΈ> (βˆ…)
pkg_dask_task_models_library βˆ… <ΓΈ> (βˆ…)
pkg_models_library 91.33% <100.00%> (+0.01%) ⬆️
pkg_notifications_library 84.57% <ΓΈ> (ΓΈ)
pkg_postgres_database 88.39% <ΓΈ> (ΓΈ)
pkg_service_integration 70.18% <ΓΈ> (ΓΈ)
pkg_service_library 74.14% <0.00%> (ΓΈ)
pkg_settings_library βˆ… <ΓΈ> (βˆ…)
pkg_simcore_sdk 85.38% <ΓΈ> (ΓΈ)
agent 96.45% <ΓΈ> (ΓΈ)
api_server 90.55% <ΓΈ> (ΓΈ)
autoscaling 96.10% <ΓΈ> (ΓΈ)
catalog 90.32% <ΓΈ> (ΓΈ)
clusters_keeper 99.24% <ΓΈ> (ΓΈ)
dask_sidecar 91.26% <ΓΈ> (ΓΈ)
datcore_adapter 93.18% <ΓΈ> (ΓΈ)
director 76.92% <ΓΈ> (ΓΈ)
director_v2 91.30% <ΓΈ> (-0.11%) ⬇️
dynamic_scheduler 97.21% <ΓΈ> (ΓΈ)
dynamic_sidecar 89.75% <ΓΈ> (ΓΈ)
efs_guardian 90.39% <ΓΈ> (ΓΈ)
invitations 93.42% <ΓΈ> (ΓΈ)
osparc_gateway_server βˆ… <ΓΈ> (βˆ…)
payments 92.66% <ΓΈ> (ΓΈ)
resource_usage_tracker 89.01% <69.23%> (-0.22%) ⬇️
storage 89.57% <ΓΈ> (ΓΈ)
webclient βˆ… <ΓΈ> (βˆ…)
webserver 86.24% <96.72%> (+0.06%) ⬆️

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 a53b33e...d911b4c. Read the comment docs.

@matusdrobuliak66 matusdrobuliak66 self-assigned this Jan 22, 2025
@matusdrobuliak66 matusdrobuliak66 added a:webserver issue related to the webserver service a:resource-usage-tracker resource usage tracker service labels Jan 22, 2025
@matusdrobuliak66 matusdrobuliak66 added this to the Singularity milestone Jan 22, 2025
@matusdrobuliak66 matusdrobuliak66 changed the title WIP: minor improvements πŸ—ƒοΈ 🎨 improvements: return user email in licensed items, error msg, expose pricing plans πŸ—ƒοΈ Jan 22, 2025
@matusdrobuliak66 matusdrobuliak66 marked this pull request as ready for review January 22, 2025 17:07
bisgaard-itis
bisgaard-itis approved these changes Jan 23, 2025
View reviewed changes
Copy link
Contributor

@bisgaard-itis bisgaard-itis left a comment

Choose a reason for hiding this comment

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

Thanks!

sanderegg
sanderegg approved these changes Jan 23, 2025
View reviewed changes
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

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

thanks!

packages/models-library/src/models_library/api_schemas_webserver/licensed_items_checkouts.py Outdated Show resolved Hide resolved
packages/models-library/src/models_library/api_schemas_webserver/licensed_items_purchases.py Outdated Show resolved Hide resolved
...-usage-tracker/src/simcore_service_resource_usage_tracker/models/licensed_items_purchases.py Outdated Show resolved Hide resolved
...-usage-tracker/src/simcore_service_resource_usage_tracker/models/licensed_items_purchases.py Outdated Show resolved Hide resolved
pcrespov
pcrespov approved these changes Jan 23, 2025
View reviewed changes
api/specs/web-server/_resource_usage.py Outdated Show resolved Hide resolved
api/specs/web-server/_resource_usage.py Outdated Show resolved Hide resolved
.../simcore_service_resource_usage_tracker/services/background_task_periodic_heartbeat_check.py Show resolved Hide resolved
services/web/server/src/simcore_service_webserver/resource_usage/_pricing_plans_handlers.py Outdated Show resolved Hide resolved
services/web/server/src/simcore_service_webserver/resource_usage/_pricing_plans_models.py Outdated Show resolved Hide resolved
services/web/server/tests/unit/with_dbs/03/resource_usage/test_pricing_plans.py Show resolved Hide resolved
services/web/server/tests/unit/with_dbs/03/resource_usage/test_pricing_plans.py Show resolved Hide resolved
odeimaiz
odeimaiz approved these changes Jan 28, 2025
View reviewed changes
Copy link
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.

πŸ’…

@matusdrobuliak66 matusdrobuliak66 enabled auto-merge (squash) January 28, 2025 14:27
@sonarqubecloud SonarQubeCloud
Copy link

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

@matusdrobuliak66 matusdrobuliak66 enabled auto-merge (squash) January 28, 2025 15:42
@matusdrobuliak66 matusdrobuliak66 merged commit 795fdfb into ITISFoundation:master Jan 28, 2025
90 of 94 checks passed
@matusdrobuliak66 matusdrobuliak66 deleted the fix/debt-msg branch January 28, 2025 18:27
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Jan 30, 2025
Closed
16 tasks
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

@pcrespov pcrespov pcrespov approved these changes

@giancarloromeo giancarloromeo giancarloromeo approved these changes

@odeimaiz odeimaiz odeimaiz approved these changes

@sanderegg sanderegg sanderegg approved these changes

@bisgaard-itis bisgaard-itis bisgaard-itis approved these changes

@jsaq007 jsaq007 Awaiting requested review from jsaq007

@ignapas ignapas Awaiting requested review from ignapas

Assignees

@matusdrobuliak66 matusdrobuliak66

Labels
a:resource-usage-tracker resource usage tracker service a:webserver issue related to the webserver service
Projects
None yet
Milestone
Singularity
Development

Successfully merging this pull request may close these issues.

Credits not upated in frontend after upcharge
7 participants
@matusdrobuliak66 @giancarloromeo @GitHK @pcrespov @odeimaiz @sanderegg @bisgaard-itis