Merge pull request #221 from Seluj78/feature/recommendations

Author: Seluj78

PyMatcha.postman_collection.json

@@ -2656,7 +2656,7 @@
 											"    pm.response.to.have.status(200);",
 											"});",
 											"",
-											"tests[\"Is geohash correct\"] = response.geohash == \"ezzw82vu4u1r\""
+											"tests[\"Is geohash correct\"] = response.geohash == \"spb8kg12wgw3\""
 										],
 										"type": "text/javascript"
 									}
@@ -5437,6 +5437,92 @@
 			],
 			"protocolProfileBehavior": {}
 		},
+		{
+			"name": "Recommendations",
+			"item": [
+				{
+					"name": "Start recommendation calculations",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "c9b3da99-1f4b-4600-b5d6-4206123e4eb4",
+								"exec": [
+									"var response = JSON.parse(responseBody);",
+									"",
+									"",
+									"pm.test(\"Status code is 200\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "debug-auth-token",
+								"value": "{{debug_token}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{host}}/debug/recommendations/start",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"debug",
+								"recommendations",
+								"start"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get user recommendations",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "1e7dfd1f-a36c-448b-9ce3-acbc0af0a537",
+								"exec": [
+									"pm.test(\"Status code is 200\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									"",
+									"pm.test(\"Recommendations aren't null\", function () {",
+									"    var jsonData = pm.response.json();",
+									"    pm.expect(jsonData.recommendations).to.not.eql(null);",
+									"});",
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{host}}/recommendations",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"recommendations"
+							]
+						}
+					},
+					"response": []
+				}
+			],
+			"protocolProfileBehavior": {}
+		},
 		{
 			"name": "Reset",
 			"item": [
@@ -5532,6 +5618,48 @@
 						}
 					},
 					"response": []
+				},
+				{
+					"name": "Reset redis",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "bb64517b-6835-4be3-9662-3ceede1a6316",
+								"exec": [
+									"pm.test(\"Status code is 200\", function () {",
+									"    pm.response.to.have.status(204);",
+									"});",
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "noauth"
+						},
+						"method": "DELETE",
+						"header": [
+							{
+								"key": "debug-auth-token",
+								"type": "text",
+								"value": "{{debug_token}}"
+							}
+						],
+						"url": {
+							"raw": "{{host}}/debug/redis",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"debug",
+								"redis"
+							]
+						}
+					},
+					"response": []
 				}
 			],
 			"protocolProfileBehavior": {}
@@ -5595,92 +5723,92 @@
 	],
 	"variable": [
 		{
-			"id": "461c4e89-379c-4ecc-ab3d-e9a9ac5df859",
+			"id": "ae3c1742-39ab-4715-8465-cb39b5c29c05",
 			"key": "host",
 			"value": "http://127.0.0.1:5000"
 		},
 		{
-			"id": "b70cbb5c-c6d1-4a86-8001-5b11d2a86ebc",
+			"id": "e7d35862-55e7-4448-88f0-e8bc244b05b0",
 			"key": "user_id",
 			"value": ""
 		},
 		{
-			"id": "0b2b9986-ac92-4be7-9971-8c6cff053764",
+			"id": "e98b5a69-255c-49c1-8fa1-003c42ace8ac",
 			"key": "user_email",
 			"value": "foo@example.org"
 		},
 		{
-			"id": "a582fcb5-db29-4339-8734-d4c842f859a4",
+			"id": "affc13a3-4e03-4aa3-bd3b-0c2d3e90e037",
 			"key": "user_username",
 			"value": "foo"
 		},
 		{
-			"id": "c90dc190-68cc-42dd-b3f7-79b25c8097bd",
+			"id": "9ca9cb60-b44c-4b96-a537-a83070ae0615",
 			"key": "user_password",
 			"value": "admin"
 		},
 		{
-			"id": "c94d4c0a-5eb8-40aa-bfda-81b1af3edf17",
+			"id": "026847e3-4dc0-4939-a4f4-0678ed0c8125",
 			"key": "user_firstname",
 			"value": "Foo"
 		},
 		{
-			"id": "afde1579-3438-45dd-b7fc-063b6baa7d07",
+			"id": "695b6e88-1415-48b8-a12b-0b9662ade9e7",
 			"key": "user_lastname",
 			"value": "Bar"
 		},
 		{
-			"id": "418dab0a-b2b3-4a6a-82c3-50f1ae99d548",
+			"id": "7207a34c-d57b-40f2-b889-4c92033b283b",
 			"key": "debug_token",
 			"value": "xX69jules69Xx"
 		},
 		{
-			"id": "ce3f5bd7-c5d7-4d36-8b69-58fbb34c99cc",
+			"id": "1f4d2d09-e806-4790-8a9e-84bf7f0462a2",
 			"key": "user_access_token",
 			"value": ""
 		},
 		{
-			"id": "00529b58-2d48-49ef-b100-5717853dad2b",
+			"id": "b5761a25-0920-417f-9179-8c5be97097ac",
 			"key": "user_refresh_token",
 			"value": ""
 		},
 		{
-			"id": "2b58f894-ab87-46e9-a36f-e333381e9eb2",
+			"id": "2564fe00-7a58-4ce2-a10f-36692c2611f0",
 			"key": "expired_token",
 			"value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTAyNDIyNjQsIm5iZiI6MTU5MDI0MjI2NCwianRpIjoiNTM0ZGI5NzQtOWE4Ni00MGViLWE1NDEtMDg3N2ZmNzQ3NDVhIiwiZXhwIjoxNTkwMjQyMzI0LCJpZGVudGl0eSI6eyJpZCI6NTEyLCJlbWFpbCI6ImZvb0BleGFtcGxlLm9yZyIsInVzZXJuYW1lIjoiYmFyIiwiaXNfb25saW5lIjp0cnVlLCJkYXRlX2xhc3RzZWVuIjoiU2F0LCAyMyBNYXkgMjAyMCAxMzo1Nzo0NCBHTVQifSwiZnJlc2giOnRydWUsInR5cGUiOiJhY2Nlc3MifQ.NTp2P0WNkXDwzuzrcNIQdeAfizQ57HQgkzBLSvY1yHU"
 		},
 		{
-			"id": "7712423f-6e0e-4634-aee6-e6dde0b5a424",
+			"id": "2f511bbd-529c-4955-860c-67d059eac1c8",
 			"key": "user_orientation",
 			"value": "heterosexual"
 		},
 		{
-			"id": "b77f31fc-c749-418b-acfd-4387628b9d57",
+			"id": "ca85a202-0c8b-4d10-8262-63dd3cd86beb",
 			"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": "ae2a77eb-02ee-4439-a20b-023432b7ea16",
+			"id": "4a4205b9-65d4-4303-bf80-0954310b2a8d",
 			"key": "user_gender",
 			"value": "male"
 		},
 		{
-			"id": "273e5cdc-2313-4b17-a26c-f5f0a3207f30",
+			"id": "c8cf0f92-c24e-4ced-b567-d3eef6ce7789",
 			"key": "user_birthdate",
 			"value": "06/04/1998"
 		},
 		{
-			"id": "9942a431-5645-43b4-9e85-497d3b85be3e",
+			"id": "406075a2-5965-4491-9aa6-c879e3ac304e",
 			"key": "user_lat",
 			"value": "44.8404"
 		},
 		{
-			"id": "ead5923f-2d1b-4753-9df3-7ddd9b8e721a",
+			"id": "703dc3ff-eab2-4b17-b522-7a0a7bc6f894",
 			"key": "user_lng",
 			"value": "-0.5805"
 		},
 		{
-			"id": "4a54ddd0-4170-429b-9123-1b7aa11ba636",
+			"id": "a90d387f-4d5b-4832-9136-3d226844c30b",
 			"key": "user_ip",
 			"value": "77.205.46.181"
 		}

backend/PyMatcha/__init__.py

@@ -154,8 +154,11 @@ def expired_token_callback(expired_token):
     host=os.getenv("REDIS_HOST") if not os.getenv("IS_DOCKER_COMPOSE") else "redis",
     port=os.getenv("REDIS_PORT", 6379),
     decode_responses=True,
+    db=2,
 )
 
+redis.flushdb()
+
 from PyMatcha.models.user import get_user
 
 
@@ -172,14 +175,14 @@ def jwt_user_callback(identity):
     except NotFoundError:
         # The user who the server issues the token for was deleted in the db.
         return None
-    redis.set("user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
+    redis.set("online_user:" + str(identity["id"]), datetime.datetime.utcnow().timestamp())
     return u
 
 
 @jwt.token_in_blacklist_loader
 def check_if_token_is_revoked(decrypted_token):
     jti = decrypted_token["jti"]
-    entry = redis.get("jti:" + jti)
+    entry = redis.get("is_revoked_jti:" + jti)
     if entry is None:
         return True
     return entry == "true"
@@ -197,6 +200,7 @@ def check_if_token_is_revoked(decrypted_token):
 from PyMatcha.routes.api.like import like_bp
 from PyMatcha.routes.api.match import match_bp
 from PyMatcha.routes.api.messages import messages_bp
+from PyMatcha.routes.api.recommendations import recommendations_bp
 
 logging.debug("Registering Flask blueprints")
 application.register_blueprint(user_bp)
@@ -211,6 +215,7 @@ def check_if_token_is_revoked(decrypted_token):
 application.register_blueprint(like_bp)
 application.register_blueprint(match_bp)
 application.register_blueprint(messages_bp)
+application.register_blueprint(recommendations_bp)
 
 if application.debug:
     logging.debug("Registering debug route")

backend/PyMatcha/routes/api/auth/login.py

@@ -68,11 +68,11 @@ def auth_login():
     access_jti = get_jti(access_token)
     refresh_jti = get_jti(refresh_token)
 
-    redis.set("jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
-    redis.set("jti:" + refresh_jti, "false", REFRESH_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + refresh_jti, "false", REFRESH_TOKEN_EXPIRES * 1.2)
 
     current_app.logger.debug("/auth/login -> Returning access token for user {}".format(username))
-    redis.set("user:" + str(u.id), datetime.datetime.utcnow().timestamp())
+    redis.set("online_user:" + str(u.id), datetime.datetime.utcnow().timestamp())
     ret = {"access_token": access_token, "refresh_token": refresh_token, "is_profile_completed": u.is_profile_completed}
     return SuccessOutput("return", ret)
 
@@ -83,21 +83,21 @@ def refresh():
     current_user = get_jwt_identity()
     access_token = create_access_token(identity=current_user)
     access_jti = get_jti(encoded_token=access_token)
-    redis.set("jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + access_jti, "false", ACCESS_TOKEN_EXPIRES * 1.2)
     return SuccessOutput("access_token", access_token)
 
 
 @auth_login_bp.route("/auth/access_revoke", methods=["DELETE"])
 @jwt_required
 def logout():
     jti = get_raw_jwt()["jti"]
-    redis.set("jti:" + jti, "true", ACCESS_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + jti, "true", ACCESS_TOKEN_EXPIRES * 1.2)
     return Success("Access token revoked")
 
 
 @auth_login_bp.route("/auth/refresh_revoke", methods=["DELETE"])
 @jwt_refresh_token_required
 def logout2():
     jti = get_raw_jwt()["jti"]
-    redis.set("jti:" + jti, "true", REFRESH_TOKEN_EXPIRES * 1.2)
+    redis.set("is_revoked_jti:" + jti, "true", REFRESH_TOKEN_EXPIRES * 1.2)
     return Success("Refresh token revoked")