add rest of the models

ki/models.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Table
 from sqlalchemy.orm import relationship
 
@@ -7,6 +9,11 @@ user_skill_table = Table("user_skill", db.Model.metadata,
                          Column("user_id", Integer, ForeignKey("user.id")),
                          Column("skill_id", Integer, ForeignKey("skill.id")))
 
+user_language_table = Table(
+    "user_language", db.Model.metadata,
+    Column("user_id", Integer, ForeignKey("user.id")),
+    Column("language_id", Integer, ForeignKey("language.id")))
+
 
 class User(db.Model):
     __tablename__ = "user"
@@ -16,11 +23,35 @@ class User(db.Model):
     pronouns = Column(String(25), default="")
     volunteerwork = Column(String(4000), default="")
     freetext = Column(String(4000), default="")
+    created = Column(DateTime, nullable=False)
+    updated = Column(DateTime, onupdate=datetime.now, nullable=False)
 
-    relationship("Address", uselist=False, back_populates="user")
+    contacts = relationship("Contact")
+    address = relationship("Address", uselist=False, back_populates="user")
     skills = relationship("Skill",
                           secondary=user_skill_table,
                           back_populates="users")
+    languages = relationship("Language",
+                             secondary=user_language_table,
+                             back_populates="users")
+
+
+class Contact(db.Model):
+    __tablename__ = "contact"
+
+    id = Column(Integer, primary_key=True)
+    user_id = Column(Integer, ForeignKey("user.id"))
+    user = relationship("User", back_populates="contacts")
+    contacttype_id = Column(Integer, ForeignKey("contacttype.id"))
+    contacttype = relationship("ContactType")
+    content = Column(String(200), nullable=False)
+
+
+class ContactType(db.Model):
+    __tablename__ = "contacttype"
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String(25), nullable=False)
 
 
 class Address(db.Model):
@@ -54,3 +85,7 @@ class Language(db.Model):
 
     id = Column(Integer, primary_key=True)
     name = Column(String(25), nullable=False)
+
+    users = relationship("User",
+                         secondary=user_language_table,
+                         back_populates="languages")