Skip to content

Сделал проверку на формат JSON в additional_data #25

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

Merged
Zimovchik merged 2 commits into from
Dec 2, 2025
Merged

Сделал проверку на формат JSON в additional_data #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8cf503
Сделал проверку на формат JSON в additional_data
petrCher Nov 27, 2025
19741eb
added json format to schemas
petrCher Nov 29, 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
38 changes: 22 additions & 16 deletions marketing_api/models/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import enum
from datetime import datetime

import sqlalchemy as sa
from sqlalchemy import Column
from sqlalchemy.orm import relationship
from sqlalchemy import (
JSON,
DateTime,
Integer,
String,
)
from sqlalchemy.orm import Mapped, mapped_column, relationship

from .base import Base

Expand All @@ -16,12 +20,14 @@ class Actions(str, enum.Enum):


class User(Base):
id = Column(sa.Integer, primary_key=True)
union_number = Column(sa.String, nullable=True)
user_agent = Column(sa.String, nullable=True)
auth_user_id = Column(sa.Integer, nullable=True)
modify_ts = Column(sa.DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow)
create_ts = Column(sa.DateTime, nullable=False, default=datetime.utcnow)
id: Mapped[int] = mapped_column(Integer, primary_key=True)
union_number: Mapped[str | None] = mapped_column(String, nullable=True)
user_agent: Mapped[str | None] = mapped_column(String, nullable=True)
auth_user_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
modify_ts: Mapped[datetime] = mapped_column(
DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
)
create_ts: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=datetime.utcnow)

actions = relationship(
"ActionsInfo",
Expand All @@ -37,13 +43,13 @@ def __repr__(self):
class ActionsInfo(Base):
"""Actions from user"""

id = Column(sa.Integer, primary_key=True)
user_id = Column(sa.Integer, nullable=True)
action = Column(sa.String, nullable=False)
path_from = Column(sa.String, nullable=True)
path_to = Column(sa.String, nullable=True)
additional_data = Column(sa.String, nullable=True)
create_ts = Column(sa.DateTime, nullable=False, default=datetime.utcnow)
id: Mapped[int] = mapped_column(Integer, primary_key=True)
user_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
action: Mapped[str] = mapped_column(String, nullable=False)
path_from: Mapped[str | None] = mapped_column(String, nullable=True)
path_to: Mapped[str | None] = mapped_column(String, nullable=True)
additional_data: Mapped[dict | None] = mapped_column(JSON, nullable=True)
create_ts: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=datetime.utcnow)

user = relationship(
User, primaryjoin="foreign(ActionsInfo.user_id)==User.id", uselist=False, back_populates="actions"
Expand Down
2 changes: 1 addition & 1 deletion marketing_api/routes/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class Base(BaseModel):
class ActionInfo(Base):
user_id: int | None = None
action: str
additional_data: str | None = None
additional_data: dict | list[dict] | None = None
path_from: str | None = None
path_to: str | None = None

Expand Down
39 changes: 39 additions & 0 deletions migrations/versions/413b6371014e_new_version_sqlachemy_updates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"""New version sqlachemy updates

Revision ID: 413b6371014e
Revises: 0ea7185ac58b
Create Date: 2025-11-27 22:27:15.710601

"""

import sqlalchemy as sa
from alembic import op


# revision identifiers, used by Alembic.
revision = '413b6371014e'
down_revision = '0ea7185ac58b'
branch_labels = None
depends_on = None


def upgrade():
op.alter_column(
'actions_info',
'additional_data',
existing_type=sa.VARCHAR(),
type_=sa.JSON(),
existing_nullable=True,
postgresql_using='additional_data::json',
)


def downgrade():
op.alter_column(
'actions_info',
'additional_data',
existing_type=sa.JSON(),
type_=sa.VARCHAR(),
existing_nullable=True,
postgresql_using='additional_data::text',
)