From ebc34e396d0db35a732a47cbfa5110a82b184fe4 Mon Sep 17 00:00:00 2001
From: Tobias Kurze <kurze.tobias@googlemail.com>
Date: Fri, 22 Mar 2019 16:38:42 +0100
Subject: [PATCH] slightly changed user model (sort of fix)

---
 app.db               | Bin 69632 -> 69632 bytes
 manage.py            |   0
 models/user_model.py |  10 +++++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 manage.py

diff --git a/app.db b/app.db
index 1938231c792f73adfc58f23c5af33e926346fffc..9b2603136d37b8d5c60fad956f9a22f63981065c 100644
GIT binary patch
delta 1296
zcmd6l&u`LT7{~k4x0Dvz0uw9#0u6EECiVw}LHvad$lL@4bs7&?LN%R(DPsx;gEb!1
zgAw09K%++w&g^DfqA@XM2eX*yWmgZom>3Tl6Qh>0nM`qKo4(Kc_WAMYH_!WAy$`S6
zhj-SyEgLWla~W&tv8-+NOCiG>65@<w4s#OEF!nQ>W#*Z~j<@!wj+@kky+y6Hy|8IE
zFL}~>n|Su5B@j^0I!V-PeFOD0N1|`mS5V)}lISHl>&q}!zSjdLv`R^>YxTm^q*^Vg
zWknlrpIG#m5(6h3R$lagsTDbAwd!Q8P*KWiJCQ+<4#T|N%A?)%X5c`lX$g+f#%GJ(
z1nlTB9bI?bXCrx!2i(|FQ;OqeS-X@%Kj?*xYF#N`7*`7=rKS|Lnp!SsCI3+7STdc=
zp?CH<q2EtascbGel+O5vlc%<KD+u~?$y73z%p6SSk-)7XwNj7{_EPAfV;e#1BUTb!
zxAg%MP229leWal-PwjTwjP|w{)*wiJ-!7oL(1K$<sxcm5MYos(w2r|}z-I;!>j8w(
z7#=-mC3poVdGy{P1GwaJBbnI@b-#r~^UMK&8;Gsw6XQZDHVCiT0Xg%9r7zw+16hLg
zVB9n}%6@03S<j5iiL*_89nraQZ(9+j_a+ipsirAaH4q6@C#EW;$vqJ{A_ziY?5MCy
zXpAY@Vog1FUTg$1xll2YzK}REI5wC|6-U#TYO!KoZREx;4VMlduL?ui%Oe%_$l2kL
zB#5z{g1l3b{Gt>ON8@5RG$0Jbnz3m2P)v{`hoI9G)zh(tGEGs9cV&efi;J<47?tI)
z{I5t<I)!&weJ0Cmu#{3+t2FnUTgVtj^HBd6VKw%srNa)IY<`*j8*P%igPW_X&VUY?
zUrFu;6ytI<6c(dmY~YVyEk~rVOdA}6Tg15U+*j^1_mKmO#u&Wkc0e2hMBBi&!P~}y
z;~4c<!GDoIiy87iaP!<O_uA0^h#RDFFX)UdLE=5Y7!ufn_W`p}zwe=ryYb*3K8p?K
QDKm|k0Y`rN9-MLh0v;wbGynhq

delta 458
zcmYk2yGz1R6vyxF_kQ}IABrJG4Izb=7}>)iK^iTZg20R%1QkpJM~kRQ(#{aH<bPn~
z;?Q$(a42wSadBvhrlO{X&W(cZ;ln-W-0!*P-czpg<vL&WIBA~{;`qf*2<_J<gMQ5V
zr{)Yy6U^z|KU1pzEUv_*Tk%62YdY+w0<U*S7w&`y=5*jhY%}K`Hl%CjJi?7OK@E7(
z&RMtw6@5`K3E`sPl|594usqEZGVlgjd6;TYkwaq`o&_wLPv^E%rF1E=TS)CBGRZ<Q
zkxOP%EK=cF4zjWscoZ*HAgs)~@e{8u%c6&C#pG7zN5`}h94S56SKG4c8<#}af(6IA
z8ycGGl<}VoT%11=pnF5m(>?HR3{nwfbD4E$z>^-L0%%55#W3VrM_uek*D@V&U^*y|
zhojIk=TT2<uxiXu4$FOTVT`bp+59xs{N)J0+2mKghHEQQ#D*<#!i4QO4Z=pQBN~Ej
Wh=Q<}Nr;FD2wp`vWB})WW%~vwwrOSn

diff --git a/manage.py b/manage.py
old mode 100644
new mode 100755
diff --git a/models/user_model.py b/models/user_model.py
index 035a85c..0cf9ad1 100644
--- a/models/user_model.py
+++ b/models/user_model.py
@@ -38,7 +38,8 @@ class User(UserMixin, db.Model):
     lang = db.Column(db.String(16), index=False, unique=False)
     timezone = db.Column(db.String(32), index=False, unique=False)
     posts = db.relationship('Post', backref='author', lazy='dynamic')
-    example_data_item = db.relationship('ExampleDataItem', backref='owner', lazy='dynamic')
+    example_data_item = db.relationship('ExampleDataItem', backref='owner')
+    example_data_item_id = db.Column(db.ForeignKey(ExampleDataItem.id))
     about_me = db.Column(db.String(140))
     role = db.Column(db.String(64))
     password = db.Column(db.String(255), nullable=True)
@@ -58,6 +59,10 @@ class User(UserMixin, db.Model):
                                backref=db.backref('followers', lazy='dynamic'),
                                lazy='dynamic')
 
+    def __init__(self, email, password):
+        self.email = email
+        self.password = sha256_crypt.encrypt(password)
+
     @staticmethod
     def get_by_identifier(identifier):
         """
@@ -297,6 +302,9 @@ class User(UserMixin, db.Model):
         return Post.query.join(followers, (followers.c.followed_id == Post.user_id)).filter(
             followers.c.follower_id == self.id).order_by(Post.timestamp.desc())
 
+    def to_dict(self):
+        return dict(id=self.id, email=self.email)
+
     def __repr__(self):
         return '<User %r>' % self.nickname