From 5af2b0c58e68fc842c16c60284d6f3382d30051a Mon Sep 17 00:00:00 2001 From: hang tran Date: Tue, 20 Sep 2022 13:34:14 -0700 Subject: [PATCH 1/3] first git lesson --- tests/test_wave_01.py | 30 ++++++---- tests/test_wave_02.py | 2 + viewing_party/party.py | 126 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 145 insertions(+), 13 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..17882b536 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -4,7 +4,7 @@ from viewing_party.party import * from tests.test_constants import * -@pytest.mark.skip() +# @pytest.mark.skip() def test_create_successful_movie(): # Arrange movie_title = MOVIE_TITLE_1 @@ -18,8 +18,8 @@ def test_create_successful_movie(): assert new_movie["title"] == MOVIE_TITLE_1 assert new_movie["genre"] == GENRE_1 assert new_movie["rating"] == pytest.approx(RATING_1) - -@pytest.mark.skip() +#this test to see if our create movie function will return true if +# @pytest.mark.skip() def test_create_no_title_movie(): # Arrange movie_title = None @@ -32,7 +32,7 @@ def test_create_no_title_movie(): # Assert assert new_movie is None -@pytest.mark.skip() +# @pytest.mark.skip() def test_create_no_genre_movie(): # Arrange movie_title = "Title A" @@ -45,7 +45,7 @@ def test_create_no_genre_movie(): # Assert assert new_movie is None -@pytest.mark.skip() +# @pytest.mark.skip() def test_create_no_rating_movie(): # Arrange movie_title = "Title A" @@ -58,7 +58,7 @@ def test_create_no_rating_movie(): # Assert assert new_movie is None -@pytest.mark.skip() +# @pytest.mark.skip() def test_adds_movie_to_user_watched(): # Arrange movie = { @@ -79,7 +79,7 @@ def test_adds_movie_to_user_watched(): assert updated_data["watched"][0]["genre"] == GENRE_1 assert updated_data["watched"][0]["rating"] == RATING_1 -@pytest.mark.skip() +# @pytest.mark.skip() def test_adds_movie_to_user_watchlist(): # Arrange movie = { @@ -100,7 +100,7 @@ def test_adds_movie_to_user_watchlist(): assert updated_data["watchlist"][0]["genre"] == GENRE_1 assert updated_data["watchlist"][0]["rating"] == RATING_1 -@pytest.mark.skip() +# @pytest.mark.skip() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -123,8 +123,14 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 + assert updated_data["watched"][0] == { + "title": MOVIE_TITLE_1, + "genre": GENRE_1, + "rating": RATING_1 } -@pytest.mark.skip() + +# @pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -143,12 +149,12 @@ def test_moves_movie_from_watchlist_to_watched(): assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* - -@pytest.mark.skip() + +# @pytest.mark.skip() def test_does_nothing_if_movie_not_in_watchlist(): # Arrange movie_to_watch = HORROR_1 diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..deb434483 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -51,3 +51,5 @@ def test_genre_is_None_if_empty_watched(): # Assert assert popular_genre == None + + diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..e7ed91396 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,16 +1,140 @@ # ------------- WAVE 1 -------------------- +import json def create_movie(title, genre, rating): - pass + + + movie = { + "title":title, + "genre":genre, + "rating":rating + } + #returns none if title or movie or rating is falsy + if title == None or genre == None or rating == None: + return None + #returns none if title or movie or rating is falsy + else: + return movie + + + + + + +def add_to_watched(user_data, movie): + #user data is dictionary w/ key "watched", value = [{}] + + + user_data = { + "watched": [movie] + } + + ## create_movie(title, genre, rating) #call create_movie function + +# last step to return user_data + return user_data + +def add_to_watchlist(user_data, movie): + #user_data {"watchlist": list of dictionaries representing the movies the user wants to watch} + #if watchlist = [] means no movies in watchlist + user_data = {"watchlist":[movie]} + + return user_data + + + + +def watch_movie(user_data, title): + + + + for movie_title in user_data["watchlist"]: + if title == movie_title["title"]: + user_data["watchlist"].remove(movie_title) + user_data["watched"].append(movie_title) + return user_data + + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): +# +# #find average rating by accessing the "ratings" key from "watched" list from user_data dictionary +#user_data = {'watched': [{'genre': 'Fantasy', 'rating': 4.8, 'title': 'The Lord of the Functions: The Fellowship of the Function'}... 'rating': 2.0, 'title': 'Recursion'}, {'genre': 'Intrigue', 'rating': 4.5, 'title': 'Instructor Student TA Manager'}]} + + rating_list = [] #is this actually testing the function in pytest? + + if rating_list is None: #if empty list + return 0.0 + + for watch_list in user_data["watched"]: + for movie_rating in watch_list: + # print(movie_rating) + rating_list.append(movie_rating["rating"]) + + + try: #not sure if I need to add this + average = sum(rating_list)/len(rating_list) + except ZeroDivisionError: + average = 0 + + return format(average,".6f") #how do I get the format so that it is 3.58333 + + + + + + + + + + +# def get_most_watched_genre(user_data): +# #access the genre by user_data["watched"] +# # to get the most frequently occuring in watched list, use a counter and for loop + +# # popular_genre = 0 + +# genre_list = [] + +# if len(user_data["watched"]) == 0: +# return None + +# else: +# for watch_list in user_data["watched"]: +# for movie_dict in watch_list: +# genre_list.append(movie_dict["genre"]) + + + + + +# #not sure if we can use this but this should give the element with highest frequency , will use counter if not +# return max(set(genre_list), key =genre_list.count) + + + + + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +# def get_unique_watched(user_data): +# #initiated two emtpy list: user and friends +# #loop through user_data + +# #turn user/ friends list to set and find difference result = set_a - set_b + +# user_list = [] +# friends_list = [] + + + + # ----------------------------------------- From 9ad9c7712e6dadb1588d1f1e73986d2c5e783319 Mon Sep 17 00:00:00 2001 From: hang tran Date: Thu, 22 Sep 2022 22:10:41 -0700 Subject: [PATCH 2/3] all waves finished --- tests/test_wave_01.py | 11 ++- tests/test_wave_02.py | 9 ++- tests/test_wave_03.py | 28 ++++--- tests/test_wave_04.py | 7 +- tests/test_wave_05.py | 21 +++-- viewing_party/party.py | 176 ++++++++++++++++++++++++++++------------- 6 files changed, 170 insertions(+), 82 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 17882b536..7b7212ecc 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -119,7 +119,7 @@ def test_moves_movie_from_watchlist_to_empty_watched(): assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 - raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* @@ -128,6 +128,7 @@ def test_moves_movie_from_watchlist_to_empty_watched(): "title": MOVIE_TITLE_1, "genre": GENRE_1, "rating": RATING_1 } + # @pytest.mark.skip() @@ -149,11 +150,17 @@ def test_moves_movie_from_watchlist_to_watched(): assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - # raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* + # print(updated_data) + + # print(updated_data["watched"][0]["title"]) + # print(janes_data) + assert updated_data["watched"][0]["title"] == "The Lord of the Functions: The Two Parameters" + assert updated_data["watched"][1]["title"] == "It Came from the Stack Trace" # @pytest.mark.skip() def test_does_nothing_if_movie_not_in_watchlist(): # Arrange diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index deb434483..9610db07a 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -2,19 +2,20 @@ from viewing_party.party import * from tests.test_constants import * -@pytest.mark.skip() +# @pytest.mark.skip() def test_calculates_watched_average_rating(): # Arrange janes_data = clean_wave_2_data() # Act average = get_watched_avg_rating(janes_data) + print(average) # Assert assert average == pytest.approx(3.58333) assert janes_data == clean_wave_2_data() -@pytest.mark.skip() +# @pytest.mark.skip() def test_empty_watched_average_rating_is_zero(): # Arrange janes_data = { @@ -27,7 +28,7 @@ def test_empty_watched_average_rating_is_zero(): # Assert assert average == pytest.approx(0.0) -@pytest.mark.skip() +# @pytest.mark.skip() def test_most_watched_genre(): # Arrange janes_data = clean_wave_2_data() @@ -39,7 +40,7 @@ def test_most_watched_genre(): assert popular_genre == "Fantasy" assert janes_data == clean_wave_2_data() -@pytest.mark.skip() +# @pytest.mark.skip() def test_genre_is_None_if_empty_watched(): # Arrange janes_data = { diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..538ecf24e 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -2,21 +2,26 @@ from viewing_party.party import * from tests.test_constants import * -@pytest.mark.skip() +# @pytest.mark.skip() def test_my_unique_movies(): # Arrange amandas_data = clean_wave_3_data() + print(amandas_data) # Act amandas_unique_movies = get_unique_watched(amandas_data) + # Assert assert len(amandas_unique_movies) == 2 assert FANTASY_2 in amandas_unique_movies assert INTRIGUE_2 in amandas_unique_movies assert amandas_data == clean_wave_3_data() - -@pytest.mark.skip() + + + + +# @pytest.mark.skip() def test_my_not_unique_movies(): # Arrange amandas_data = clean_wave_3_data() @@ -28,22 +33,24 @@ def test_my_not_unique_movies(): # Assert assert len(amandas_unique_movies) == 0 -@pytest.mark.skip() +# @pytest.mark.skip() def test_friends_unique_movies(): # Arrange amandas_data = clean_wave_3_data() # Act friends_unique_movies = get_friends_unique_watched(amandas_data) - + # Assert assert len(friends_unique_movies) == 3 assert INTRIGUE_3 in friends_unique_movies assert HORROR_1 in friends_unique_movies assert FANTASY_4 in friends_unique_movies + # print(friends_unique_movies) assert amandas_data == clean_wave_3_data() + -@pytest.mark.skip() +# @pytest.mark.skip() def test_friends_unique_movies_not_duplicated(): # Arrange amandas_data = clean_wave_3_data() @@ -51,16 +58,17 @@ def test_friends_unique_movies_not_duplicated(): # Act friends_unique_movies = get_friends_unique_watched(amandas_data) - + print(amandas_data) # Assert assert len(friends_unique_movies) == 3 - raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ************************************************************************************************* # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** # ************************************************************************************************** - -@pytest.mark.skip() + assert INTRIGUE_3 in friends_unique_movies + +# @pytest.mark.skip() def test_friends_not_unique_movies(): # Arrange amandas_data = { diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index 499669077..1252f3665 100644 --- a/tests/test_wave_04.py +++ b/tests/test_wave_04.py @@ -2,10 +2,11 @@ from viewing_party.party import * from tests.test_constants import * -@pytest.mark.skip() +# @pytest.mark.skip() def test_get_available_friend_rec(): # Arrange amandas_data = clean_wave_4_data() + print(amandas_data) # Act recommendations = get_available_recs(amandas_data) @@ -16,7 +17,7 @@ def test_get_available_friend_rec(): assert FANTASY_4b in recommendations assert amandas_data == clean_wave_4_data() -@pytest.mark.skip() +# @pytest.mark.skip() def test_no_available_friend_recs(): # Arrange amandas_data = { @@ -38,7 +39,7 @@ def test_no_available_friend_recs(): # Assert assert len(recommendations) == 0 -@pytest.mark.skip() +# @pytest.mark.skip() def test_no_available_friend_recs_watched_all(): # Arrange amandas_data = { diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..10bbde827 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -2,7 +2,7 @@ from viewing_party.party import * from tests.test_constants import * -@pytest.mark.skip() +# @pytest.mark.skip() def test_new_genre_rec(): # Arrange sonyas_data = clean_wave_5_data() @@ -17,7 +17,7 @@ def test_new_genre_rec(): assert FANTASY_4b in recommendations assert sonyas_data == clean_wave_5_data() -@pytest.mark.skip() +# @pytest.mark.skip() def test_new_genre_rec_from_empty_watched(): # Arrange sonyas_data = { @@ -38,7 +38,8 @@ def test_new_genre_rec_from_empty_watched(): # Assert assert len(recommendations) == 0 -@pytest.mark.skip() + +# @pytest.mark.skip() def test_new_genre_rec_from_empty_friends(): # Arrange sonyas_data = { @@ -53,12 +54,18 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ********************************************************************* # ****** Complete the Act and Assert Portions of theis tests ********** # ********************************************************************* + recommendations = get_new_rec_by_genre(sonyas_data) + + assert len(recommendations) == 0 + + + -@pytest.mark.skip() +# @pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +79,7 @@ def test_unique_rec_from_favorites(): assert INTRIGUE_2b in recommendations assert sonyas_data == clean_wave_5_data() -@pytest.mark.skip() +# @pytest.mark.skip() def test_unique_from_empty_favorites(): # Arrange sonyas_data = { @@ -94,7 +101,7 @@ def test_unique_from_empty_favorites(): # Assert assert len(recommendations) == 0 -@pytest.mark.skip() +# @pytest.mark.skip() def test_new_rec_from_empty_friends(): # Arrange sonyas_data = { diff --git a/viewing_party/party.py b/viewing_party/party.py index e7ed91396..cc1bd3fc9 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,5 +1,5 @@ # ------------- WAVE 1 -------------------- -import json + def create_movie(title, genre, rating): @@ -12,7 +12,7 @@ def create_movie(title, genre, rating): #returns none if title or movie or rating is falsy if title == None or genre == None or rating == None: return None - #returns none if title or movie or rating is falsy + else: return movie @@ -22,21 +22,18 @@ def create_movie(title, genre, rating): def add_to_watched(user_data, movie): - #user data is dictionary w/ key "watched", value = [{}] - + #user data is dictionary w/ key "watched" user_data = { "watched": [movie] } - ## create_movie(title, genre, rating) #call create_movie function - -# last step to return user_data + return user_data def add_to_watchlist(user_data, movie): #user_data {"watchlist": list of dictionaries representing the movies the user wants to watch} - #if watchlist = [] means no movies in watchlist + user_data = {"watchlist":[movie]} return user_data @@ -46,7 +43,6 @@ def add_to_watchlist(user_data, movie): def watch_movie(user_data, title): - for movie_title in user_data["watchlist"]: if title == movie_title["title"]: @@ -64,84 +60,152 @@ def get_watched_avg_rating(user_data): # #find average rating by accessing the "ratings" key from "watched" list from user_data dictionary #user_data = {'watched': [{'genre': 'Fantasy', 'rating': 4.8, 'title': 'The Lord of the Functions: The Fellowship of the Function'}... 'rating': 2.0, 'title': 'Recursion'}, {'genre': 'Intrigue', 'rating': 4.5, 'title': 'Instructor Student TA Manager'}]} - rating_list = [] #is this actually testing the function in pytest? + rating_list = [] + + + for movie in user_data["watched"]: - if rating_list is None: #if empty list + rating_list.append(movie["rating"]) + if len(user_data["watched"]) == 0: return 0.0 + + else: + return sum(rating_list)/len(rating_list) - for watch_list in user_data["watched"]: - for movie_rating in watch_list: - # print(movie_rating) - rating_list.append(movie_rating["rating"]) - - - try: #not sure if I need to add this - average = sum(rating_list)/len(rating_list) - except ZeroDivisionError: - average = 0 - - return format(average,".6f") #how do I get the format so that it is 3.58333 + + +def get_most_watched_genre(user_data): + #access the genre by user_data["watched"] + + genre_list = [] - + if len(user_data["watched"]) == 0: + return None + else: + for watch_list in user_data["watched"]: + genre_list.append(watch_list["genre"]) + return max(set(genre_list), key =genre_list.count) +# # ----------------------------------------- +# # ------------- WAVE 3 -------------------- +# # ----------------------------------------- +def get_unique_watched(user_data): + +# initiated two emtpy list: user and friends +#we have an outer dictionary, one with "watched" key and one with "friends " key +# {'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8}, {'title': 'The Lord of the Functions: The Two Parameters', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'The Lord of the Functions: The Return of the Value', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'The JavaScript and the React', 'genre': 'Action', 'rating': 2.2}, {'title': 'Recursion', 'genre': 'Intrigue', 'rating': 2.0}, {'title': 'Instructor Student TA Manager', 'genre': 'Intrigue', 'rating': 4.5}], +# 'friends': [{'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8}, {'title': 'The Lord of the Functions: The Return of the Value', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'The Programmer: An Unexpected Stack Trace', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'It Came from the Stack Trace', 'genre': 'Horror', 'rating': 3.5}]}, {'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8}, {'title': 'The JavaScript and the React', 'genre': 'Action', 'rating': 2.2}, {'title': 'Recursion', 'genre': 'Intrigue', 'rating': 2.0}, {'title': 'Zero Dark Python', 'genre': 'Intrigue', 'rating': 3.0}]}] +#They want to see the what the user saw that none of their friends saw, and return list of movies [{title:,genre:},] +# loop through user_data and use if statement to see if user_data["watched"] is in user_data["friends"] + +#The Lord of the Functions: The Fellowship of the Function'The Lord of the Functions: The Two Parameters',The Lord of the Functions: The Return of the Value,'The JavaScript and the React''Recursion'Instructor Student TA Manager' +# 'The Lord of the Functions: The Fellowship of the Function''The Lord of the Functions: The Return of the Value''The Programmer: An Unexpected Stack Trace','It Came from the Stack Trace', 'The Lord of the Functions: The Fellowship of the Function',The JavaScript and the React','Recursion','Zero Dark Python' + -# def get_most_watched_genre(user_data): -# #access the genre by user_data["watched"] -# # to get the most frequently occuring in watched list, use a counter and for loop + friends_watched_titles = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie["title"] not in friends_watched_titles: + friends_watched_titles.append(movie["title"]) + + + + unique_movies = [] + for user_watched_movie in user_data["watched"]: + if user_watched_movie["title"] not in friends_watched_titles: + unique_movies.append(user_watched_movie) + return unique_movies + + +def get_friends_unique_watched(user_data): +#get only one of the friend's movie watched list, compare it to the users to see what the friend has saw the user hasn't + + + user_list =[] + friend_unique_movies = [] + friend_unique_no_duplicate = [] + + for i in user_data["watched"]: + user_list.append(i) + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in user_list: + friend_unique_movies.append(movie) + #removing duplicates + friend_unique_no_duplicate = [i for n, i in enumerate(friend_unique_movies) + if i not in friend_unique_movies[n + 1:]] + return friend_unique_no_duplicate -# # popular_genre = 0 -# genre_list = [] -# if len(user_data["watched"]) == 0: -# return None -# else: -# for watch_list in user_data["watched"]: -# for movie_dict in watch_list: -# genre_list.append(movie_dict["genre"]) + +# # ----------------------------------------- +# # ------------- WAVE 4 -------------------- +# # ----------------------------------------- +def get_available_recs(user_data): +# # # {'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8, 'host': 'netflix'} +# # # 'subscriptions': ['netflix', 'hulu']} +# # #return a list with what the user has not wached that would be in the friends list, that the user has a subscription for + + + recommended_movies = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie["host"] in user_data["subscriptions"]: + if movie not in user_data["watched"]: + recommended_movies.append(movie) + return recommended_movies + - - -# #not sure if we can use this but this should give the element with highest frequency , will use counter if not -# return max(set(genre_list), key =genre_list.count) - +# # # ----------------------------------------- +# # # ------------- WAVE 5 -------------------- +# # # ----------------------------------------- +def get_new_rec_by_genre(user_data): +# we have to make a list of recommended movies from the friend's unique watched list IF it is in the most frequently watched genre + recommended_movies = [] + most_watched_genre = get_most_watched_genre(user_data) + + + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie["genre"] == most_watched_genre: + if movie not in user_data["watched"]: + recommended_movies.append(movie) + return recommended_movies -# ----------------------------------------- -# ------------- WAVE 3 -------------------- -# ----------------------------------------- -# def get_unique_watched(user_data): -# #initiated two emtpy list: user and friends -# #loop through user_data -# #turn user/ friends list to set and find difference result = set_a - set_b + -# user_list = [] -# friends_list = [] +def get_rec_from_favorites(user_data): +# make a list of recommendations from user's favorite + + recommendations =[] + user_watched_movies = get_unique_watched(user_data) + for movie in user_data["favorites"]: + if movie in user_watched_movies: + recommendations.append(movie) + return recommendations + - -# ----------------------------------------- -# ------------- WAVE 4 -------------------- -# ----------------------------------------- -# ----------------------------------------- -# ------------- WAVE 5 -------------------- -# ----------------------------------------- + + From c6eff33f808f46290e19bc9892a5ccc85fcdb61a Mon Sep 17 00:00:00 2001 From: hang tran Date: Fri, 23 Sep 2022 08:46:00 -0700 Subject: [PATCH 3/3] revision --- tests/test_wave_01.py | 7 ++----- viewing_party/party.py | 27 +++++++++++---------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 7b7212ecc..e0a537115 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -150,14 +150,11 @@ def test_moves_movie_from_watchlist_to_watched(): assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - # raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* - # print(updated_data) - - # print(updated_data["watched"][0]["title"]) - # print(janes_data) + assert updated_data["watched"][0]["title"] == "The Lord of the Functions: The Two Parameters" assert updated_data["watched"][1]["title"] == "It Came from the Stack Trace" diff --git a/viewing_party/party.py b/viewing_party/party.py index cc1bd3fc9..e85dc54cf 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -76,7 +76,7 @@ def get_watched_avg_rating(user_data): def get_most_watched_genre(user_data): - #access the genre by user_data["watched"] + #determine the most frequently occuring genre in user's watched list genre_list = [] @@ -101,13 +101,8 @@ def get_unique_watched(user_data): #we have an outer dictionary, one with "watched" key and one with "friends " key # {'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8}, {'title': 'The Lord of the Functions: The Two Parameters', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'The Lord of the Functions: The Return of the Value', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'The JavaScript and the React', 'genre': 'Action', 'rating': 2.2}, {'title': 'Recursion', 'genre': 'Intrigue', 'rating': 2.0}, {'title': 'Instructor Student TA Manager', 'genre': 'Intrigue', 'rating': 4.5}], # 'friends': [{'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8}, {'title': 'The Lord of the Functions: The Return of the Value', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'The Programmer: An Unexpected Stack Trace', 'genre': 'Fantasy', 'rating': 4.0}, {'title': 'It Came from the Stack Trace', 'genre': 'Horror', 'rating': 3.5}]}, {'watched': [{'title': 'The Lord of the Functions: The Fellowship of the Function', 'genre': 'Fantasy', 'rating': 4.8}, {'title': 'The JavaScript and the React', 'genre': 'Action', 'rating': 2.2}, {'title': 'Recursion', 'genre': 'Intrigue', 'rating': 2.0}, {'title': 'Zero Dark Python', 'genre': 'Intrigue', 'rating': 3.0}]}] -#They want to see the what the user saw that none of their friends saw, and return list of movies [{title:,genre:},] -# loop through user_data and use if statement to see if user_data["watched"] is in user_data["friends"] - -#The Lord of the Functions: The Fellowship of the Function'The Lord of the Functions: The Two Parameters',The Lord of the Functions: The Return of the Value,'The JavaScript and the React''Recursion'Instructor Student TA Manager' -# 'The Lord of the Functions: The Fellowship of the Function''The Lord of the Functions: The Return of the Value''The Programmer: An Unexpected Stack Trace','It Came from the Stack Trace', 'The Lord of the Functions: The Fellowship of the Function',The JavaScript and the React','Recursion','Zero Dark Python' - - +#They want to see the what the user saw that none of their friends saw, and return list of movies + friends_watched_titles = [] for friend in user_data["friends"]: for movie in friend["watched"]: @@ -131,8 +126,8 @@ def get_friends_unique_watched(user_data): friend_unique_movies = [] friend_unique_no_duplicate = [] - for i in user_data["watched"]: - user_list.append(i) + for movie in user_data["watched"]: + user_list.append(movie) for friend in user_data["friends"]: for movie in friend["watched"]: if movie not in user_list: @@ -156,11 +151,11 @@ def get_available_recs(user_data): recommended_movies = [] + for friend in user_data["friends"]: for movie in friend["watched"]: - if movie["host"] in user_data["subscriptions"]: - if movie not in user_data["watched"]: - recommended_movies.append(movie) + if movie["host"] in user_data["subscriptions"] and movie not in user_data["watched"]: + recommended_movies.append(movie) return recommended_movies @@ -182,9 +177,8 @@ def get_new_rec_by_genre(user_data): for friend in user_data["friends"]: for movie in friend["watched"]: - if movie["genre"] == most_watched_genre: - if movie not in user_data["watched"]: - recommended_movies.append(movie) + if movie["genre"] == most_watched_genre and movie not in user_data["watched"]: + recommended_movies.append(movie) return recommended_movies @@ -197,6 +191,7 @@ def get_rec_from_favorites(user_data): recommendations =[] user_watched_movies = get_unique_watched(user_data) + for movie in user_data["favorites"]: if movie in user_watched_movies: recommendations.append(movie)