From 67be97a84f24c33c4b96e6d6829e5ee78cd6e441 Mon Sep 17 00:00:00 2001
From: Tamim Almahdi <talmahdi.2181@gmail.com>
Date: Wed, 19 Apr 2023 17:45:36 +0100
Subject: [PATCH] Add song call to get song info
---
feedMicroservice/app.py | 25 +++++++++++++++++++++----
userMicroservice/routes/Followers.js | 15 ++++++++++++++-
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/feedMicroservice/app.py b/feedMicroservice/app.py
index 1841d0ef..50e9a8a4 100644
--- a/feedMicroservice/app.py
+++ b/feedMicroservice/app.py
@@ -21,17 +21,34 @@ def getFeed():
data = {
"userID": userID,
}
- followers = requests.post('http://localhost:3002/followings/getFollowings',
+ followers = (requests.post('http://localhost:3002/followings/getFollowings',
json=data,
- headers=headers)
- followers = followers.json()
+ headers=headers)).json()
print(followers)
followersID = []
for i in range (len(followers)):
- followersID.append(followers[i]['followerID'])
+ followersID.append(followers[i]['userID'])
print(followersID)
+ ratingsFeed = []
+
+ for i in range (len(followersID)):
+ id = int(followersID[i])
+ followerRatings = (requests.get(f'http://localhost:5050/all_ratings?userID={id}')).json()
+ print(followerRatings)
+ feedInfo = []
+ for i in range (len(followerRatings)):
+ song = (requests.get(f'http://localhost:5050/search_id/{followerRatings[i][0]}')).json()
+ feedInfo.append(song) #song, rating, user infos
+ print(feedInfo)
+ ratingsFeed.append(followerRatings)
+
+ # for i in range (len(ratingsFeed)):
+
+
+ print(ratingsFeed)
+
# userID
# get users' followings' ratings
diff --git a/userMicroservice/routes/Followers.js b/userMicroservice/routes/Followers.js
index f312a0eb..3104b09a 100644
--- a/userMicroservice/routes/Followers.js
+++ b/userMicroservice/routes/Followers.js
@@ -52,7 +52,7 @@ router.post("/unfollow", validateToken, async (req, res) => {
}
});
-router.post("/getFollowings", validateToken, async (req, res) => {
+router.post("/getFollowers", validateToken, async (req, res) => {
const { userID } = req.body;
const user = await Users.findOne({ where: { id: userID } });
if (user != null) {
@@ -65,4 +65,17 @@ router.post("/getFollowings", validateToken, async (req, res) => {
}
});
+router.post("/getFollowings", validateToken, async (req, res) => {
+ const { userID } = req.body;
+ const user = await Users.findOne({ where: { id: userID } });
+ if (user != null) {
+ const followers = await Followers.findAll({
+ where: { followerID: `${user.id}` },
+ });
+ res.json(followers);
+ } else {
+ res.json({ error: "User or users does not exist" });
+ }
+});
+
module.exports = router;
--
GitLab