From 4c86e74a6238ea17c5a9522be7735c75a217fb68 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 19 Apr 2025 18:37:28 +0300 Subject: [PATCH 1/3] create new table --- ...250315_1949_5edf7206774e_fix_redirector.py | 3 +- ...20250412_0002_f8908a4837a5_dm_marketing.py | 5 ++- ...1c_added_column_to_fetch_with_back_data.py | 3 +- ...0_2685b42bfef5_add_ods_telegram_viribus.py | 5 ++- ...50415_2154_40d72f2dd950_fix_viribus_ods.py | 4 +- .../20250416_0827_d43d62fb3748_fix_chat.py | 4 +- ...3_32d011e3d068_actions_info_incremental.py | 37 +++++++++++++++++++ profcomff_definitions/STG/marketing.py | 10 +++++ 8 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py diff --git a/migrations/versions/20250315_1949_5edf7206774e_fix_redirector.py b/migrations/versions/20250315_1949_5edf7206774e_fix_redirector.py index 08dab9e7..1ebc5189 100644 --- a/migrations/versions/20250315_1949_5edf7206774e_fix_redirector.py +++ b/migrations/versions/20250315_1949_5edf7206774e_fix_redirector.py @@ -6,9 +6,8 @@ """ -from alembic import op import sqlalchemy as sa -import os +from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/20250412_0002_f8908a4837a5_dm_marketing.py b/migrations/versions/20250412_0002_f8908a4837a5_dm_marketing.py index 2a0ea73e..a5deb70b 100644 --- a/migrations/versions/20250412_0002_f8908a4837a5_dm_marketing.py +++ b/migrations/versions/20250412_0002_f8908a4837a5_dm_marketing.py @@ -6,10 +6,11 @@ """ -from alembic import op -import sqlalchemy as sa import os +import sqlalchemy as sa +from alembic import op + # revision identifiers, used by Alembic. revision = 'f8908a4837a5' diff --git a/migrations/versions/20250412_1504_066fd36bb01c_added_column_to_fetch_with_back_data.py b/migrations/versions/20250412_1504_066fd36bb01c_added_column_to_fetch_with_back_data.py index 37422741..8a0c060f 100644 --- a/migrations/versions/20250412_1504_066fd36bb01c_added_column_to_fetch_with_back_data.py +++ b/migrations/versions/20250412_1504_066fd36bb01c_added_column_to_fetch_with_back_data.py @@ -6,9 +6,8 @@ """ -from alembic import op import sqlalchemy as sa -import os +from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/20250415_2140_2685b42bfef5_add_ods_telegram_viribus.py b/migrations/versions/20250415_2140_2685b42bfef5_add_ods_telegram_viribus.py index 899b9f6d..2bd34201 100644 --- a/migrations/versions/20250415_2140_2685b42bfef5_add_ods_telegram_viribus.py +++ b/migrations/versions/20250415_2140_2685b42bfef5_add_ods_telegram_viribus.py @@ -6,10 +6,11 @@ """ -from alembic import op -import sqlalchemy as sa import os +import sqlalchemy as sa +from alembic import op + # revision identifiers, used by Alembic. revision = '2685b42bfef5' diff --git a/migrations/versions/20250415_2154_40d72f2dd950_fix_viribus_ods.py b/migrations/versions/20250415_2154_40d72f2dd950_fix_viribus_ods.py index 826a3d94..561e8fd3 100644 --- a/migrations/versions/20250415_2154_40d72f2dd950_fix_viribus_ods.py +++ b/migrations/versions/20250415_2154_40d72f2dd950_fix_viribus_ods.py @@ -6,11 +6,11 @@ """ -from alembic import op import sqlalchemy as sa -import os +from alembic import op from sqlalchemy.dialects import postgresql + # revision identifiers, used by Alembic. revision = '40d72f2dd950' down_revision = '2685b42bfef5' diff --git a/migrations/versions/20250416_0827_d43d62fb3748_fix_chat.py b/migrations/versions/20250416_0827_d43d62fb3748_fix_chat.py index b9324fa2..a07e9531 100644 --- a/migrations/versions/20250416_0827_d43d62fb3748_fix_chat.py +++ b/migrations/versions/20250416_0827_d43d62fb3748_fix_chat.py @@ -6,10 +6,10 @@ """ -from alembic import op -import sqlalchemy as sa import os +from alembic import op + # revision identifiers, used by Alembic. revision = 'd43d62fb3748' diff --git a/migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py b/migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py new file mode 100644 index 00000000..d41cd758 --- /dev/null +++ b/migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py @@ -0,0 +1,37 @@ +"""actions info incremental + +Revision ID: 32d011e3d068 +Revises: d43d62fb3748 +Create Date: 2025-04-19 18:33:55.880870 + +""" + +import sqlalchemy as sa +from alembic import op + + +# revision identifiers, used by Alembic. +revision = '32d011e3d068' +down_revision = 'd43d62fb3748' +branch_labels = None +depends_on = None + + +def upgrade(): + op.create_table( + 'actions_info_incremental', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.Column('action', sa.String(), nullable=True), + sa.Column('path_from', sa.String(), nullable=True), + sa.Column('path_to', sa.String(), nullable=True), + sa.Column('additional_data', sa.String(), nullable=True), + sa.Column('create_ts', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id'), + schema='STG_MARKETING', + info={'sensitive': False}, + ) + + +def downgrade(): + op.drop_table('actions_info_incremental', schema='STG_MARKETING') diff --git a/profcomff_definitions/STG/marketing.py b/profcomff_definitions/STG/marketing.py index c007b967..f1bb746e 100644 --- a/profcomff_definitions/STG/marketing.py +++ b/profcomff_definitions/STG/marketing.py @@ -22,3 +22,13 @@ class ActionsInfo(Base): path_to: Mapped[str | None] additional_data: Mapped[str | None] create_ts: Mapped[datetime | None] + + +class ActionsInfoIncremental(Base): + id: Mapped[int] = mapped_column(primary_key=True) + user_id: Mapped[int | None] + action: Mapped[str | None] + path_from: Mapped[str | None] + path_to: Mapped[str | None] + additional_data: Mapped[str | None] + create_ts: Mapped[datetime | None] From 2df46a70ef4ebcb311e820c714bd0701872d9592 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 19 Apr 2025 19:39:50 +0300 Subject: [PATCH 2/3] add user incremental --- ...0419_1938_e8f40f2847f7_incremental_dag.py} | 26 ++++++++++++++----- profcomff_definitions/STG/marketing.py | 8 ++++++ 2 files changed, 28 insertions(+), 6 deletions(-) rename migrations/versions/{20250419_1833_32d011e3d068_actions_info_incremental.py => 20250419_1938_e8f40f2847f7_incremental_dag.py} (54%) diff --git a/migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py b/migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py similarity index 54% rename from migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py rename to migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py index d41cd758..b79c69d8 100644 --- a/migrations/versions/20250419_1833_32d011e3d068_actions_info_incremental.py +++ b/migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py @@ -1,17 +1,18 @@ -"""actions info incremental +"""incremental dag -Revision ID: 32d011e3d068 +Revision ID: e8f40f2847f7 Revises: d43d62fb3748 -Create Date: 2025-04-19 18:33:55.880870 +Create Date: 2025-04-19 19:38:15.637634 """ -import sqlalchemy as sa from alembic import op +import sqlalchemy as sa +import os # revision identifiers, used by Alembic. -revision = '32d011e3d068' +revision = 'e8f40f2847f7' down_revision = 'd43d62fb3748' branch_labels = None depends_on = None @@ -31,7 +32,20 @@ def upgrade(): schema='STG_MARKETING', info={'sensitive': False}, ) + op.create_table( + 'user_incremental', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('union_number', sa.String(), nullable=True), + sa.Column('user_agent', sa.String(), nullable=True), + sa.Column('auth_user_id', sa.Integer(), nullable=True), + sa.Column('modify_ts', sa.DateTime(), nullable=True), + sa.Column('create_ts', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id'), + schema='STG_MARKETING', + info={'sensitive': False}, + ) def downgrade(): - op.drop_table('actions_info_incremental', schema='STG_MARKETING') + op.drop_table('user_incremental', schema='STG_MARKETING') + op.drop_table('actions_info_incremental', schema='STG_MARKETING') \ No newline at end of file diff --git a/profcomff_definitions/STG/marketing.py b/profcomff_definitions/STG/marketing.py index f1bb746e..4285b3fc 100644 --- a/profcomff_definitions/STG/marketing.py +++ b/profcomff_definitions/STG/marketing.py @@ -23,6 +23,14 @@ class ActionsInfo(Base): additional_data: Mapped[str | None] create_ts: Mapped[datetime | None] +class UserIncremental(Base): + id: Mapped[int] = mapped_column(primary_key=True) + union_number: Mapped[str | None] + user_agent: Mapped[str | None] + auth_user_id: Mapped[int | None] + modify_ts: Mapped[datetime | None] + create_ts: Mapped[datetime | None] + class ActionsInfoIncremental(Base): id: Mapped[int] = mapped_column(primary_key=True) From 9aedb407a64e0ff4290541a2f2f133a0843afbaa Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 19 Apr 2025 19:43:08 +0300 Subject: [PATCH 3/3] lint --- .../versions/20250419_1938_e8f40f2847f7_incremental_dag.py | 5 ++--- profcomff_definitions/STG/marketing.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py b/migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py index b79c69d8..1e88e5a2 100644 --- a/migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py +++ b/migrations/versions/20250419_1938_e8f40f2847f7_incremental_dag.py @@ -6,9 +6,8 @@ """ -from alembic import op import sqlalchemy as sa -import os +from alembic import op # revision identifiers, used by Alembic. @@ -48,4 +47,4 @@ def upgrade(): def downgrade(): op.drop_table('user_incremental', schema='STG_MARKETING') - op.drop_table('actions_info_incremental', schema='STG_MARKETING') \ No newline at end of file + op.drop_table('actions_info_incremental', schema='STG_MARKETING') diff --git a/profcomff_definitions/STG/marketing.py b/profcomff_definitions/STG/marketing.py index 4285b3fc..2009dc23 100644 --- a/profcomff_definitions/STG/marketing.py +++ b/profcomff_definitions/STG/marketing.py @@ -23,6 +23,7 @@ class ActionsInfo(Base): additional_data: Mapped[str | None] create_ts: Mapped[datetime | None] + class UserIncremental(Base): id: Mapped[int] = mapped_column(primary_key=True) union_number: Mapped[str | None]