extract profile

ki/models.py

@@ -9,25 +9,43 @@ from app import db
 class User(db.Model):
     __tablename__ = "user"
 
+    id = Column(Integer, primary_key=True)
+    auth_id = Column(String(50), nullable=False, unique=True)
+    profile_id = Column(Integer, ForeignKey("profile.id"), nullable=True)
+
+    tokens = relationship("Token", uselist=False, back_populates="user")
+    profile = relationship("Profile", back_populates="user")
+
+    def to_dict(self):
+        return {"id": self.id}
+
+
+class Profile(db.Model):
+    __tablename__ = "profile"
+
     id = Column(Integer, primary_key=True)
     nickname = Column(String(25), unique=True, nullable=False)
     pronouns = Column(String(25), default="")
     volunteerwork = Column(String(4000), default="")
     freetext = Column(String(4000), default="")
     created = Column(DateTime, nullable=False, default=datetime.now)
-    updated = Column(DateTime, onupdate=datetime.now, nullable=False, default=datetime.now)
-    auth_id = Column(String(50), nullable=False, unique=True)
+    updated = Column(DateTime,
+                     onupdate=datetime.now,
+                     nullable=False,
+                     default=datetime.now)
 
+    user = relationship("User", back_populates="profile", uselist=False)
     contacts = relationship("Contact")
-    address = relationship("Address", uselist=False, back_populates="user")
-    tokens = relationship("Token", uselist=False, back_populates="user")
-    skills = relationship("UserSkill", back_populates="user")
-    languages = relationship("UserLanguage", back_populates="user")
+    address = relationship("Address", uselist=False, back_populates="profile")
+    skills = relationship("ProfileSkill", back_populates="profile")
+    languages = relationship("ProfileLanguage", back_populates="profile")
 
     def to_dict(self):
         return {
-            "id": self.id,
-            "nickname": self.nickname
+            "nickname": self.nickname,
+            "pronouns": self.pronouns,
+            "volunteerwork": self.volunteerwork,
+            "freetext": self.freetext
         }
 
 
@@ -45,9 +63,11 @@ class Contact(db.Model):
     __tablename__ = "contact"
 
     id = Column(Integer, primary_key=True)
-    user_id = Column(Integer, ForeignKey("user.id"), nullable=False)
-    user = relationship("User", back_populates="contacts")
-    contacttype_id = Column(Integer, ForeignKey("contacttype.id"), nullable=False)
+    profile_id = Column(Integer, ForeignKey("profile.id"), nullable=False)
+    profile = relationship("Profile", back_populates="contacts")
+    contacttype_id = Column(Integer,
+                            ForeignKey("contacttype.id"),
+                            nullable=False)
     contacttype = relationship("ContactType")
     content = Column(String(200), nullable=False)
 
@@ -71,8 +91,8 @@ class Address(db.Model):
     city = Column(String(25), default="")
     country = Column(String(25), default="")
 
-    user_id = Column(Integer, ForeignKey("user.id"), nullable=False)
-    user = relationship("User", back_populates="address")
+    profile_id = Column(Integer, ForeignKey("profile.id"), nullable=False)
+    profile = relationship("Profile", back_populates="address")
 
 
 class Skill(db.Model):
@@ -81,21 +101,21 @@ class Skill(db.Model):
     id = Column(Integer, primary_key=True)
     name = Column(String(25), unique=True, nullable=False)
 
-    users = relationship("UserSkill", back_populates="skill")
+    profiles = relationship("ProfileSkill", back_populates="skill")
 
     def to_dict(self):
         return {"id": self.id, "name": self.name}
 
 
-class UserSkill(db.Model):
-    __tablename__ = "user_skill"
+class ProfileSkill(db.Model):
+    __tablename__ = "profile_skill"
 
-    user_id = Column(Integer, ForeignKey("user.id"), primary_key=True)
+    profile_id = Column(Integer, ForeignKey("profile.id"), primary_key=True)
     skill_id = Column(Integer, ForeignKey("skill.id"), primary_key=True)
     level = Column(SmallInteger, nullable=False)
 
-    user = relationship("User", back_populates="skills")
-    skill = relationship("Skill", back_populates="users")
+    profile = relationship("Profile", back_populates="skills")
+    skill = relationship("Skill", back_populates="profiles")
 
 
 class Language(db.Model):
@@ -104,18 +124,18 @@ class Language(db.Model):
     id = Column(String(2), primary_key=True)
     name = Column(String(25), nullable=False)
 
-    users = relationship("UserLanguage", back_populates="language")
+    profiles = relationship("ProfileLanguage", back_populates="language")
 
     def to_dict(self):
         return {"id": self.id, "name": self.name}
 
 
-class UserLanguage(db.Model):
-    __tablename__ = "user_language"
+class ProfileLanguage(db.Model):
+    __tablename__ = "profile_language"
 
-    user_id = Column(Integer, ForeignKey("user.id"), primary_key=True)
+    profile_id = Column(Integer, ForeignKey("profile.id"), primary_key=True)
     language_id = Column(Integer, ForeignKey("language.id"), primary_key=True)
     level = Column(SmallInteger, nullable=False)
 
-    user = relationship("User", back_populates="languages")
-    language = relationship("Language", back_populates="users")
+    profile = relationship("Profile", back_populates="languages")
+    language = relationship("Language", back_populates="profiles")

ki/routes.py

@@ -110,7 +110,12 @@ def get_user_profile(user_id):
     if user is None:
         return make_response({}, 404)
 
-    return make_response({"user": user.to_dict()})
+    profile = user.profile
+
+    if profile is None:
+        return make_response({}, 404)
+
+    return make_response({"profile": profile.to_dict()})
 
 
 @app.route("/skills")

ki/test/test_profile_endpoint.py

@@ -0,0 +1,59 @@
+from alembic import command
+import unittest
+import json
+
+from app import app, db, migrate
+from ki.commands import seed
+from ki.models import Profile, User
+
+
+class TestProfileEndpoint(unittest.TestCase):
+    def setUp(self):
+        app.debug = True
+        app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
+        self.client = app.test_client()
+
+        with app.app_context():
+            config = migrate.get_config()
+            command.upgrade(config, "head")
+
+        seed()
+
+    def test_get_profile(self):
+        user = User(auth_id="peter")
+        db.session.add(user)
+
+        profile = Profile(user=user)
+        profile.nickname = "Popeter"
+        db.session.add(profile)
+
+        db.session.commit()
+
+        login_data = {"username": "peter", "password": "geheim"}
+        login_response = self.client.post("/users/login",
+                                          data=json.dumps(login_data),
+                                          content_type="application/json")
+
+        self.assertEqual(login_response.status_code, 200)
+        self.assertIn("token", login_response.json)
+
+        response = self.client.get("/users/1/profile",
+                                   headers={
+                                       "Authorization":
+                                       "Bearer " + login_response.json["token"]
+                                   })
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            response.json, {
+                "profile": {
+                    "freetext": "",
+                    "nickname": "Popeter",
+                    "pronouns": "",
+                    "volunteerwork": ""
+                }
+            })
+
+
+if __name__ == "main":
+    unittest.main()