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.

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

♻️ RUT: add pricing plan LICENSE type 🗃️ #6922

Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3bd4e3b
refactor RUT to use new transactional context
matusdrobuliak66 Dec 1, 2024
fd4a43f
fix
matusdrobuliak66 Dec 1, 2024
f5b73d7
Merge branch 'master' into introduce-vip-models-pricing
matusdrobuliak66 Dec 2, 2024
936027e
Merge branch 'master' into introduce-vip-models-pricing
matusdrobuliak66 Dec 2, 2024
88fdede
Merge branch 'master' into introduce-vip-models-pricing
matusdrobuliak66 Dec 2, 2024
5d0c6f7
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 3, 2024
20fa686
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 3, 2024
561c284
adding shortuuid
matusdrobuliak66 Dec 3, 2024
9f060de
add license db tables
matusdrobuliak66 Dec 3, 2024
6f9c844
upgrade postgres package - shortuuid
matusdrobuliak66 Dec 3, 2024
c296b0d
upgrade postgres package - shortuuid
matusdrobuliak66 Dec 3, 2024
af4642b
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 3, 2024
00fce00
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 4, 2024
bc83eb0
license goods DB layer
matusdrobuliak66 Dec 4, 2024
f2113ec
exeption handling
matusdrobuliak66 Dec 4, 2024
e570beb
open api specs
matusdrobuliak66 Dec 4, 2024
60b3132
adding db test
matusdrobuliak66 Dec 4, 2024
10988aa
remove db migration:
matusdrobuliak66 Dec 4, 2024
9b24815
add db migration:
matusdrobuliak66 Dec 4, 2024
28c86ff
open api specs
matusdrobuliak66 Dec 4, 2024
03c5f08
adding db test
matusdrobuliak66 Dec 4, 2024
e6c8d5c
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 4, 2024
d0107ad
fix naming
matusdrobuliak66 Dec 4, 2024
44fbf75
open api specs
matusdrobuliak66 Dec 4, 2024
deeb0f1
fix test
matusdrobuliak66 Dec 4, 2024
fb06946
propagate downstream dependencies everywhere
matusdrobuliak66 Dec 4, 2024
8c00993
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 5, 2024
b8c918b
PR reviews
matusdrobuliak66 Dec 5, 2024
c629b0a
PR reviews
matusdrobuliak66 Dec 5, 2024
50204c3
fix test
matusdrobuliak66 Dec 5, 2024
68ecfe5
fix test
matusdrobuliak66 Dec 5, 2024
9896a91
PR reviews
matusdrobuliak66 Dec 5, 2024
f919e4c
remove shortuuid
matusdrobuliak66 Dec 5, 2024
519c2ed
fix
matusdrobuliak66 Dec 5, 2024
894b636
Merge branch 'master' into introduce-vip-models-pricing-2-part
matusdrobuliak66 Dec 5, 2024
038ea39
fix
matusdrobuliak66 Dec 5, 2024
78021f1
merge master
matusdrobuliak66 Dec 9, 2024
54ee485
adding LICENSE enum to RUT
matusdrobuliak66 Dec 9, 2024
1bc8052
open api specs
matusdrobuliak66 Dec 9, 2024
cba460c
Merge branch 'master' into introduce-vip-models-pricing-3-part
matusdrobuliak66 Dec 9, 2024
28af882
migration
matusdrobuliak66 Dec 9, 2024
61abd1c
migration
matusdrobuliak66 Dec 9, 2024
7dc1a38
Merge branch 'master' into introduce-vip-models-pricing-3-part
matusdrobuliak66 Dec 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class CreditClassification(StrAutoEnum):

class PricingPlanClassification(StrAutoEnum):
TIER = auto()
LICENSE = auto()
matusdrobuliak66 marked this conversation as resolved.
Show resolved Hide resolved


class PricingInfo(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"""add LICENSE type to pricing plan

Revision ID: 4d007819e61a
Revises: 38c9ac332c58
Create Date: 2024-12-09 14:25:45.024814+00:00

"""
import sqlalchemy as sa
from alembic import op

# revision identifiers, used by Alembic.
revision = "4d007819e61a"
down_revision = "38c9ac332c58"
branch_labels = None
depends_on = None


def upgrade():
op.execute(sa.DDL("ALTER TYPE pricingplanclassification ADD VALUE 'LICENSE'"))


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class PricingPlanClassification(str, enum.Enum):
"""

TIER = "TIER"
LICENSE = "LICENSE"


resource_tracker_pricing_plans = sa.Table(
Expand Down
3 changes: 2 additions & 1 deletion services/api-server/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -6469,7 +6469,8 @@
"PricingPlanClassification": {
"type": "string",
"enum": [
"TIER"
"TIER",
"LICENSE"
],
"title": "PricingPlanClassification"
},
Expand Down
3 changes: 2 additions & 1 deletion services/resource-usage-tracker/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@
"PricingPlanClassification": {
"type": "string",
"enum": [
"TIER"
"TIER",
"LICENSE"
],
"title": "PricingPlanClassification"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11432,6 +11432,7 @@ components:
type: string
enum:
- TIER
- LICENSE
title: PricingPlanClassification
PricingPlanToServiceAdminGet:
properties:
Expand Down
Loading