From ddb554bc80b470b5fec1e85179010ee2867873bc Mon Sep 17 00:00:00 2001 From: user Date: Tue, 12 Mar 2024 15:29:13 +0300 Subject: [PATCH] dev@locazia: fix metadata --- app/api/routes/_blockchain.py | 1 - app/core/models/__init__.py | 1 + app/core/models/content/__init__.py | 1 + app/core/models/content/user_content.py | 25 +++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 app/core/models/content/__init__.py create mode 100644 app/core/models/content/user_content.py diff --git a/app/api/routes/_blockchain.py b/app/api/routes/_blockchain.py index e0d5b51..d2a60b0 100644 --- a/app/api/routes/_blockchain.py +++ b/app/api/routes/_blockchain.py @@ -120,7 +120,6 @@ async def s_api_v1_blockchain_send_new_content_message(request): begin_cell() .store_ref( begin_cell() - .store_uint(1, 8) .store_bytes(f"{PROJECT_HOST}/api/v1/storage/{metadata_content.cid.serialize_v2(include_accept_type=True)}".encode()) .end_cell() ) diff --git a/app/core/models/__init__.py b/app/core/models/__init__.py index b7cce26..e9c2a88 100644 --- a/app/core/models/__init__.py +++ b/app/core/models/__init__.py @@ -8,3 +8,4 @@ from app.core.models.user import User from app.core.models.wallet_connection import WalletConnection from app.core.models.messages import KnownTelegramMessage from app.core.models.user_activity import UserActivity +from app.core.models.content.user_content import UserContent diff --git a/app/core/models/content/__init__.py b/app/core/models/content/__init__.py new file mode 100644 index 0000000..c21899d --- /dev/null +++ b/app/core/models/content/__init__.py @@ -0,0 +1 @@ +from app.core.models.content.user_content import UserContent \ No newline at end of file diff --git a/app/core/models/content/user_content.py b/app/core/models/content/user_content.py new file mode 100644 index 0000000..0e75b6f --- /dev/null +++ b/app/core/models/content/user_content.py @@ -0,0 +1,25 @@ + +from sqlalchemy import Column, BigInteger, Integer, String, ForeignKey, DateTime, JSON, Boolean +from sqlalchemy.orm import relationship +from app.core.models.base import AlchemyBase + + +class UserContent(AlchemyBase): + __tablename__ = 'users_content' + + id = Column(Integer, autoincrement=True, primary_key=True) + type = Column(String(128), nullable=False) # 'license_issuer', 'license_listen' + onchain_address = Column(String(1024), nullable=True) # bind by this + updated = Column(DateTime, nullable=False, default=0) + + content_id = Column(Integer, ForeignKey('node_storage.id'), nullable=True) + created = Column(DateTime, nullable=False, default=0) + + meta = Column(JSON, nullable=False, default={}) + user_id = Column(Integer, ForeignKey('users.id'), nullable=False) + wallet_connection_id = Column(Integer, ForeignKey('wallet_connections.id'), nullable=True) + status = Column(String(64), nullable=False, default='active') # 'transaction_requested' + + user = relationship('User', uselist=False, foreign_keys=[user_id]) + wallet_connection = relationship('WalletConnection', uselist=False, foreign_keys=[wallet_connection_id]) + content = relationship('StoredContent', uselist=False, foreign_keys=[content_id])