Merge pull request #274 from Seluj78/132-images

Author: Seluj78

.env.enc

@@ -59,6 +59,8 @@
     "REDIS_PORT",
     "DEBUG_AUTH_TOKEN",
     "FRONTEND_BASE_URL",
+    "IMGUR_CLIENT_ID",
+    "IMGUR_CLIENT_SECRET",
 ]
 
 for item in REQUIRED_ENV_VARS:
@@ -224,6 +226,7 @@ def check_if_token_is_revoked(decrypted_token):
 from PyMatcha.routes.api.match import match_bp
 from PyMatcha.routes.api.messages import messages_bp
 from PyMatcha.routes.api.recommendations import recommendations_bp
+from PyMatcha.routes.api.profile.images import images_bp
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(user_bp)
@@ -239,6 +242,7 @@ def check_if_token_is_revoked(decrypted_token):
 application.register_blueprint(match_bp)
 application.register_blueprint(messages_bp)
 application.register_blueprint(recommendations_bp)
+application.register_blueprint(images_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

PyMatcha.postman_collection.json

@@ -0,0 +1,47 @@
+"""
+    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 PyMatcha.utils import create_images_table
+from PyMatcha.utils.orm import Field
+from PyMatcha.utils.orm import Model
+
+
+class Image(Model):
+    table_name = "images"
+
+    id = Field(int, modifiable=False)
+    user_id = Field(int)
+    link = Field(str)
+    timestamp = Field(datetime, fmt="%Y-%m-%d %H:%M:%S")
+    is_primary = Field(bool)
+
+    @staticmethod
+    def create(user_id: int, link: str, is_primary: bool = False, timestamp: datetime = datetime.utcnow()) -> Image:
+        new_image = Image(user_id=user_id, link=link, is_primary=is_primary, timestamp=timestamp)
+        new_image.save()
+        logging.debug("Creating new image")
+        return new_image
+
+    @classmethod
+    def create_table(cls):
+        create_images_table(cls.db)

backend/PyMatcha/__init__.py

@@ -26,6 +26,7 @@
 from typing import Optional
 
 import Geohash
+from PyMatcha.models.image import Image
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
 from PyMatcha.models.message import Message
@@ -199,6 +200,7 @@ def register(email: str, username: str, password: str, first_name: str, last_nam
     def to_dict(self) -> Dict:
         returned_dict = super().to_dict()
         returned_dict["tags"] = [t.to_dict() for t in self.get_tags()]
+        returned_dict["images"] = [image.to_dict() for image in self.get_images()]
         returned_dict["reports"] = {"sent": [], "received": []}
         returned_dict["reports"]["sent"] = [r.to_dict() for r in self.get_reports_sent()]
         returned_dict["reports"]["received"] = [r.to_dict() for r in self.get_reports_received()]
@@ -222,128 +224,61 @@ def get_jwt_info(self):
             "date_lastseen": self.date_lastseen,
         }
 
+    def get_images(self):
+        logging.debug("Getting all images for user {}".format(self.id))
+        image_list = Image.get_multis(user_id=self.id)
+        if not image_list:
+            return []
+        else:
+            return image_list
+
     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
+        tag_list = Tag.get_multis(user_id=self.id)
+        if not tag_list:
+            return []
+        else:
+            return tag_list
 
     def get_views(self):
         logging.debug("Getting all views for user profile {}".format(self.id))
-        with self.db.cursor() as c:
-            c.execute(
-                """
-                SELECT views.id as id, views.profile_id as profile_id, 
-                views.viewer_id as viewer_id, views.dt_seen as dt_seen
-                FROM users 
-                INNER JOIN views on users.id = views.profile_id 
-                WHERE users.id = CAST({} AS UNSIGNED)
-                """.format(
-                    self.id
-                )
-            )
-            views = c.fetchall()
-            views_list = []
-            for v in views:
-                views_list.append(View(v))
-        return views_list
+        view_list = View.get_multis(profile_id=self.id)
+        if not view_list:
+            return []
+        else:
+            return view_list
 
     def get_reports_received(self):
         logging.debug("Getting all reports received for user {}".format(self.id))
-        with self.db.cursor() as c:
-            c.execute(
-                """
-                SELECT reports.id as id, reports.reported_id as reported_id, 
-                reports.reporter_id as reporter_id, reports.dt_reported as dt_reported,
-                reports.details as details, reports.reason as reason, reports.status as status
-                FROM users 
-                INNER JOIN reports on users.id = reports.reported_id 
-                WHERE users.id = CAST({} AS UNSIGNED)
-                """.format(
-                    self.id
-                )
-            )
-            reports = c.fetchall()
-            reports_list = []
-            for r in reports:
-                reports_list.append(Report(r))
-        return reports_list
+        reports_received_list = Report.get_multis(reported_id=self.id)
+        if not reports_received_list:
+            return []
+        else:
+            return reports_received_list
 
     def get_reports_sent(self):
         logging.debug("Getting all reports sent for user {}".format(self.id))
-        with self.db.cursor() as c:
-            c.execute(
-                """
-                SELECT reports.id as id, reports.reported_id as reported_id, 
-                reports.reporter_id as reporter_id, reports.dt_reported as dt_reported,
-                reports.details as details, reports.reason as reason, reports.status as status
-                FROM users 
-                INNER JOIN reports on users.id = reports.reporter_id 
-                WHERE users.id = CAST({} AS UNSIGNED)
-                """.format(
-                    self.id
-                )
-            )
-            reports = c.fetchall()
-            reports_list = []
-            for r in reports:
-                reports_list.append(Report(r))
-        return reports_list
+        reports_sent_list = Report.get_multis(reporter_id=self.id)
+        if not reports_sent_list:
+            return []
+        else:
+            return reports_sent_list
 
     def get_likes_received(self):
         logging.debug("Getting all likes received for user {}".format(self.id))
-        with self.db.cursor() as c:
-            c.execute(
-                """
-                SELECT likes.id as id, likes.liked_id as liked_id, 
-                likes.liker_id as liker_id, likes.dt_liked as dt_liked,
-                likes.is_superlike as is_superlike
-                FROM users 
-                INNER JOIN likes on users.id = likes.liked_id 
-                WHERE users.id = CAST({} AS UNSIGNED)
-                """.format(
-                    self.id
-                )
-            )
-            likes = c.fetchall()
-            like_list = []
-            for like in likes:
-                like_list.append(Like(like))
-        return like_list
+        likes_received_list = Like.get_multis(liked_id=self.id)
+        if not likes_received_list:
+            return []
+        else:
+            return likes_received_list
 
     def get_likes_sent(self):
         logging.debug("Getting all likes sent for user {}".format(self.id))
-        with self.db.cursor() as c:
-            c.execute(
-                """
-                SELECT likes.id as id, likes.liked_id as liked_id, 
-                likes.liker_id as liker_id, likes.dt_liked as dt_liked,
-                likes.is_superlike as is_superlike
-                FROM users 
-                INNER JOIN likes on users.id = likes.liker_id 
-                WHERE users.id = CAST({} AS UNSIGNED)
-                """.format(
-                    self.id
-                )
-            )
-            likes = c.fetchall()
-            like_list = []
-            for like in likes:
-                like_list.append(Like(like))
-        return like_list
+        likes_sent_list = Like.get_multis(liker_id=self.id)
+        if not likes_sent_list:
+            return []
+        else:
+            return likes_sent_list
 
     def already_likes(self, liked_id: int) -> bool:
         with self.db.cursor() as c:

backend/PyMatcha/models/image.py

@@ -7,6 +7,7 @@
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
 from PyMatcha import redis
+from PyMatcha.models.image import Image
 from PyMatcha.models.like import Like
 from PyMatcha.models.match import Match
 from PyMatcha.models.message import Message
@@ -141,6 +142,7 @@ def delete_tables():
     User.drop_table()
     Tag.drop_table()
     Message.drop_table()
+    Image.drop_table()
 
     Match.create_table()
     Like.create_table()
@@ -149,6 +151,7 @@ def delete_tables():
     User.create_table()
     Tag.create_table()
     Message.create_table()
+    Image.create_table()
     return "", 204
 
 

backend/PyMatcha/models/user.py

@@ -0,0 +1,104 @@
+from io import BytesIO
+
+from flask import Blueprint
+from flask import request
+from flask_jwt_extended import current_user
+from flask_jwt_extended import jwt_required
+from PyMatcha.models.image import Image
+from PyMatcha.utils.errors import BadRequestError
+from PyMatcha.utils.errors import NotFoundError
+from PyMatcha.utils.images import upload_image
+from PyMatcha.utils.success import Success
+from PyMatcha.utils.success import SuccessDeleted
+from PyMatcha.utils.success import SuccessOutput
+
+images_bp = Blueprint("images", __name__)
+
+
+@images_bp.route("/profile/images", methods=["POST"])
+@jwt_required
+def add_image_profile():
+    is_primary = request.args.get("is_primary", "false") == "true"
+    # check if the post request has the file part
+    if "file[]" not in request.files:
+        raise BadRequestError("No file body passed in request form data")
+    file = request.files["file[]"]
+    # if user does not select file, browser also
+    # submit an empty part without filename
+    if file.filename == "":
+        raise BadRequestError("No file passed in request")
+    if file:
+        if is_primary:
+            try:
+                Image.get_multi(user_id=current_user.id, is_primary=True)
+            except ValueError:
+                # That means there was no primary image before
+                tmp_img = BytesIO()
+                file.save(tmp_img)
+                try:
+                    link = upload_image(tmp_img, current_user.username)
+                except BadRequestError as e:
+                    raise e
+                Image.create(current_user.id, link, is_primary=True)
+                return SuccessOutput("image", link)
+            else:
+                raise BadRequestError("There already is a primary image for user {}".format(current_user.id))
+        else:
+            images = Image.get_multis(user_id=current_user.id, is_primary=False)
+            if images:
+                image_count = len(Image.get_multis(user_id=current_user.id, is_primary=False))
+            else:
+                image_count = 0
+            if image_count >= 4:
+                raise BadRequestError("There's already enough images for this account")
+            tmp_img = BytesIO()
+            file.save(tmp_img)
+            try:
+                link = upload_image(tmp_img, current_user.username)
+            except BadRequestError as e:
+                raise e
+            Image.create(current_user.id, link, is_primary=False)
+            return SuccessOutput("image", link)
+    else:
+        raise ValueError("NO FILE")
+
+
+@images_bp.route("/profile/images/<image_id>", methods=["DELETE"])
+@jwt_required
+def delete_image_profile(image_id):
+    try:
+        image = Image.get(id=image_id)
+    except ValueError:
+        raise NotFoundError(f"Image not found for user {current_user.id}")
+    image.delete()
+    return SuccessDeleted("Image successfully deleted.")
+
+
+@images_bp.route("/profile/images/<image_id>", methods=["PUT"])
+@jwt_required
+def change_main_image(image_id):
+    try:
+        image = Image.get(id=image_id)
+    except ValueError:
+        raise NotFoundError(f"Image not found for user {current_user.id}")
+    try:
+        current_main_image = Image.get_multi(user_id=current_user.id, is_primary=True)
+    except NotFoundError:
+        # That means there was no primary image before
+        pass
+    else:
+        current_main_image.is_primary = False
+        current_main_image.save()
+    image.is_primary = True
+    image.save()
+    return Success("Profile picture successfully modified")
+
+
+@images_bp.route("/profile/images", methods=["GET"])
+@jwt_required
+def get_images_profile():
+    images = Image.get_multis(user_id=current_user.id)
+    ret = []
+    if images:
+        ret = [image.to_dict() for image in images]
+    return SuccessOutput("images", ret)