Added matches table

Author: Seluj78

backend/PyMatcha/models/match.py

@@ -0,0 +1,49 @@
+"""
+    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 datetime
+import logging
+
+from PyMatcha.utils import create_matches_table
+from PyMatcha.utils.orm import Field
+from PyMatcha.utils.orm import Model
+
+
+class Match(Model):
+    table_name = "matches"
+
+    id = Field(int, modifiable=False)
+    user_1 = Field(int)
+    user_2 = Field(int)
+    dt_matched = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
+
+    def before_init(self, data):
+        pass
+
+    @staticmethod
+    def create(user_1: int, user_2: int, dt_matched: datetime.datetime = datetime.datetime.utcnow()) -> Match:
+        new_match = Match(user_1=user_1, user_2=user_2, dt_matched=dt_matched)
+        new_match.save()
+        logging.debug("Creating new match")
+        return new_match
+
+    @classmethod
+    def create_table(cls):
+        create_matches_table(cls.db)

backend/PyMatcha/models/user.py

@@ -26,6 +26,8 @@
 from typing import Optional
 
 import Geohash
+from PyMatcha.models.like import Like
+from PyMatcha.models.match import Match
 from PyMatcha.models.report import Report
 from PyMatcha.models.tag import Tag
 from PyMatcha.models.view import View
@@ -330,7 +332,7 @@ def get_likes_received(self):
             likes = c.fetchall()
             like_list = []
             for like in likes:
-                like_list.append(Report(like))
+                like_list.append(Like(like))
         return like_list
 
     def get_likes_sent(self):
@@ -351,7 +353,7 @@ def get_likes_sent(self):
             likes = c.fetchall()
             like_list = []
             for like in likes:
-                like_list.append(Report(like))
+                like_list.append(Like(like))
         return like_list
 
     def already_likes(self, liked_id: int) -> bool:
@@ -371,6 +373,26 @@ def already_likes(self, liked_id: int) -> bool:
             value = next(iter(result.values()))
             return bool(value)
 
+    def get_matches(self):
+        logging.debug("Getting all matches for user {}".format(self.id))
+        with self.db.cursor() as c:
+            c.execute(
+                """
+                SELECT matches.id as id, matches.user_1 as user_1,
+                matches.user_2 as user_2, matches.dt_matched as dt_matched
+                FROM users
+                INNER JOIN matches on users.id = matches.user_1 or users.id = matches.user_2
+                WHERE users.id = CAST({} AS UNSIGNED)
+                """.format(
+                    self.id
+                )
+            )
+            matches = c.fetchall()
+            match_list = []
+            for match in matches:
+                match_list.append(Match(match))
+        return match_list
+
 
 def get_user(uid: Any[int, str]) -> Optional[User]:
     not_found = 0

backend/PyMatcha/utils/__init__.py

@@ -1,5 +1,6 @@
 from PyMatcha.utils.password import hash_password
 from PyMatcha.utils.tables import _create_likes_table
+from PyMatcha.utils.tables import _create_matches_table
 from PyMatcha.utils.tables import _create_reports_table
 from PyMatcha.utils.tables import _create_tags_table
 from PyMatcha.utils.tables import _create_user_table
@@ -11,6 +12,7 @@
 create_views_table = _create_views_table
 create_reports_table = _create_reports_table
 create_likes_table = _create_likes_table
+create_matches_table = _create_matches_table
 
 __all__ = [
     "hash_password",
@@ -20,4 +22,5 @@
     "create_views_table",
     "create_reports_table",
     "create_likes_table",
+    "create_matches_table",
 ]

backend/PyMatcha/utils/tables.py

@@ -130,9 +130,29 @@ def _create_likes_table(db):
         c.execute(ENABLE_SQL_NOTES)
 
 
+def _create_matches_table(db):
+    with db.cursor() as c:
+        logging.info("Creating table matches.")
+        c.execute(DISABLE_SQL_NOTES)
+        c.execute(
+            """
+        CREATE TABLE IF NOT EXISTS matches
+        (
+        id            INT auto_increment PRIMARY KEY,
+        user_1        INT NOT NULL,
+        user_2        INT NOT NULL,
+        dt_matched    DATETIME DEFAULT NOW()
+        )
+        """
+        )
+        # TODO: Is conversation started boolean ?
+        c.execute(ENABLE_SQL_NOTES)
+
+
 def create_tables(db):
     _create_user_table(db)
     _create_tags_table(db)
     _create_views_table(db)
     _create_reports_table(db)
     _create_likes_table(db)
+    _create_matches_table(db)