- Improvement of Entitlements Domain

- Introduction of LicensePeriod
  - Introduction of Payments
  - Introduction of Invoices
- Services definitions for Entitlements Domain
This commit is contained in:
Josako
2025-05-16 09:06:13 +02:00
parent 1b1eef0d2e
commit b4f7b210e0
15 changed files with 717 additions and 201 deletions

View File

@@ -0,0 +1,104 @@
"""add Payments & Invoices to Entitlements Domain
Revision ID: 26e20f27d399
Revises: fa6113ce4306
Create Date: 2025-05-13 15:54:51.069984
"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql
# revision identifiers, used by Alembic.
revision = '26e20f27d399'
down_revision = 'fa6113ce4306'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('license_period',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('license_id', sa.Integer(), nullable=False),
sa.Column('period_number', sa.Integer(), nullable=False),
sa.Column('period_start', sa.Date(), nullable=False),
sa.Column('period_end', sa.Date(), nullable=False),
sa.Column('status', sa.Enum('UPCOMING', 'PENDING', 'ACTIVE', 'COMPLETED', 'INVOICED', 'CLOSED', name='periodstatus'), nullable=False),
sa.Column('upcoming_at', sa.DateTime(), nullable=True),
sa.Column('pending_at', sa.DateTime(), nullable=True),
sa.Column('active_at', sa.DateTime(), nullable=True),
sa.Column('completed_at', sa.DateTime(), nullable=True),
sa.Column('invoiced_at', sa.DateTime(), nullable=True),
sa.Column('closed_at', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.Column('created_by', sa.Integer(), nullable=True),
sa.Column('updated_by', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['created_by'], ['public.user.id'], ),
sa.ForeignKeyConstraint(['license_id'], ['public.license.id'], ),
sa.ForeignKeyConstraint(['updated_by'], ['public.user.id'], ),
sa.PrimaryKeyConstraint('id'),
schema='public'
)
op.create_table('payment',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('license_period_id', sa.Integer(), nullable=True),
sa.Column('payment_type', sa.Enum('PREPAID', 'POSTPAID', name='paymenttype'), nullable=False),
sa.Column('amount', sa.Numeric(precision=10, scale=2), nullable=False),
sa.Column('currency', sa.String(length=3), nullable=False),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('status', sa.Enum('PENDING', 'PAID', 'FAILED', 'CANCELLED', name='paymentstatus'), nullable=False),
sa.Column('external_payment_id', sa.String(length=255), nullable=True),
sa.Column('payment_method', sa.String(length=50), nullable=True),
sa.Column('provider_data', postgresql.JSONB(astext_type=sa.Text()), nullable=True),
sa.Column('paid_at', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.Column('created_by', sa.Integer(), nullable=True),
sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.Column('updated_by', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['created_by'], ['public.user.id'], ),
sa.ForeignKeyConstraint(['license_period_id'], ['public.license_period.id'], ),
sa.ForeignKeyConstraint(['updated_by'], ['public.user.id'], ),
sa.PrimaryKeyConstraint('id'),
schema='public'
)
op.create_table('invoice',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('license_period_id', sa.Integer(), nullable=False),
sa.Column('payment_id', sa.Integer(), nullable=True),
sa.Column('invoice_type', sa.Enum('PREPAID', 'POSTPAID', name='paymenttype'), nullable=False),
sa.Column('invoice_number', sa.String(length=50), nullable=False),
sa.Column('invoice_date', sa.Date(), nullable=False),
sa.Column('due_date', sa.Date(), nullable=False),
sa.Column('amount', sa.Numeric(precision=10, scale=2), nullable=False),
sa.Column('currency', sa.String(length=3), nullable=False),
sa.Column('tax_amount', sa.Numeric(precision=10, scale=2), nullable=True),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('status', sa.Enum('DRAFT', 'SENT', 'PAID', 'OVERDUE', 'CANCELLED', name='invoicestatus'), nullable=False),
sa.Column('sent_at', sa.DateTime(), nullable=True),
sa.Column('paid_at', sa.DateTime(), nullable=True),
sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.Column('created_by', sa.Integer(), nullable=True),
sa.Column('updated_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
sa.Column('updated_by', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['created_by'], ['public.user.id'], ),
sa.ForeignKeyConstraint(['license_period_id'], ['public.license_period.id'], ),
sa.ForeignKeyConstraint(['payment_id'], ['public.payment.id'], ),
sa.ForeignKeyConstraint(['updated_by'], ['public.user.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('invoice_number'),
schema='public'
)
with op.batch_alter_table('license_usage', schema=None) as batch_op:
batch_op.add_column(sa.Column('license_period_id', sa.Integer(), nullable=False))
batch_op.create_foreign_key(None, 'license_period', ['license_period_id'], ['id'], referent_schema='public')
# ### end Alembic commands ###
def downgrade():
pass
# ### commands auto generated by Alembic - please adjust! ###
# ### end Alembic commands ###

View File

@@ -0,0 +1,33 @@
"""Correct usages relationship error in EntitlementsDomain
Revision ID: 638c4718005d
Revises: 26e20f27d399
Create Date: 2025-05-13 16:24:10.469700
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '638c4718005d'
down_revision = '26e20f27d399'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('license_usage', schema=None) as batch_op:
batch_op.drop_constraint('license_usage_license_id_fkey', type_='foreignkey')
batch_op.drop_column('license_id')
batch_op.drop_column('period_end_date')
batch_op.drop_column('period_start_date')
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###

View File

@@ -0,0 +1,33 @@
"""replace License End Date with Nr of Periods
Revision ID: ef0aaf00f26d
Revises: 638c4718005d
Create Date: 2025-05-14 04:04:54.535439
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = 'ef0aaf00f26d'
down_revision = '638c4718005d'
branch_labels = None
depends_on = None
def upgrade():
with op.batch_alter_table('license', schema=None) as batch_op:
# Add column with server default for existing rows
batch_op.add_column(sa.Column('nr_of_periods', sa.Integer(), nullable=False, server_default='12'))
batch_op.drop_column('end_date')
# Remove the server default after creation (optional)
with op.batch_alter_table('license', schema=None) as batch_op:
batch_op.alter_column('nr_of_periods', server_default=None)
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
pass
# ### end Alembic commands ###