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

✨ Introduce vip models pricing 1 of 2 parts #6897

Merged
merged 36 commits into from
Dec 5, 2024
Merged

✨ Introduce vip models pricing 1 of 2 parts #6897

merged 36 commits into from
Dec 5, 2024

Conversation

matusdrobuliak66
Copy link
Contributor

@matusdrobuliak66 matusdrobuliak66 commented Dec 3, 2024 •
edited
Loading

What do these changes do?

  • ✨ Introduces license_goods -> This is a minimalistic version for frontend to be able to list and purchase VIP models (Iteratively, we will extend it based on the needs and new requirements.)
  • ✨ Additionally introduce also create/delete/update functions in DB layer -> that might be used in the future for admin center

Next steps:

  • store purchase licenses + decrease number of credits from wallet
  • implement checkout and release license seats

Related issue/s

How to test

Dev-ops checklist

@matusdrobuliak66 matusdrobuliak66 self-assigned this Dec 3, 2024
@matusdrobuliak66 matusdrobuliak66 added the a:webserver issue related to the webserver service label Dec 3, 2024
@matusdrobuliak66 matusdrobuliak66 added this to the Event Horizon milestone Dec 3, 2024
@codecov Codecov
Copy link

codecov bot commented Dec 3, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 97.37991% with 6 lines in your changes missing coverage. Please review.

Project coverage is 89.34%. Comparing base (cba896a) to head (038ea39).
Report is 1 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #6897      +/-   ##
==========================================
+ Coverage   88.32%   89.34%   +1.01%     
==========================================
  Files        1554     1379     -175     
  Lines       61234    54940    -6294     
  Branches     2093     1007    -1086     
==========================================
- Hits        54087    49087    -5000     
+ Misses       6814     5677    -1137     
+ Partials      333      176     -157
Flag Coverage Δ
integrationtests 65.11% <68.02%> (+0.02%) ⬆️
unittests 87.32% <97.37%> (+0.81%) ⬆️
Components Coverage Δ
api 78.42% <ø> (ø)
pkg_aws_library ∅ <ø> (∅)
pkg_dask_task_models_library ∅ <ø> (∅)
pkg_models_library 91.36% <100.00%> (+0.07%) ⬆️
pkg_notifications_library 84.57% <ø> (ø)
pkg_postgres_database 87.99% <100.00%> (+0.23%) ⬆️
pkg_service_integration 70.02% <ø> (ø)
pkg_service_library ∅ <ø> (∅)
pkg_settings_library ∅ <ø> (∅)
pkg_simcore_sdk 85.38% <ø> (ø)
agent 97.00% <ø> (ø)
api_server 89.86% <ø> (ø)
autoscaling 95.21% <ø> (ø)
catalog 90.57% <ø> (ø)
clusters_keeper 98.72% <ø> (ø)
dask_sidecar 91.26% <ø> (ø)
datcore_adapter 93.18% <ø> (ø)
director 76.40% <ø> (ø)
director_v2 91.37% <ø> (ø)
dynamic_scheduler 97.07% <ø> (ø)
dynamic_sidecar 89.75% <ø> (ø)
efs_guardian 90.12% <ø> (ø)
invitations 93.44% <ø> (ø)
osparc_gateway_server ∅ <ø> (∅)
payments 92.65% <ø> (ø)
resource_usage_tracker 89.07% <ø> (ø)
storage 89.66% <ø> (ø)
webclient ∅ <ø> (∅)
webserver 88.33% <96.51%> (+0.07%) ⬆️

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 cba896a...038ea39. Read the comment docs.

@matusdrobuliak66 matusdrobuliak66 changed the title WIP: ✨ Introduce vip models pricing 2 part WIP: ✨ Introduce vip models pricing 1/2 part Dec 4, 2024
@matusdrobuliak66 matusdrobuliak66 changed the title WIP: ✨ Introduce vip models pricing 1/2 part ✨ Introduce vip models pricing 1/2 part Dec 4, 2024
@matusdrobuliak66 matusdrobuliak66 marked this pull request as ready for review December 4, 2024 14:54
@matusdrobuliak66 matusdrobuliak66 changed the title ✨ Introduce vip models pricing 1/2 part ✨ Introduce vip models pricing 1 of 2 parts Dec 4, 2024
odeimaiz
odeimaiz reviewed Dec 4, 2024
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.

Let's go!!!

sanderegg
sanderegg approved these changes Dec 4, 2024
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.

So I will only ask it here once, and approve it as I do not want to start something huge with that but.

I would convert everywhere you have written license with licensed. Otherwise it sounds wrong.
Also I thing goods is something that is always plural and I have never heard anyone using a singular good.. Chatty tells me the same BTW.

I would also question the usage of shortUUID instead of using the plain UUID in the database (which postgres fully support).

Otherwise great!

api/specs/web-server/_license_goods.py Outdated Show resolved Hide resolved
packages/models-library/src/models_library/api_schemas_webserver/license_goods.py Outdated Show resolved Hide resolved
packages/models-library/src/models_library/license_goods.py Outdated Show resolved Hide resolved
packages/postgres-database/src/simcore_postgres_database/models/license_goods.py Outdated Show resolved Hide resolved
packages/postgres-database/src/simcore_postgres_database/utils_repos.py Outdated Show resolved Hide resolved
@sanderegg sanderegg mentioned this pull request Dec 5, 2024
Open
pcrespov
pcrespov approved these changes Dec 5, 2024
View reviewed changes
Copy link
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 and also recommendations for the rest API in the internal chat.

packages/postgres-database/src/simcore_postgres_database/utils_repos.py Outdated Show resolved Hide resolved
services/web/server/src/simcore_service_webserver/licenses/_license_goods_db.py Outdated Show resolved Hide resolved
GitHK
GitHK reviewed Dec 5, 2024
View reviewed changes
Copy link
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.

Looks OK to me

services/web/server/tests/unit/with_dbs/04/licenses/test_licensed_items_handlers.py Show resolved Hide resolved
@matusdrobuliak66 matusdrobuliak66 enabled auto-merge (squash) December 5, 2024 12:58
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 5, 2024

Quality Gate Passed Quality Gate passed

Issues
2 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

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 5, 2024

Quality Gate Passed Quality Gate passed

Issues
2 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 merged commit e05d046 into ITISFoundation:master Dec 5, 2024
88 of 89 checks passed
@matusdrobuliak66 matusdrobuliak66 deleted the introduce-vip-models-pricing-2-part branch December 5, 2024 14:43
@odeimaiz odeimaiz mentioned this pull request Dec 5, 2024
Merged
5 tasks
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Dec 10, 2024
Closed
17 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanderegg sanderegg sanderegg approved these changes

@odeimaiz odeimaiz odeimaiz left review comments

@GitHK GitHK GitHK left review comments

@pcrespov pcrespov pcrespov approved these changes

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

@bisgaard-itis bisgaard-itis Awaiting requested review from bisgaard-itis

Assignees

@matusdrobuliak66 matusdrobuliak66

Labels
a:webserver issue related to the webserver service
Projects
None yet
Milestone
Event Horizon
Development

Successfully merging this pull request may close these issues.
5 participants
@matusdrobuliak66 @GitHK @pcrespov @odeimaiz @sanderegg