gryf/slack-backup
1
0
Fork 0
mirror of https://github.com/gryf/slack-backup.git synced 2025-12-17 11:30:25 +01:00
Code Issues Projects Releases Wiki Activity

added email field to Profile

Browse Source
This commit is contained in:
gryf
2016-11-21 09:36:12 +01:00
parent c3ae7607eb
commit 79cf5f1620
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slack_backup/objects.py
View File

@@ -104,10 +104,9 @@ class UserProfile(Base):
__tablename__ = "profiles" __tablename__ = "profiles"
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), index=True)
user = relationship("User", back_populates="profile")
avatar_hash = Column(Text) avatar_hash = Column(Text)
email = Column(Text)
first_name = Column(Text) first_name = Column(Text)
image_192 = Column(Text) image_192 = Column(Text)
image_24 = Column(Text) image_24 = Column(Text)
@@ -119,6 +118,9 @@ class UserProfile(Base):
real_name = Column(Text) real_name = Column(Text)
real_name_normalized = Column(Text) real_name_normalized = Column(Text)
user_id = Column(Integer, ForeignKey("users.id"), index=True)
user = relationship("User", back_populates="profile")
def __init__(self, data_dict=None): def __init__(self, data_dict=None):
self.update(data_dict) self.update(data_dict)
@@ -126,6 +128,7 @@ class UserProfile(Base):
data_dict = data_dict or {} data_dict = data_dict or {}
self.avatar_hash = data_dict.get('avatar_hash', '') self.avatar_hash = data_dict.get('avatar_hash', '')
self.email = data_dict.get("email", '')
self.first_name = data_dict.get('first_name', '') self.first_name = data_dict.get('first_name', '')
self.image_192 = data_dict.get('image_192', '') self.image_192 = data_dict.get('image_192', '')
self.image_24 = data_dict.get('image_24', '') self.image_24 = data_dict.get('image_24', '')
@@ -142,13 +145,13 @@ class User(Base):
__tablename__ = 'users' __tablename__ = 'users'
id = Column(Integer, primary_key=True) id = Column(Integer, primary_key=True)
slackid = Column(Text)
deleted = Column(Boolean, default=False) deleted = Column(Boolean, default=False)
name = Column(Text) name = Column(Text)
real_name = Column(Text) real_name = Column(Text)
slackid = Column(Text)
profile = relationship("UserProfile", uselist=False, back_populates="user")
channels = relationship("Channel", back_populates="creator") channels = relationship("Channel", back_populates="creator")
profile = relationship("UserProfile", uselist=False, back_populates="user")
purposes = relationship("Purpose", back_populates="creator") purposes = relationship("Purpose", back_populates="creator")
topics = relationship("Topic", back_populates="creator") topics = relationship("Topic", back_populates="creator")
@@ -158,10 +161,10 @@ class User(Base):
def update(self, data_dict=None): def update(self, data_dict=None):
data_dict = data_dict or {} data_dict = data_dict or {}
self.slackid = data_dict.get('id', '')
self.deleted = data_dict.get('deleted', False) self.deleted = data_dict.get('deleted', False)
self.name = data_dict.get("name", '') self.name = data_dict.get("name", '')
self.real_name = data_dict.get('real_name', '') self.real_name = data_dict.get('real_name', '')
self.slackid = data_dict.get('id', '')
if not self.profile: if not self.profile:
self.profile = UserProfile(data_dict.get('profile')) self.profile = UserProfile(data_dict.get('profile'))