libervia-backend: sat/memory/sqla

comparison sat/memory/sqla_mapping.py @ 3796:24c1c06c865b

core (memory/mapping): add `origin_id` column to History + constraints update: - `origin_id` is added as a column instead of being just in extra, as it an important data to filter on. - Add some constraints. - Add `serialise` method to Message and Subject.

author	Goffi <goffi@goffi.org>
date	Fri, 17 Jun 2022 14:15:23 +0200
parents	658ddbabaf36
children	fe4725bf42fb

comparison

equal deleted inserted replaced

-:967a8e109cda
+:24c1c06c865b
 # GNU Affero General Public License for more details.
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from typing import Dict, Any
+from datetime import datetime
+import enum
+import json
 import pickle
-import json
-from datetime import datetime
 import time
-import enum
 from sqlalchemy import (
-MetaData, Column, Integer, Text, Float, Boolean, DateTime, Enum, JSON, ForeignKey,
+Boolean,
-UniqueConstraint, Index, DDL, event
+Column,
+DDL,
+DateTime,
+Enum,
+Float,
+ForeignKey,
+Index,
+Integer,
+JSON,
+MetaData,
+Text,
+UniqueConstraint,
+event,
 )
 from sqlalchemy.orm import declarative_base, relationship
+from sqlalchemy.sql.functions import now
 from sqlalchemy.types import TypeDecorator
-from sqlalchemy.sql.functions import now
 from twisted.words.protocols.jabber import jid
 from wokkel import generic
 Base = declarative_base(
 }
 )
 )
 # keys which are in message data extra but not stored in extra field this is
 # because those values are stored in separate fields
-NOT_IN_EXTRA = ('stanza_id', 'received_timestamp', 'update_uid')
+NOT_IN_EXTRA = ('origin_id', 'stanza_id', 'received_timestamp', 'update_uid')
 class SyncState(enum.Enum):
 #: synchronisation is currently in progress
 IN_PROGRESS = 1
 class History(Base):
 __tablename__ = "history"
 __table_args__ = (
 UniqueConstraint("profile_id", "stanza_id", "source", "dest"),
+UniqueConstraint("profile_id", "origin_id", "source", name="uq_origin_id"),
 Index("history__profile_id_timestamp", "profile_id", "timestamp"),
 Index(
 "history__profile_id_received_timestamp", "profile_id", "received_timestamp"
 )
 )
 uid = Column(Text, primary_key=True)
+origin_id = Column(Text)
 stanza_id = Column(Text)
 update_uid = Column(Text)
 profile_id = Column(ForeignKey("profiles.id", ondelete="CASCADE"))
 source = Column(Text)
 dest = Column(Text)
 dt = datetime.fromtimestamp(self.timestamp)
 return f"History<{self.source_jid.full()}->{self.dest_jid.full()} [{dt}]>"
 def serialise(self):
 extra = self.extra
+if self.origin_id is not None:
+extra["origin_id"] = self.origin_id
 if self.stanza_id is not None:
 extra["stanza_id"] = self.stanza_id
 if self.update_uid is not None:
 extra["update_uid"] = self.update_uid
 if self.received_timestamp is not None:
 id = Column(
 Integer,
 primary_key=True,
 )
-history_uid = Column(ForeignKey("history.uid", ondelete="CASCADE"))
+history_uid = Column(ForeignKey("history.uid", ondelete="CASCADE"), nullable=False)
-message = Column(Text)
+message = Column(Text, nullable=False)
 language = Column(Text)
+def serialise(self) -> Dict[str, Any]:
+s = {}
+if self.message:
+s["message"] = str(self.message)
+if self.language:
+s["language"] = str(self.language)
+return s
 def __repr__(self):
 lang_str = f"[{self.language}]" if self.language else ""
 msg = f"{self.message[:20]}…" if len(self.message)>20 else self.message
 content = f"{lang_str}{msg}"
 id = Column(
 Integer,
 primary_key=True,
 )
-history_uid = Column(ForeignKey("history.uid", ondelete="CASCADE"))
+history_uid = Column(ForeignKey("history.uid", ondelete="CASCADE"), nullable=False)
-subject = Column(Text)
+subject = Column(Text, nullable=False)
 language = Column(Text)
+def serialise(self) -> Dict[str, Any]:
+s = {}
+if self.subject:
+s["subject"] = str(self.subject)
+if self.language:
+s["language"] = str(self.language)
+return s
 def __repr__(self):
 lang_str = f"[{self.language}]" if self.language else ""
 msg = f"{self.subject[:20]}…" if len(self.subject)>20 else self.subject
 content = f"{lang_str}{msg}"

Mercurial > libervia-backend

comparison sat/memory/sqla_mapping.py @ 3796:24c1c06c865b