Skip to content

Fix type #192

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

Closed
KirKol30 wants to merge 6 commits into from
Closed

Fix type #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a758670
тип данных был изменен на корректный
Dec 2, 2025
a277c81
тип данных был изменен на корректный и применен black и isort
Dec 2, 2025
d95da3b
Merge remote-tracking branch 'origin/fix_type' into fix_type
Dec 12, 2025
e06cf92
тип данных был изменен на корректный и применен black и isort
Dec 12, 2025
aea9649
Merge remote-tracking branch 'origin/fix_type' into fix_type
Dec 12, 2025
b865392
исправлены поля и форматирование
Dec 12, 2025
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
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/dwh-definitions.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

273 changes: 273 additions & 0 deletions migrations/versions/20251202_1548_63a8db54129d_new_type_of_rating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,273 @@
"""new type of rating

Revision ID: 63a8db54129d
Revises: 3ac342622c64
Create Date: 2025-12-02 15:48:34.814526

"""

import os

import sqlalchemy as sa
from alembic import op
from sqlalchemy.dialects import postgresql


# revision identifiers, used by Alembic.
revision = '63a8db54129d'
down_revision = '3ac342622c64'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table_t comment('dm_strike', existing_comment='\n Витрина страйки\n ', schema='DM_RENTAL')
op.drop_index(op.f('lecturer_ts_idx'), table_name='lecturer', schema='DWH_RATING')
op.alter_column(
'git_hub',
'issue_id',
existing_type=sa.VARCHAR(),
type_=sa.Integer(),
comment='Идентификатор issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'user_id',
existing_type=sa.VARCHAR(),
type_=sa.Integer(),
comment='Идентификатор пользователя открывшего issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'repository_id',
existing_type=sa.VARCHAR(),
type_=sa.Integer(),
comment='Идентификатор репозитория',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'assignee_id',
existing_type=sa.VARCHAR(),
type_=sa.Integer(),
comment='Идентификатор назначенного исполнителем issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'assignee_login',
existing_type=sa.VARCHAR(),
type_=sa.Integer(),
comment='Логин назначенного исполнителем issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'organization_id',
existing_type=sa.VARCHAR(),
type_=sa.Integer(),
nullable=False,
comment='Идентификатор организации',
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub_username',
'username',
existing_type=sa.VARCHAR(),
comment='Имя пользователя GitHub',
existing_nullable=False,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'user_id',
existing_type=sa.INTEGER(),
comment='Идентификатор пользователя',
existing_nullable=False,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'source',
existing_type=sa.VARCHAR(),
comment='Источник данных',
existing_nullable=False,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'created',
existing_type=postgresql.TIMESTAMP(),
comment='Дата создания записи',
existing_nullable=True,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'modified',
existing_type=postgresql.TIMESTAMP(),
comment='Дата последнего изменения записи',
existing_nullable=True,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'is_deleted',
existing_type=sa.BOOLEAN(),
comment='Флаг удаления записи',
existing_nullable=True,
schema='ODS_USERDATA',
)
op.alter_column(
'union_member',
'middle_name',
existing_type=sa.VARCHAR(),
comment='Отчество пользователя',
existing_nullable=True,
schema='STG_UNION_MEMBER',
)
op.drop_column('union_member', 'card', schema='STG_UNION_MEMBER')
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column(
'union_member', sa.Column('card', sa.VARCHAR(), autoincrement=False, nullable=True), schema='STG_UNION_MEMBER'
)
op.alter_column(
'union_member',
'middle_name',
existing_type=sa.VARCHAR(),
comment=None,
existing_comment='Отчество пользователя',
existing_nullable=True,
schema='STG_UNION_MEMBER',
)
op.alter_column(
'git_hub_username',
'is_deleted',
existing_type=sa.BOOLEAN(),
comment=None,
existing_comment='Флаг удаления записи',
existing_nullable=True,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'modified',
existing_type=postgresql.TIMESTAMP(),
comment=None,
existing_comment='Дата последнего изменения записи',
existing_nullable=True,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'created',
existing_type=postgresql.TIMESTAMP(),
comment=None,
existing_comment='Дата создания записи',
existing_nullable=True,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'source',
existing_type=sa.VARCHAR(),
comment=None,
existing_comment='Источник данных',
existing_nullable=False,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'user_id',
existing_type=sa.INTEGER(),
comment=None,
existing_comment='Идентификатор пользователя',
existing_nullable=False,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub_username',
'username',
existing_type=sa.VARCHAR(),
comment=None,
existing_comment='Имя пользователя GitHub',
existing_nullable=False,
schema='ODS_USERDATA',
)
op.alter_column(
'git_hub',
'organization_id',
existing_type=sa.Integer(),
type_=sa.VARCHAR(),
nullable=True,
comment=None,
existing_comment='Идентификатор организации',
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'assignee_login',
existing_type=sa.Integer(),
type_=sa.VARCHAR(),
comment=None,
existing_comment='Логин назначенного исполнителем issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'assignee_id',
existing_type=sa.Integer(),
type_=sa.VARCHAR(),
comment=None,
existing_comment='Идентификатор назначенного исполнителем issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'repository_id',
existing_type=sa.Integer(),
type_=sa.VARCHAR(),
comment=None,
existing_comment='Идентификатор репозитория',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'user_id',
existing_type=sa.Integer(),
type_=sa.VARCHAR(),
comment=None,
existing_comment='Идентификатор пользователя открывшего issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.alter_column(
'git_hub',
'issue_id',
existing_type=sa.Integer(),
type_=sa.VARCHAR(),
comment=None,
existing_comment='Идентификатор issue',
existing_nullable=True,
schema='ODS_SOCIAL',
)
op.create_index(
op.f('lecturer_ts_idx'), 'lecturer', ['valid_from_dt', 'valid_to_dt'], unique=False, schema='DWH_RATING'
)
op.create_table_comment('dm_strike', '\n Витрина страйки\n ', existing_comment=None, schema='DM_RENTAL')
# ### end Alembic commands ###
10 changes: 6 additions & 4 deletions profcomff_definitions/DM/rating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ class DmLecturerCommentAct(Base):
lecturer_first_name: Mapped[str | None] = mapped_column(comment="Имя преподавателя")
lecturer_last_name: Mapped[str | None] = mapped_column(comment="Фамилия преподавателя")
lecturer_middle_name: Mapped[str | None] = mapped_column(comment="Отчество преподавателя")
mark_weighted: Mapped[int] = mapped_column(comment="Взвешенная оценка преподавателя", default=0, server_default="0")
mark_kindness_weighted: Mapped[int] = mapped_column(
mark_weighted: Mapped[float] = mapped_column(
comment="Взвешенная оценка преподавателя", default=0, server_default="0"
)
mark_kindness_weighted: Mapped[float] = mapped_column(
comment="Взвешенная доброта преподавателя", default=0, server_default="0"
)
mark_clarity_weighted: Mapped[int] = mapped_column(
mark_clarity_weighted: Mapped[float] = mapped_column(
comment="Взвешенная понятность преподавателя", default=0, server_default="0"
)
mark_freebie_weighted: Mapped[int] = mapped_column(
mark_freebie_weighted: Mapped[float] = mapped_column(
comment="Взвешенная халявность преподавателя", default=0, server_default="0"
)
rank: Mapped[int] = mapped_column(comment="Место в рейтинге", default=0, server_default="0")
Expand Down
Loading