Merge branch 'dev' into 232-reset-password-view

supalarry · web-flow · commit 18fc29cb59a0 · 2020-09-19T21:16:38.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,40 +11,57 @@ services:
   - mysql
   - redis
 
+before_install:
+  - openssl aes-256-cbc -K $encrypted_3c84dcdc6bbe_key -iv $encrypted_3c84dcdc6bbe_iv -in .env.enc -out .env -d
+  # login to github registry
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker.pkg.github.com
+
 jobs:
   include:
-    - stage: build
+    - stage: Build Backend
       script:
-        - openssl aes-256-cbc -K $encrypted_3c84dcdc6bbe_key -iv $encrypted_3c84dcdc6bbe_iv -in .env.enc -out .env -d
-        # login to github registry
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker.pkg.github.com
         # build image
-        - docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest . -f backend.Dockerfile
+        - docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:$TRAVIS_COMMIT . -f backend.Dockerfile
+      after_success:
         # push image
-        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
-    - stage: test
-      before_script:
-        - node --version
-        - npm --version
-        - npm install -g newman
-        - newman --version
+        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:$TRAVIS_COMMIT
+
+    - stage: Build Frontend
+      script:
+        # build image
+        - docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-frontend:$TRAVIS_COMMIT . -f frontend.Dockerfile
+      after_success:
+        # push image
+        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-frontend:$TRAVIS_COMMIT
+
+    - stage: Build Workers
+      script:
+        # build image
+        - docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-workers:$TRAVIS_COMMIT . -f workers.Dockerfile
+      after_success:
+        # push image
+        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-workers:$TRAVIS_COMMIT
+
+    - stage: Test API
+      install:
         - wget https://repo.mysql.com//mysql-apt-config_0.8.15-1_all.deb
         - sudo dpkg -i mysql-apt-config_0.8.15-1_all.deb
         - sudo apt-get update -q
         - sudo apt-get install -q -y --allow-unauthenticated -o Dpkg::Options::=--force-confnew mysql-server
         - sudo systemctl restart mysql
         - sudo mysql_upgrade
+        - npm install -g newman
+      before_script:
+        - node --version
+        - npm --version
+        - newman --version
         - mysql --version
         - mysql -e 'CREATE DATABASE pymatcha;'
+        # pull image
+        - docker pull docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:$TRAVIS_COMMIT
       script:
-        # login to github registry
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker.pkg.github.com
-        # pull images
-        - docker pull docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
-        # decrypt the env file
-        - openssl aes-256-cbc -K $encrypted_3c84dcdc6bbe_key -iv $encrypted_3c84dcdc6bbe_iv -in .env.enc -out .env -d
         # Run the backend api
-        - docker run -d -p 5000:5000 --restart always --env-file .env --network="host" docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
+        - docker run -d -p 5000:5000 --restart always --env-file .env --network="host" docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:$TRAVIS_COMMIT
         # Wait for docker to be up
         - sleep 10
         # run newman tests
@@ -53,13 +70,29 @@ jobs:
         # stop and remove docker to prevent them from block port at next iteration/test
         - docker stop $(docker ps -a -q)
         - docker rm $(docker ps -a -q)
-    - stage: lint
+
+    - stage: Lint Backend
       before_script:
         - pip install -r backend/requirements.txt
       script:
         - black --check backend/
         - flake8 backend/
 
+    - stage: Tag new releases
+      if: branch = dev
+      script:
+        - docker pull docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:$TRAVIS_COMMIT
+        - docker pull docker.pkg.github.com/seluj78/pymatcha/pymatcha-frontend:$TRAVIS_COMMIT
+        - docker pull docker.pkg.github.com/seluj78/pymatcha/pymatcha-workers:$TRAVIS_COMMIT
+        # Tag images
+        - docker tag docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:$TRAVIS_COMMIT docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:latest
+        - docker tag docker.pkg.github.com/seluj78/pymatcha/pymatcha-frontend:$TRAVIS_COMMIT docker.pkg.github.com/seluj78/pymatcha/pymatcha-frontend:latest
+        - docker tag docker.pkg.github.com/seluj78/pymatcha/pymatcha-workers:$TRAVIS_COMMIT docker.pkg.github.com/seluj78/pymatcha/pymatcha-workers:latest
+        # push image
+        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-backend:latest
+        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-frontend:latest
+        - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-workers:latest
+
 notifications:
   email:
     recipients:
diff --git a/backend/PyMatcha/__init__.py b/backend/PyMatcha/__init__.py
@@ -21,6 +21,7 @@
 import os
 
 import pymysql
+import sentry_sdk
 from celery import Celery
 from dotenv import load_dotenv
 from flask import Flask
@@ -32,6 +33,9 @@
 from PyMatcha.utils.tables import create_tables
 from pymysql.cursors import DictCursor
 from redis import StrictRedis
+from sentry_sdk import configure_scope
+from sentry_sdk.integrations.flask import FlaskIntegration
+
 
 PYMATCHA_ROOT = os.path.join(os.path.dirname(__file__), "../..")  # refers to application_top
 dotenv_path = os.path.join(PYMATCHA_ROOT, ".env")
@@ -79,6 +83,13 @@
 if ENABLE_LOGGING == "True":
     setup_logging()
 
+sentry_sdk.init(
+    dsn="https://bb17c14c99d448e2804bf2f105d4ec52@o450203.ingest.sentry.io/5434438",
+    integrations=[FlaskIntegration()],
+    traces_sample_rate=1.0,
+)
+
+
 application = Flask(__name__)
 
 if os.getenv("FLASK_DEBUG", "false") == "true" or os.getenv("FLASK_DEBUG", "false") == "1":
@@ -183,6 +194,9 @@ def jwt_user_callback(identity):
     except NotFoundError:
         # The user who the server issues the token for was deleted in the db.
         return None
+
+    with configure_scope() as scope:
+        scope.user = {"email": u.email, "id": u.id, "username": u.username}
     redis.set("online_user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
     return u
 
diff --git a/backend/PyMatcha/models/user.py b/backend/PyMatcha/models/user.py
@@ -89,7 +89,7 @@ def create(
         except ValueError:
             pass
         else:
-            logging.error("Email {} taken".format(email))
+            logging.warning("Email {} taken".format(email))
             raise ConflictError("Email {} taken.".format(email), "Use another email.")
 
         # Check username availability
@@ -98,17 +98,17 @@ def create(
         except ValueError:
             pass
         else:
-            logging.error("Username {} taken".format(username))
+            logging.warning("Username {} taken".format(username))
             raise ConflictError("Username {} taken.".format(username), "Try another username.")
 
         # Check correct gender
         if gender not in ["male", "female", "other"]:
-            logging.error("Gender must be male, female or other, not {}".format(gender))
+            logging.warning("Gender must be male, female or other, not {}".format(gender))
             raise ConflictError("Gender must be male, female or other, not {}.".format(gender))
 
         # Check correct orientation
         if orientation not in ["heterosexual", "homosexual", "bisexual", "other"]:
-            logging.error(
+            logging.warning(
                 "Sexual Orientation must be heterosexual, homosexual, bisexual or other, not {}.".format(orientation)
             )
             raise ConflictError(
@@ -119,7 +119,7 @@ def create(
         try:
             Geohash.decode(geohash)
         except ValueError as e:
-            logging.error("Geohash error: {}".format(e))
+            logging.warning("Geohash error: {}".format(e))
             raise e
 
         # Encrypt password
@@ -166,7 +166,7 @@ def register(email: str, username: str, password: str, first_name: str, last_nam
         except ValueError:
             pass
         else:
-            logging.error("Username {} taken".format(username))
+            logging.warning("Username {} taken".format(username))
             raise ConflictError("Username {} taken.".format(username), "Try another username.")
 
         # Encrypt password
diff --git a/backend/PyMatcha/routes/api/auth/register.py b/backend/PyMatcha/routes/api/auth/register.py
@@ -49,7 +49,7 @@ def api_create_user():
             last_name=data["last_name"],
         )
     except ConflictError as e:
-        current_app.logger.fatal("Conflict error on user register: {}".format(e))
+        current_app.logger.warning("Conflict error on user register: {}".format(e))
         raise e
     else:
         token = generate_confirmation_token(email=data["email"], token_type="confirm")
diff --git a/backend/PyMatcha/utils/confirm_token.py b/backend/PyMatcha/utils/confirm_token.py
@@ -29,7 +29,7 @@
 def generate_confirmation_token(email, token_type):
     logging.debug("Generating confirmation token for email {}".format(email))
     if token_type not in ACCEPTED_TOKEN_TYPES:
-        logging.error("token_type must be of {} and is {}".format(ACCEPTED_TOKEN_TYPES, token_type))
+        logging.warning("token_type must be of {} and is {}".format(ACCEPTED_TOKEN_TYPES, token_type))
         raise ValueError("Reset token type must be confirm or reset.")
     serializer = URLSafeTimedSerializer(application.config["FLASK_SECRET_KEY"])
     token = serializer.dumps(email + ":{}".format(token_type), salt=application.config["FLASK_SECRET_KEY"])
diff --git a/backend/PyMatcha/utils/errors/badrequest.py b/backend/PyMatcha/utils/errors/badrequest.py
@@ -17,10 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from PyMatcha import application
+from PyMatcha.utils.errors.base_class import CustomException
 from PyMatcha.utils.errors.template import generate_error_json
 
 
-class BadRequestError(Exception):
+class BadRequestError(CustomException):
     """
     This is the BadRequestError class for the Exception.
     """
diff --git a/backend/PyMatcha/utils/errors/base_class.py b/backend/PyMatcha/utils/errors/base_class.py
@@ -0,0 +1,2 @@
+class CustomException(Exception):
+    pass
diff --git a/backend/PyMatcha/utils/errors/conflict.py b/backend/PyMatcha/utils/errors/conflict.py
@@ -17,10 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from PyMatcha import application
+from PyMatcha.utils.errors.base_class import CustomException
 from PyMatcha.utils.errors.template import generate_error_json
 
 
-class ConflictError(Exception):
+class ConflictError(CustomException):
     """
     This is the ConflictError class for the Exception.
     """
diff --git a/backend/PyMatcha/utils/errors/forbidden.py b/backend/PyMatcha/utils/errors/forbidden.py
@@ -17,10 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from PyMatcha import application
+from PyMatcha.utils.errors.base_class import CustomException
 from PyMatcha.utils.errors.template import generate_error_json
 
 
-class ForbiddenError(Exception):
+class ForbiddenError(CustomException):
     """
     This is the ForbiddenError class for the Exception.
     """
diff --git a/backend/PyMatcha/utils/errors/notfound.py b/backend/PyMatcha/utils/errors/notfound.py
@@ -17,10 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from PyMatcha import application
+from PyMatcha.utils.errors.base_class import CustomException
 from PyMatcha.utils.errors.template import generate_error_json
 
 
-class NotFoundError(Exception):
+class NotFoundError(CustomException):
     """
     This is the NotFoundError class for the Exception.
     """
diff --git a/backend/PyMatcha/utils/errors/unauthorized.py b/backend/PyMatcha/utils/errors/unauthorized.py
@@ -17,10 +17,11 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 from PyMatcha import application
+from PyMatcha.utils.errors.base_class import CustomException
 from PyMatcha.utils.errors.template import generate_error_json
 
 
-class UnauthorizedError(Exception):
+class UnauthorizedError(CustomException):
     """
     This is the UnauthorizedError class for the Exception.
     """
diff --git a/backend/PyMatcha/utils/orm/_model.py b/backend/PyMatcha/utils/orm/_model.py
@@ -213,7 +213,7 @@ def delete(self):
                 logging.debug("deleted {} from table {}".format(self.id, self.table_name))
                 c.close()
         else:
-            logging.fatal("{} Not in table {}".format(self.id, self.table_name))
+            logging.warning("{} Not in table {}".format(self.id, self.table_name))
             raise Exception("{} Not in table {}".format(self.id, self.table_name))
 
     @classmethod
diff --git a/backend/PyMatcha/utils/tasks.py b/backend/PyMatcha/utils/tasks.py
@@ -12,6 +12,14 @@
 from PyMatcha.utils.match_score import _get_distance
 from PyMatcha.utils.match_score import _get_gender_query
 
+BASE_HEAT_SCORE = 30
+LIKES_MULTIPLIER = 2
+SUPERLIKES_MULTIPLIER = 10
+MATCHES_MULTIPLIER = 4
+REPORTS_MULTIPLIER = 10
+VIEW_MULTIPLIER = 1
+MESSAGES_DIVIDER = 5
+
 
 @celery.on_after_configure.connect
 def setup_periodic_tasks(sender, **kwargs):
@@ -23,7 +31,9 @@ def setup_periodic_tasks(sender, **kwargs):
 @celery.task
 def update_heat_scores():
     for user in User.select_all():
-        likes_received = len(user.get_likes_received())
+        likes = [like.is_superlike for like in user.get_likes_received()]
+        likes_received = likes.count(False)
+        superlikes_received = likes.count(True)
         reports_received = len(user.get_reports_received())
         views = len(user.get_views())
         matches = len(user.get_matches())
@@ -32,14 +42,15 @@ def update_heat_scores():
         except ValueError:
             messages = 0
 
-        score = 30
+        score = BASE_HEAT_SCORE
         if user.username == "seluj78" or user.username == "tet":
             score += 100
-        score += likes_received * 2
-        score += matches * 4
-        score -= reports_received * 10
-        score += views
-        score += ceil(messages / 5)
+        score += likes_received * LIKES_MULTIPLIER
+        score += superlikes_received * SUPERLIKES_MULTIPLIER
+        score += matches * MATCHES_MULTIPLIER
+        score -= reports_received * REPORTS_MULTIPLIER
+        score += views * VIEW_MULTIPLIER
+        score += ceil(messages / MESSAGES_DIVIDER)
         user.heat_score = score
         user.save()
         return f"Updated heat score for user {user.id}: {user.heat_score}."
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -33,4 +33,6 @@ argon2-cffi==20.1.0
 
 geopy==2.0.0
 fuzzywuzzy==0.18.0
-python-Levenshtein==0.12.0
+python-Levenshtein==0.12.0
+
+sentry-sdk==0.17.6
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,10 +38,9 @@ services:
     container_name: workers
     build:
       context: .
-      dockerfile: backend.Dockerfile
+      dockerfile: workers.Dockerfile
     env_file:
       - .env.docker
-    entrypoint: celery worker --workdir . -A PyMatcha.celery -B --loglevel=info
     volumes:
       - backend:/backend
     depends_on:
@@ -84,6 +83,8 @@ services:
     build:
       context: .
       dockerfile: frontend.Dockerfile
+    env_file:
+      - .env.docker
     volumes:
       - './frontend:/frontend'
       - '/frontend/node_modules'
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,6 +9,9 @@
   },
   "dependencies": {
     "axios": "^0.20.0",
+    "@sentry/browser": "^5.24.2",
+    "@sentry/integrations": "^5.24.2",
+    "@sentry/tracing": "^5.24.2",
     "core-js": "^3.6.5",
     "tailwindcss": "^1.8.10",
     "vee-validate": "^3.3.11",
diff --git a/frontend/src/main.js b/frontend/src/main.js
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
diff --git a/workers.Dockerfile b/workers.Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ def api_create_user():`
`49`	`49`	`last_name=data["last_name"],`
`50`	`50`	`)`
`51`	`51`	`except ConflictError as e:`
`52`		`- current_app.logger.fatal("Conflict error on user register: {}".format(e))`
	`52`	`+ current_app.logger.warning("Conflict error on user register: {}".format(e))`
`53`	`53`	`raise e`
`54`	`54`	`else:`
`55`	`55`	`token = generate_confirmation_token(email=data["email"], token_type="confirm")`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class CustomException(Exception):`
	`2`	`+ pass`