Merge pull request #356 from Seluj78/feature/notifications

Author: Seluj78

PyMatcha.postman_collection.json

@@ -1314,7 +1314,6 @@
 									"",
 									"tests[\"Is email correct\"] = response.email == user_email",
 									"tests[\"Is username correct\"] = response.username == user_username",
-									"tests[\"Are tags present\"] = response.tags.length == 0",
 									"",
 									"pm.collectionVariables.set(\"user_id\", response.id)"
 								],
@@ -1801,7 +1800,6 @@
 											"",
 											"tests[\"Is email correct\"] = response.email == user_email",
 											"tests[\"Is username correct\"] = response.username == user_username",
-											"tests[\"Are tags present\"] = response.tags.length == 4",
 											"tests[\"User orientation is correct\"] = response.orientation == user_orientation",
 											"tests[\"User gender is correct\"] = response.gender == user_gender",
 											"pm.collectionVariables.set(\"user_id\", response.id)"
@@ -6792,137 +6790,137 @@
 	],
 	"variable": [
 		{
-			"id": "84e910f9-4c08-4246-902f-0de6e1ea294e",
+			"id": "77b59289-361a-4042-9d17-5ce9094569c1",
 			"key": "host",
 			"value": "http://127.0.0.1:5000"
 		},
 		{
-			"id": "862f3d2c-4062-4687-b54b-beba8997fa14",
+			"id": "1132fe17-e51a-4216-a987-076b9fc84cbc",
 			"key": "user_id",
 			"value": ""
 		},
 		{
-			"id": "817cc4dd-f982-48bd-a2be-d1a654ea54fd",
+			"id": "eb6bb7f3-ee7d-4baa-8904-8641b51dfd3c",
 			"key": "user_email",
 			"value": "foo@example.org"
 		},
 		{
-			"id": "b20f7a10-fb29-42aa-89e8-2f85b260407a",
+			"id": "853fc8a6-589c-4c5a-90ee-a9099a5013cc",
 			"key": "user_username",
 			"value": "foo"
 		},
 		{
-			"id": "6c4f48fc-c6f6-4bce-a285-4ac93be46bd5",
+			"id": "3fa425fa-ecf2-488a-b447-7b0ccd98a284",
 			"key": "user_password",
 			"value": "admin"
 		},
 		{
-			"id": "2e641600-3581-4b3d-b812-de9e8d91ef40",
+			"id": "964625a3-340c-4bf1-8e91-abaeb3145ac7",
 			"key": "user_firstname",
 			"value": "Foo"
 		},
 		{
-			"id": "7c71bf8a-5d8e-49eb-921a-49ce8eb2e025",
+			"id": "6e8cd344-9b65-483c-b5a2-ded746b45041",
 			"key": "user_lastname",
 			"value": "Bar"
 		},
 		{
-			"id": "d3eb6bf8-6e58-4848-aa15-7e3d970a3d17",
+			"id": "5d912e78-090a-4e10-a896-8e73f692124b",
 			"key": "debug_token",
 			"value": "xX69jules69Xx"
 		},
 		{
-			"id": "750efa6b-eb7f-49b3-b273-532bbd3c5a21",
+			"id": "3f5efb62-435b-49ca-992b-7bf6e3cd9544",
 			"key": "user_access_token",
 			"value": ""
 		},
 		{
-			"id": "eafd1b95-9189-42e2-ba9a-4253ad877a9b",
+			"id": "75a3bc19-f99d-4741-b5d7-906c8516c800",
 			"key": "user_refresh_token",
 			"value": ""
 		},
 		{
-			"id": "b6bb8998-fc1d-404c-bc38-bc607231ac08",
+			"id": "0f9f831c-f484-4cfc-b66f-39905cbd3c5b",
 			"key": "expired_token",
 			"value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTAyNDIyNjQsIm5iZiI6MTU5MDI0MjI2NCwianRpIjoiNTM0ZGI5NzQtOWE4Ni00MGViLWE1NDEtMDg3N2ZmNzQ3NDVhIiwiZXhwIjoxNTkwMjQyMzI0LCJpZGVudGl0eSI6eyJpZCI6NTEyLCJlbWFpbCI6ImZvb0BleGFtcGxlLm9yZyIsInVzZXJuYW1lIjoiYmFyIiwiaXNfb25saW5lIjp0cnVlLCJkYXRlX2xhc3RzZWVuIjoiU2F0LCAyMyBNYXkgMjAyMCAxMzo1Nzo0NCBHTVQifSwiZnJlc2giOnRydWUsInR5cGUiOiJhY2Nlc3MifQ.NTp2P0WNkXDwzuzrcNIQdeAfizQ57HQgkzBLSvY1yHU"
 		},
 		{
-			"id": "2292884f-f26e-4dca-bf5a-2dbd6931b7d6",
+			"id": "444b3620-1eea-4289-811d-3e3cb92fdd42",
 			"key": "user_orientation",
 			"value": "heterosexual"
 		},
 		{
-			"id": "0a58f34f-09e7-4a30-8788-8eae5ddbbfdd",
+			"id": "04dab3b8-ec1e-48cc-9341-81b7a0d6629c",
 			"key": "user_bio",
 			"value": "Lorem Ipsum is the single greatest threat. We are not - we are not keeping up with other websites. Lorem Ipsum best not make any more threats to your website. It will be met with fire and fury like the world has never seen. Does everybody know that pig named Lorem Ipsum? An ‘extremely credible source’ has called my office and told me that Barack Obama’s placeholder text is a fraud."
 		},
 		{
-			"id": "26fe27b4-a059-41fa-be5d-6805e234c9a9",
+			"id": "fa0ace2d-fc85-4bdc-ac91-962598607bcb",
 			"key": "user_gender",
 			"value": "male"
 		},
 		{
-			"id": "6fd49a77-f3e7-43bd-8134-289d7c79c748",
+			"id": "e1dfcdb9-a32f-4cb2-976b-0b3c459b7cb7",
 			"key": "user_birthdate",
 			"value": "06/04/1998"
 		},
 		{
-			"id": "2146206a-faf6-4ddc-8fa1-37f987aceeb2",
+			"id": "bcc67554-7f8d-429d-9be6-ac51beae6392",
 			"key": "user_lat",
 			"value": "44.8404"
 		},
 		{
-			"id": "4ab98f8d-f0e9-4387-83b6-ab9bd3616485",
+			"id": "bd3aa75a-62d2-4273-a48b-f2776e9c2851",
 			"key": "user_lng",
 			"value": "-0.5805"
 		},
 		{
-			"id": "737bac0f-640a-48ff-901a-0f014647f9a1",
+			"id": "94b6ebf4-a1bf-40d0-aecf-0351f97f02a7",
 			"key": "user_ip",
 			"value": "77.205.46.181"
 		},
 		{
-			"id": "2c109873-7286-49ef-87d3-ce335ddca6fa",
+			"id": "39f5a6a2-e1a4-46e0-ade3-1da7673aeed2",
 			"key": "user_username2",
 			"value": "FooBar"
 		},
 		{
-			"id": "9f95a3c7-9746-4f35-a0ba-24680ae8329b",
+			"id": "f9693eeb-d746-440c-b388-e45fa31f4f47",
 			"key": "user_email2",
 			"value": "bar@example.org"
 		},
 		{
-			"id": "89c9863c-bb61-4920-86a2-5c926191db43",
+			"id": "2a66170a-b518-4d27-818e-f476f14bf64d",
 			"key": "user_password2",
 			"value": "dolphin2"
 		},
 		{
-			"id": "ff2e7ef9-4614-49ed-9d45-0fcc9a319899",
+			"id": "5fcb9909-4c30-434a-84ed-977a1c249e96",
 			"key": "user_first_name2",
 			"value": "Foo2"
 		},
 		{
-			"id": "67bed50e-fd6d-4bc5-a352-9083bc7f62ee",
+			"id": "145f67a8-6f56-4889-a47c-d5e408d034c6",
 			"key": "user_last_name2",
 			"value": "Bar2"
 		},
 		{
-			"id": "1284f930-b60b-4956-885a-557b2202fbb1",
+			"id": "9ed484b6-9bd8-4456-8149-e801c22595ee",
 			"key": "user_bio2",
 			"value": "Could you rotate the picture to show the other side of the room? thanks for taking the time to make the website, but i already made it in wix or I know somebody who can do this for a reasonable cost. Labrador submit your meaningless business jargon to be used on the site! nor start on it today and we will talk about what i want next time and it's great, can you add a beard though . Needs to be sleeker make it original i know you've made thirty iterations but can we go back to the first one that was the best version. Are you busy this weekend? I have a new project with a tight deadline im not sure, try something else we are your relatives, and I know somebody who can do this for a reasonable cost, yet that's going to be a chunk of change can you rework to make the pizza look more delicious. Labrador I like it, but can the snow look a little warmer, concept is bang on, but can we look at a better execution, and the website doesn't have the theme i was going for other agencies charge much lesser. Can you make the blue bluer? can you punch up the fun level on these icons but is there a way we can make the page feel more introductory without being cheesy. There is too much white space is this the best we can do try a more powerful colour thanks for taking the time to make the website, but i already made it in wix, the flier should feel like a warm handshake can you please change the color theme of the website to pink and purple? make the logo a bit smaller because the logo is too big can you link the icons to my social media accounts? oh and please put pictures of cats everywhere. There are more projects lined up charge extra the next time the website doesn't have the theme i was going for, I need a website. How much will it cost, or you can get my logo from facebook the website doesn't have the theme i was going for this is just a 5 minutes job. Can you help me out? you will get a lot of free exposure doing this this red is too red. Something summery; colourful. Can you punch up the fun level on these icons we are a big name to have in your portfolio we don't need a contract, do we or could you rotate the picture to show the other side of the room? for can you make it look more designed , the flier should feel like a warm handshake can it handle a million in one go. Needs to be sleeker. Do less with more can it be more retro. You might wanna give it another shot i love it, but can you invert all colors? was i smoking crack when i sent this? hahaha!. I need a website. How much will it cost. Thanks for taking the time to make the website, but i already made it in wix are you busy this weekend? I have a new project with a tight deadline, and try making it a bit less blah just do what you think. I trust you. Anyway, you are the designer, you know what to do make it original I like it, but can the snow look a little warmer theres all this spanish text on my site can it handle a million in one go but there are more projects lined up charge extra the next time, so i was wondering if my cat could be placed over the logo in the flyer. "
 		},
 		{
-			"id": "93e7ae24-d669-4367-9627-0cccb06cf720",
+			"id": "fb197ca8-e553-4180-babb-e2c9fbc0fd1d",
 			"key": "user_gender2",
 			"value": "other"
 		},
 		{
-			"id": "8cd1ec37-26e0-44fc-8cf9-197e14f6f082",
+			"id": "92a77c91-6269-484d-8b34-9d2949b3d2c7",
 			"key": "user_orientation2",
 			"value": "bisexual"
 		},
 		{
-			"id": "0dd4afab-bfc5-4cfe-93bf-e61c575ea3bb",
+			"id": "72196e46-d068-4cc1-a773-912bae378d55",
 			"key": "user_birthdate2",
 			"value": "01/01/1996"
 		}

backend/PyMatcha/__init__.py

@@ -180,6 +180,7 @@
 from PyMatcha.routes.api.search import search_bp
 from PyMatcha.routes.api.profile.block import profile_block_bp
 from PyMatcha.routes.api.history import history_bp
+from PyMatcha.routes.api.notifications import notifications_bp
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(user_bp)
@@ -199,6 +200,7 @@
 application.register_blueprint(search_bp)
 application.register_blueprint(profile_block_bp)
 application.register_blueprint(history_bp)
+application.register_blueprint(notifications_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

backend/PyMatcha/models/notification.py

@@ -0,0 +1,69 @@
+"""
+    PyMatcha - A Python Dating Website
+    Copyright (C) 2018-2019 jlasne/gmorer
+    <jlasne@student.42.fr> - <lauris.skraucis@gmail.com>
+
+    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 datetime import datetime
+from typing import Optional
+
+from PyMatcha.utils import create_notifications_table
+from PyMatcha.utils.orm import Field
+from PyMatcha.utils.orm import Model
+
+
+class Notification(Model):
+    table_name = "notifications"
+
+    id = Field(int, modifiable=False)
+    user_id = Field(int)
+    dt_received = Field(datetime, fmt="%Y-%m-%d %H:%M:%S")
+    content = Field(str)
+    type = Field(str)
+    is_seen = Field(bool)
+    link_to = Field(str)
+
+    @staticmethod
+    def create(
+        trigger_id: int,
+        user_id: int,
+        content: str,
+        type: str,
+        link_to: Optional[str],
+        is_seen: bool = False,
+        dt_received: datetime = datetime.utcnow(),
+    ) -> Optional[Notification]:
+        if type not in ["match", "like", "superlike", "unlike", "view", "message", "message_like"]:
+            raise ValueError(
+                "type must be one of ['match', 'like', 'superlike', 'unlike', 'view', 'message', 'message_like']"
+            )
+        from PyMatcha.models.user import get_user  # noqa
+
+        blocked_ids = [block.blocked_id for block in get_user(user_id).get_blocks()]
+        if trigger_id in blocked_ids:
+            return None
+        new_notif = Notification(
+            user_id=user_id, content=content, type=type, link_to=link_to, is_seen=is_seen, dt_received=dt_received
+        )
+        new_notif.save()
+        logging.debug("Creating new notification")
+        return new_notif
+
+    @classmethod
+    def create_table(cls):
+        create_notifications_table(cls.db)

backend/PyMatcha/models/user.py

@@ -31,6 +31,7 @@
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
 from PyMatcha.models.message import Message
+from PyMatcha.models.notification import Notification
 from PyMatcha.models.report import Report
 from PyMatcha.models.tag import Tag
 from PyMatcha.models.view import View
@@ -267,6 +268,12 @@ def get_likes_sent(self):
     def get_blocks(self):
         return Block.get_multis(blocker_id=self.id)
 
+    def get_all_notifications(self):
+        return Notification.get_multis(user_id=self.id)
+
+    def get_unread_notifications(self):
+        return Notification.get_multis(user_id=self.id, is_seen=False)
+
     def already_likes(self, liked_id: int) -> bool:
         with self.db.cursor() as c:
             c.execute(

backend/PyMatcha/routes/api/history.py

@@ -7,7 +7,7 @@
 from PyMatcha.utils.success import SuccessOutput
 
 
-history_bp = Blueprint("history_bp", __name__)
+history_bp = Blueprint("history", __name__)
 
 
 @history_bp.route("/history/viewed")

backend/PyMatcha/routes/api/like.py

@@ -7,6 +7,7 @@
 from flask_jwt_extended import jwt_required
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
+from PyMatcha.models.notification import Notification
 from PyMatcha.models.user import get_user
 from PyMatcha.utils.decorators import validate_params
 from PyMatcha.utils.errors import BadRequestError
@@ -53,11 +54,46 @@ def like_profile(uid):
 
     if u.already_likes(current_user.id):
         Match.create(user_1=current_user.id, user_2=u.id)
+        Notification.create(
+            trigger_id=current_user.id,
+            user_id=u.id,
+            content=f"{current_user.first_name} liked you! Go check them out!",
+            type="like",
+            link_to=f"users/{current_user.id}",
+        )
+        Notification.create(
+            trigger_id=current_user.id,
+            user_id=u.id,
+            content=f"You and {current_user.first_name} matched!",
+            type="match",
+            link_to=f"conversation/{current_user.id}",
+        )
+        Notification.create(
+            trigger_id=u.id,
+            user_id=current_user.id,
+            content=f"You and {u.first_name} matched!",
+            type="match",
+            link_to=f"conversation/{u.id}",
+        )
         return Success("It's a match !")
 
     if is_superlike:
+        Notification.create(
+            trigger_id=current_user.id,
+            user_id=u.id,
+            content=f"{current_user.first_name} superliked you 😏! Go check them out!",
+            type="superlike",
+            link_to=f"users/{current_user.id}",
+        )
         return Success("Superliked user.")
     else:
+        Notification.create(
+            trigger_id=current_user.id,
+            user_id=u.id,
+            content=f"{current_user.first_name} liked you! Go check them out!",
+            type="like",
+            link_to=f"users/{current_user.id}",
+        )
         return Success("Liked user.")
 
 
@@ -73,4 +109,13 @@ def unlike_profile(uid):
     if not current_user.already_likes(u.id):
         raise BadRequestError("You never liked this person in the first place.")
     Like.get_multi(liked_id=u.id, liker_id=current_user.id).delete()
+
+    Notification.create(
+        trigger_id=current_user.id,
+        user_id=u.id,
+        content=f"{current_user.first_name} unliked you.",
+        type="unlike",
+        link_to=None,
+    )
+
     return Success(f"Unliked user {u.id}.")