Merge pull request #181 from Seluj78/matches

Author: Seluj78

PyMatcha.postman_collection.json

@@ -98,7 +98,7 @@
 
 @jwt.expired_token_loader
 def expired_token_callback(expired_token):
-    logging.warning("Token {} expired".format(expired_token))
+    logging.debug("Token {} expired".format(expired_token))
     resp = {
         "code": 401,
         "error": {
@@ -187,16 +187,30 @@ def check_if_token_is_revoked(decrypted_token):
 
 from PyMatcha.routes.api.ping_pong import ping_pong_bp
 from PyMatcha.routes.api.user import user_bp
-from PyMatcha.routes.api.auth import auth_bp
-from PyMatcha.routes.api.profile import profile_bp
+from PyMatcha.routes.api.auth.email import auth_email_bp
+from PyMatcha.routes.api.auth.password import auth_password_bp
+from PyMatcha.routes.api.auth.register import auth_register_bp
+from PyMatcha.routes.api.auth.login import auth_login_bp
+from PyMatcha.routes.api.profile.view import profile_view_bp
+from PyMatcha.routes.api.profile.edit import profile_edit_bp
+from PyMatcha.routes.api.profile.complete import profile_complete_bp
+from PyMatcha.routes.api.profile.report import profile_report_bp
 from PyMatcha.routes.api.like import like_bp
+from PyMatcha.routes.api.match import match_bp
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(ping_pong_bp)
 application.register_blueprint(user_bp)
-application.register_blueprint(auth_bp)
-application.register_blueprint(profile_bp)
+application.register_blueprint(auth_email_bp)
+application.register_blueprint(auth_password_bp)
+application.register_blueprint(auth_register_bp)
+application.register_blueprint(auth_login_bp)
+application.register_blueprint(profile_view_bp)
+application.register_blueprint(profile_edit_bp)
+application.register_blueprint(profile_complete_bp)
+application.register_blueprint(profile_report_bp)
 application.register_blueprint(like_bp)
+application.register_blueprint(match_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

backend/PyMatcha/__init__.py

@@ -35,9 +35,6 @@ class Like(Model):
     dt_liked = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
     is_superlike = Field(bool)
 
-    def before_init(self, data):
-        pass
-
     @staticmethod
     def create(
         liker_id: int,

backend/PyMatcha/models/like.py

@@ -0,0 +1,46 @@
+"""
+    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")
+
+    @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/match.py

@@ -37,9 +37,6 @@ class Report(Model):
     reason = Field(str)
     status = Field(str)
 
-    def before_init(self, data):
-        pass
-
     @staticmethod
     def create(
         reported_id: int,

backend/PyMatcha/models/report.py

@@ -32,9 +32,6 @@ class Tag(Model):
     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)

backend/PyMatcha/models/tag.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
@@ -60,12 +62,6 @@ class User(Model):
     confirmed_on = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
     previous_reset_token = Field(str)
 
-    def before_init(self, data):
-        pass
-        # Not used, use User.create and password will be hashed.
-        # if "password" in data:
-        #     self.password.value = hash_password(data["password"])
-
     def check_password(self, password: str) -> bool:
         logging.debug("Checking password again {} hashed password".format(self.id))
         _hash, salt = self.password.split(":")
@@ -166,7 +162,7 @@ def register(email: str, username: str, password: str, first_name: str, last_nam
         except ValueError:
             pass
         else:
-            logging.warning("Email {} taken".format(email))
+            logging.debug("Email {} taken".format(email))
             raise ConflictError("Email {} taken".format(email), "Use another email")
 
         # Check username availability
@@ -330,7 +326,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 +347,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 +367,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
@@ -400,7 +416,7 @@ def get_user(uid: Any[int, str]) -> Optional[User]:
         f_user = user
     # If none of those worked, throw an error
     if not_found == 3:
-        logging.warning("User {} not found.".format(uid))
+        logging.debug("User {} not found.".format(uid))
         raise NotFoundError("User {} not found.".format(uid), "Try again with another uid")
     logging.debug("Found user {} from {}".format(f_user.id, uid))
     return f_user

backend/PyMatcha/models/user.py

@@ -34,9 +34,6 @@ class View(Model):
     viewer_id = Field(int)
     dt_seen = Field(datetime.datetime)
 
-    def before_init(self, data):
-        pass
-
     @staticmethod
     def create(profile_id: int, viewer_id: int, dt_seen: datetime.datetime = datetime.datetime.utcnow()) -> View:
         new_view = View(profile_id=profile_id, viewer_id=viewer_id, dt_seen=dt_seen)