diff --git a/engineapi/alembic/versions/71e888082a6d_leaderboard_metadata.py b/engineapi/alembic/versions/71e888082a6d_leaderboard_metadata.py index 37ad0604..27b96f56 100644 --- a/engineapi/alembic/versions/71e888082a6d_leaderboard_metadata.py +++ b/engineapi/alembic/versions/71e888082a6d_leaderboard_metadata.py @@ -1,7 +1,7 @@ """leaderboard metadata Revision ID: 71e888082a6d -Revises: 040f2dfde5a5 +Revises: cc80e886e153 Create Date: 2023-11-15 13:21:16.108399 """ @@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = "71e888082a6d" -down_revision = "040f2dfde5a5" +down_revision = "cc80e886e153" branch_labels = None depends_on = None @@ -36,10 +36,7 @@ def upgrade(): op.add_column( "leaderboards", sa.Column( - "columns_names", - postgresql.JSONB(astext_type=sa.Text()), - nullable=True, - server_default="{}", + "columns_names", postgresql.JSONB(astext_type=sa.Text()), nullable=True ), ) # ### end Alembic commands ### diff --git a/engineapi/engineapi/actions.py b/engineapi/engineapi/actions.py index bc597fbc..8df73261 100644 --- a/engineapi/engineapi/actions.py +++ b/engineapi/engineapi/actions.py @@ -1573,7 +1573,6 @@ def update_leaderboard( wallet_connect: Optional[bool], blockchain_ids: Optional[List[int]], columns_names: Optional[ColumnsNames], - delete_names, ) -> Leaderboard: """ Update a leaderboard diff --git a/engineapi/engineapi/data.py b/engineapi/engineapi/data.py index 99fadbec..9830427e 100644 --- a/engineapi/engineapi/data.py +++ b/engineapi/engineapi/data.py @@ -370,7 +370,7 @@ class ColumnsNames(BaseModel): address: Optional[str] = None score: Optional[str] = None points_data: Optional[str] = None - points_data_fields: Dict[str, str] = Field(default_factory=dict) + points_data_fields: Optional[Dict[str, str]] = None class Leaderboard(BaseModel): @@ -380,7 +380,7 @@ class Leaderboard(BaseModel): resource_id: Optional[UUID] = None wallet_connect: bool = False blockchain_ids: List[int] = Field(default_factory=list) - columns_names: ColumnsNames = Field(default_factory=ColumnsNames) + columns_names: Optional[ColumnsNames] = None created_at: datetime updated_at: datetime diff --git a/engineapi/engineapi/models.py b/engineapi/engineapi/models.py index febb5679..9e384f27 100644 --- a/engineapi/engineapi/models.py +++ b/engineapi/engineapi/models.py @@ -350,7 +350,7 @@ class Leaderboard(Base): # type: ignore blockchain_ids = Column(ARRAY(Integer), nullable=False, default=[]) wallet_connect = Column(Boolean, default=False, nullable=False) - columns_names = Column(JSONB, nullable=True, default={}) + columns_names = Column(JSONB, nullable=True) created_at = Column( DateTime(timezone=True), server_default=utcnow(), nullable=False )