Added tags table + creation

Author: Seluj78

PyMatcha.postman_collection.json

@@ -1180,6 +1180,7 @@
 									"",
 									"tests[\"Is email correct\"] = response.email == user_email",
 									"tests[\"Is username correct\"] = response.username == user_username",
+									"tests[\"Are tags present\"] = response.tags.length == 7",
 									"",
 									"pm.collectionVariables.set(\"user_id\", response.id)"
 								],
@@ -1318,7 +1319,7 @@
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n\t\"orientation\": \"heterosexual\",\n\t\"bio\": \"Nunc faucibus velit metus, nec iaculis sem fringilla ut. Nullam vel vulputate diam. Vivamus vehicula, enim at hendrerit tincidunt, leo sapien maximus nisi, nec suscipit arcu nisi a turpis. Suspendisse rutrum quis quam et sollicitudin. Proin commodo justo non dui tempor, at maximus velit vulputate. Integer vitae porta nulla, ut congue est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin purus ex, venenatis vel aliquet a, interdum sit amet quam. Donec ac volutpat dui. In ornare augue in nisi efficitur varius. Donec hendrerit nunc a pulvinar posuere. Donec malesuada eros quam, eget pharetra nunc elementum in.\"\n}",
+							"raw": "{\n\t\"orientation\": \"heterosexual\",\n\t\"bio\": \"Nunc faucibus velit metus, nec iaculis sem fringilla ut. Nullam vel vulputate diam. Vivamus vehicula, enim at hendrerit tincidunt, leo sapien maximus nisi, nec suscipit arcu nisi a turpis. Suspendisse rutrum quis quam et sollicitudin. Proin commodo justo non dui tempor, at maximus velit vulputate. Integer vitae porta nulla, ut congue est. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin purus ex, venenatis vel aliquet a, interdum sit amet quam. Donec ac volutpat dui. In ornare augue in nisi efficitur varius. Donec hendrerit nunc a pulvinar posuere. Donec malesuada eros quam, eget pharetra nunc elementum in.\",\n\t\"tags\": [\n\t\t\"bot\",\n\t\t\"robot\",\n\t\t\"postman\",\n\t\t\"sex\",\n\t\t\"friends\",\n\t\t\"drink\",\n\t\t\"smoke\"\n\t\t]\n}",
 							"options": {
 								"raw": {
 									"language": "json"
@@ -1494,67 +1495,67 @@
 	],
 	"variable": [
 		{
-			"id": "f4dd475b-c423-4497-a1d7-826619651283",
+			"id": "b1180951-59af-4533-b1ef-89cba4c3a87b",
 			"key": "host",
 			"value": "http://127.0.0.1:5000",
 			"type": "string"
 		},
 		{
-			"id": "8d82efce-58a4-4ae6-be77-3f9a94c64aa4",
+			"id": "1515f3bd-a9b1-4a08-9c0f-21aa1933edc0",
 			"key": "user_id",
 			"value": "",
 			"type": "string"
 		},
 		{
-			"id": "54e97677-add0-44ce-b4de-08e78149669d",
+			"id": "0894f3b3-3d31-4bd0-a1b8-ab95c8078037",
 			"key": "user_email",
 			"value": "foo@example.org",
 			"type": "string"
 		},
 		{
-			"id": "f13b4302-ae17-4f05-bd3d-0092d7d0e988",
+			"id": "5211c78f-5d86-4bba-bf5e-e5654918b50d",
 			"key": "user_username",
 			"value": "bar",
 			"type": "string"
 		},
 		{
-			"id": "b71e8f9f-9932-4c65-b1b8-88bbe02146c2",
+			"id": "de2fec5e-d349-4fa4-bf7f-fae061264a71",
 			"key": "user_password",
 			"value": "admin",
 			"type": "string"
 		},
 		{
-			"id": "d567e6be-d3ae-418d-bc4a-a2b8ec7971a3",
+			"id": "c3ce41b9-6851-477f-b745-66b427934bc8",
 			"key": "user_firstname",
 			"value": "Foo",
 			"type": "string"
 		},
 		{
-			"id": "9f99c685-7bf2-4774-b694-c3fcebb92b84",
+			"id": "a25c1222-84ea-4d47-b8d3-f22a54d1d49f",
 			"key": "user_lastname",
 			"value": "Bar",
 			"type": "string"
 		},
 		{
-			"id": "34adee57-0702-4c96-9efb-58a80542d55d",
+			"id": "0568293c-5883-41e1-a684-f6dbaaf73623",
 			"key": "debug_token",
 			"value": "xX69jules69Xx",
 			"type": "string"
 		},
 		{
-			"id": "dcd1f01b-44a4-4750-a05c-af21292576b6",
+			"id": "aa8e48a3-11c0-48d9-bdab-4887c1d5b121",
 			"key": "user_access_token",
 			"value": "",
 			"type": "string"
 		},
 		{
-			"id": "633549e9-b8aa-42ed-8178-6a91d38961b8",
+			"id": "08788a8b-e5db-4841-9021-3f95c4fc0607",
 			"key": "user_refresh_token",
 			"value": "",
 			"type": "string"
 		},
 		{
-			"id": "b712d83c-9221-4571-9945-6fc52fcd167f",
+			"id": "26e146a6-35e0-4436-a1d5-bacc245090b3",
 			"key": "expired_token",
 			"value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTAyNDIyNjQsIm5iZiI6MTU5MDI0MjI2NCwianRpIjoiNTM0ZGI5NzQtOWE4Ni00MGViLWE1NDEtMDg3N2ZmNzQ3NDVhIiwiZXhwIjoxNTkwMjQyMzI0LCJpZGVudGl0eSI6eyJpZCI6NTEyLCJlbWFpbCI6ImZvb0BleGFtcGxlLm9yZyIsInVzZXJuYW1lIjoiYmFyIiwiaXNfb25saW5lIjp0cnVlLCJkYXRlX2xhc3RzZWVuIjoiU2F0LCAyMyBNYXkgMjAyMCAxMzo1Nzo0NCBHTVQifSwiZnJlc2giOnRydWUsInR5cGUiOiJhY2Nlc3MifQ.NTp2P0WNkXDwzuzrcNIQdeAfizQ57HQgkzBLSvY1yHU",
 			"type": "string"

backend/PyMatcha/models/tag.py

@@ -0,0 +1,51 @@
+"""
+    PyMatcha - A Python Dating Website
+    Copyright (C) 2018-2019 jlasne/gmorer
+    <jlasne@student.42.fr> - <gmorer@student.42.fr>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
+from __future__ import annotations
+
+import logging
+from typing import Dict
+
+from PyMatcha.utils import create_tags_table
+from PyMatcha.utils.orm import Field
+from PyMatcha.utils.orm import Model
+
+
+class Tag(Model):
+    table_name = "tags"
+
+    id = Field(int, modifiable=False)
+    user_id = Field(int)
+    name = Field(str)
+
+    def before_init(self, data):
+        pass
+
+    @staticmethod
+    def create(user_id: int, name="") -> Tag:
+        new_tag = Tag(user_id=user_id, name=name)
+        new_tag.save()
+        logging.debug("Creating new tag")
+        return new_tag
+
+    def get_all_info(self) -> Dict:
+        return {"id": self.id, "user_id": self.user_id, "name": self.name}
+
+    @classmethod
+    def create_table(cls):
+        create_tags_table(cls.db)

backend/PyMatcha/models/user.py

@@ -20,7 +20,6 @@
 
 import datetime
 import hashlib
-import json
 import logging
 from typing import Any
 from typing import Dict
@@ -31,6 +30,7 @@
 import PyMatcha.models.user_image as user_image
 from PyMatcha.errors import ConflictError
 from PyMatcha.errors import NotFoundError
+from PyMatcha.models.tag import Tag
 from PyMatcha.utils import create_user_table
 from PyMatcha.utils import hash_password
 from PyMatcha.utils.orm import Field
@@ -53,7 +53,6 @@ class User(Model):
     orientation = Field(str)
     birthdate = Field(datetime.date)
     geohash = Field(str)
-    tags = Field(dict)
     heat_score = Field(int)
     is_online = Field(bool)
     date_joined = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
@@ -86,7 +85,6 @@ def create(
         orientation: str,
         birthdate: datetime.date,
         geohash: str,
-        tags,
         heat_score: int = 0,
         is_online: bool = False,
         date_joined: datetime.datetime = datetime.datetime.utcnow(),
@@ -135,8 +133,6 @@ def create(
             logging.error("Geohash error: {}".format(e))
             raise e
 
-        # TODO: Check if all tags are set in tags
-
         # Encrypt password
         password = hash_password(password)
 
@@ -151,7 +147,6 @@ def create(
             orientation=orientation,
             birthdate=birthdate,
             geohash=geohash,
-            tags=str(json.dumps(tags)),
             heat_score=heat_score,
             is_online=is_online,
             date_joined=date_joined,
@@ -199,7 +194,6 @@ def register(email: str, username: str, password: str, first_name: str, last_nam
             orientation="bisexual",
             birthdate=None,
             geohash=None,
-            tags="",
             heat_score=0,
             is_online=False,
             date_joined=datetime.datetime.utcnow(),
@@ -220,21 +214,19 @@ def get_all_info(self) -> Dict:
             "last_name": self.last_name,
             "email": self.email,
             "username": self.username,
-            "password": self.password,
             "bio": self.bio,
             "gender": self.gender,
             "orientation": self.orientation,
             "birthdate": self.birthdate,
             "geohash": self.geohash,
-            "tags": json.loads(self.tags) if self.tags else "",  # TODO: Optimize this
+            "tags": [t.name for t in self.get_tags()],
             "heat_score": self.heat_score,
             "is_online": self.is_online,
             "date_joined": self.date_joined,
             "date_lastseen": self.date_lastseen,
             "is_profile_completed": self.is_profile_completed,
             "is_confirmed": self.is_confirmed,
             "confirmed_on": self.confirmed_on,
-            "previous_reset_token": self.previous_reset_token,
         }
 
     @classmethod
@@ -250,7 +242,7 @@ def get_images(self) -> List[UserImage]:
                 user_images.timestamp as timestamp, user_images.is_primary as is_primary
                 FROM users 
                 INNER JOIN user_images on users.id = user_images.user_id 
-                WHERE users.id = CAST({} AS INT)
+                WHERE users.id = CAST({} AS UNSIGNED)
                 """.format(
                     self.id
                 )
@@ -270,6 +262,25 @@ def get_base_info(self):
             "date_lastseen": self.date_lastseen,
         }
 
+    def get_tags(self):
+        logging.debug("Getting all tags for user {}".format(self.id))
+        with self.db.cursor() as c:
+            c.execute(
+                """
+                SELECT tags.id as id, tags.user_id as user_id, tags.name as name
+                FROM users 
+                INNER JOIN tags on users.id = tags.user_id 
+                WHERE users.id = CAST({} AS UNSIGNED)
+                """.format(
+                    self.id
+                )
+            )
+            tags = c.fetchall()
+            tags_list = []
+            for t in tags:
+                tags_list.append(Tag(t))
+        return tags_list
+
 
 def get_user(uid: Any[int, str]) -> Optional[User]:
     not_found = 0

backend/PyMatcha/routes/api/profile.py

@@ -21,6 +21,7 @@
 from flask import Blueprint
 from flask import request
 from PyMatcha.errors import BadRequestError
+from PyMatcha.models.tag import Tag
 from PyMatcha.success import Success
 from PyMatcha.utils.decorators import validate_params
 
@@ -29,11 +30,7 @@
 
 profile_bp = Blueprint("profile", __name__)
 
-REQUIRED_PARAMS_COMPLETE_PROFILE = {
-    "orientation": str,
-    "bio": str,
-    # "tags": str
-}
+REQUIRED_PARAMS_COMPLETE_PROFILE = {"orientation": str, "bio": str, "tags": list}
 
 
 @profile_bp.route("/profile/complete", methods=["POST"])
@@ -48,10 +45,14 @@ def complete_profile():
     data = request.get_json()
     orientation = data["orientation"]
     bio = data["bio"]
+    tags = data["tags"]
 
     if orientation not in ["heterosexual", "homosexual", "bisexual", "other"]:
         raise BadRequestError("Genre must be heterosexual, homosexual, bisexual or other", "Try again")
 
+    for tag in tags:
+        Tag.create(name=tag, user_id=current_user.id)
+
     current_user.orientation = orientation
     current_user.bio = bio
     current_user.is_profile_completed = True

backend/PyMatcha/utils/__init__.py

@@ -1,7 +1,11 @@
 from PyMatcha.utils.password import hash_password
-from PyMatcha.utils.tables import create_tables, _create_user_images_table, _create_user_table
+from PyMatcha.utils.tables import _create_tags_table
+from PyMatcha.utils.tables import _create_user_images_table
+from PyMatcha.utils.tables import _create_user_table
+from PyMatcha.utils.tables import create_tables
 
 create_user_images_table = _create_user_images_table
 create_user_table = _create_user_table
+create_tags_table = _create_tags_table
 
-__all__ = ["hash_password", "create_tables", "create_user_table", "create_user_images_table"]
+__all__ = ["hash_password", "create_tables", "create_user_table", "create_user_images_table", "create_tags_table"]

backend/PyMatcha/utils/tables.py

@@ -38,7 +38,6 @@ def _create_user_table(db):
         orientation          ENUM('heterosexual', 'homosexual', 'bisexual', 'other'),
         birthdate            DATE DEFAULT NULL,
         geohash              VARCHAR(256) DEFAULT NULL,
-        tags                 LONGTEXT,  # TODO: JSON ?
         heat_score           INT DEFAULT (0),
         date_joined          DATETIME DEFAULT NOW(),
         date_lastseen        DATETIME DEFAULT NOW(),
@@ -72,6 +71,24 @@ def _create_user_images_table(db):
         c.execute("""SET sql_notes = 1;""")
 
 
+def _create_tags_table(db):
+    with db.cursor() as c:
+        logging.info("Creating table tags.")
+        c.execute("""SET sql_notes = 0;""")
+        c.execute(
+            """
+        CREATE TABLE IF NOT EXISTS tags
+        (
+        id            INT auto_increment PRIMARY KEY,
+        user_id       INT NOT NULL,
+        name          VARCHAR(256)
+        )
+        """
+        )
+        c.execute("""SET sql_notes = 1;""")
+
+
 def create_tables(db):
     _create_user_table(db)
     _create_user_images_table(db)
+    _create_tags_table(db)