From 7e469421b971207aa1affcb27a80c79dcd40e350 Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Fri, 21 Oct 2022 23:09:02 -0700 Subject: [PATCH 1/7] Fixed test_wave_01. Complite required function in party.py for test_wave_01. --- tests/test_wave_01.py | 33 +++++++++++++++++---------------- viewing_party/party.py | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..fc6daa233 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 @@ -19,7 +19,7 @@ def test_create_successful_movie(): assert new_movie["genre"] == GENRE_1 assert new_movie["rating"] == pytest.approx(RATING_1) -@pytest.mark.skip() +#@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 = { @@ -118,13 +118,12 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 + assert updated_data["watched"][0]["genre"] == GENRE_1 + assert updated_data["watched"][0]["rating"] == RATING_1 - 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_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -142,13 +141,15 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - - raise Exception("Test needs to be completed.") + assert updated_data["watched"][0]["title"] == movie_to_watch["title"] + assert updated_data["watched"][0]["genre"] == movie_to_watch["genre"] + assert updated_data["watched"][0]["rating"] == movie_to_watch["rating"] + #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/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..b856842a5 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,8 +1,42 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + new_movie = dict() + if title == None or genre == None or rating == None: + return None + else: + new_movie["title"] = title + new_movie["genre"] = genre + new_movie["rating"] = rating + return new_movie +def add_to_watched(user_data, movie): + updated_user_data = { + "watched": [] + } + updated_user_data["watched"].insert(0,movie) + return updated_user_data + +def add_to_watchlist(user_data, movie): + updated_user_data = { + "watchlist": [] + } + updated_user_data["watchlist"].insert(0,movie) + return updated_user_data + +def watch_movie(user_data, movie_title): + #user_data = { + # "watchlist": [], + # "watched": [] + #} + if movie_title == None or user_data["watchlist"] == None: + return user_data + else: + for movie in user_data["watchlist"]: + if movie["title"] == movie_title: + user_data["watched"].insert(0,movie) + user_data["watchlist"].remove(movie) + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- From ae446a22f73f74438ec9b147618962bc17cc010b Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Sat, 22 Oct 2022 21:10:47 -0700 Subject: [PATCH 2/7] Comlete wave_test2.py. Create function for wave2. --- tests/test_wave_02.py | 8 ++++---- viewing_party/party.py | 26 +++++++++++++++++++++----- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..36b504008 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -2,7 +2,7 @@ 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() @@ -14,7 +14,7 @@ def test_calculates_watched_average_rating(): 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 +27,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 +39,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/viewing_party/party.py b/viewing_party/party.py index b856842a5..e2f27fe8f 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,4 +1,5 @@ # ------------- WAVE 1 -------------------- +import statistics def create_movie(title, genre, rating): new_movie = dict() @@ -25,10 +26,6 @@ def add_to_watchlist(user_data, movie): return updated_user_data def watch_movie(user_data, movie_title): - #user_data = { - # "watchlist": [], - # "watched": [] - #} if movie_title == None or user_data["watchlist"] == None: return user_data else: @@ -40,8 +37,27 @@ def watch_movie(user_data, movie_title): # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + avg_rating = 0.0 + sum_ratings = 0 + if len(user_data["watched"]) == 0: + return 0.0 + else: + for element in user_data["watched"]: + sum_ratings += element["rating"] + avg_rating = sum_ratings/len(user_data["watched"]) + return avg_rating - +def get_most_watched_genre(user_data): + most_watched_genre = "" + list_of_genre = list() + if len(user_data["watched"]) == 0: + return None + else: + for i in range(len(user_data["watched"])): + list_of_genre.append(user_data["watched"][i]["genre"]) + most_watched_genre = statistics.mode(list_of_genre) + return most_watched_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- From 5f9b3ee2bb666688479bc759cdfd4b8387da0cc3 Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Sun, 23 Oct 2022 20:20:30 -0700 Subject: [PATCH 3/7] create functions for wave_03 test. Fixes or complite test_wave_03.py --- tests/test_wave_01.py | 16 +--------------- tests/test_wave_02.py | 4 ---- tests/test_wave_03.py | 19 +++++++++++-------- viewing_party/party.py | 36 +++++++++++++++++++++++++++++++++++- 4 files changed, 47 insertions(+), 28 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index fc6daa233..4c1f28bae 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -4,7 +4,6 @@ from viewing_party.party import * from tests.test_constants import * -#@pytest.mark.skip() def test_create_successful_movie(): # Arrange movie_title = MOVIE_TITLE_1 @@ -19,7 +18,6 @@ def test_create_successful_movie(): assert new_movie["genre"] == GENRE_1 assert new_movie["rating"] == pytest.approx(RATING_1) -#@pytest.mark.skip() def test_create_no_title_movie(): # Arrange movie_title = None @@ -32,7 +30,6 @@ def test_create_no_title_movie(): # Assert assert new_movie is None -#@pytest.mark.skip() def test_create_no_genre_movie(): # Arrange movie_title = "Title A" @@ -45,7 +42,6 @@ def test_create_no_genre_movie(): # Assert assert new_movie is None -#@pytest.mark.skip() def test_create_no_rating_movie(): # Arrange movie_title = "Title A" @@ -58,7 +54,6 @@ def test_create_no_rating_movie(): # Assert assert new_movie is None -#@pytest.mark.skip() def test_adds_movie_to_user_watched(): # Arrange movie = { @@ -79,7 +74,6 @@ 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() def test_adds_movie_to_user_watchlist(): # Arrange movie = { @@ -100,7 +94,6 @@ 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() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -122,8 +115,6 @@ def test_moves_movie_from_watchlist_to_empty_watched(): assert updated_data["watched"][0]["genre"] == GENRE_1 assert updated_data["watched"][0]["rating"] == RATING_1 - -#@pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -144,12 +135,7 @@ def test_moves_movie_from_watchlist_to_watched(): assert updated_data["watched"][0]["title"] == movie_to_watch["title"] assert updated_data["watched"][0]["genre"] == movie_to_watch["genre"] assert updated_data["watched"][0]["rating"] == movie_to_watch["rating"] - #raise Exception("Test needs to be completed.") - # ******************************************************************************************* - # ****** Add assertions here to test that the correct movie was added to "watched" ********** - # ******************************************************************************************* - -#@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 36b504008..b0d363d9d 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -2,7 +2,6 @@ from viewing_party.party import * from tests.test_constants import * -#@pytest.mark.skip() def test_calculates_watched_average_rating(): # Arrange janes_data = clean_wave_2_data() @@ -14,7 +13,6 @@ def test_calculates_watched_average_rating(): assert average == pytest.approx(3.58333) assert janes_data == clean_wave_2_data() -#@pytest.mark.skip() def test_empty_watched_average_rating_is_zero(): # Arrange janes_data = { @@ -27,7 +25,6 @@ def test_empty_watched_average_rating_is_zero(): # Assert assert average == pytest.approx(0.0) -#@pytest.mark.skip() def test_most_watched_genre(): # Arrange janes_data = clean_wave_2_data() @@ -39,7 +36,6 @@ def test_most_watched_genre(): assert popular_genre == "Fantasy" assert janes_data == clean_wave_2_data() -#@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..c525a3c16 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -2,7 +2,7 @@ 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() @@ -16,7 +16,7 @@ def test_my_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,7 +28,7 @@ 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() @@ -43,7 +43,7 @@ def test_friends_unique_movies(): assert FANTASY_4 in 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 +51,19 @@ def test_friends_unique_movies_not_duplicated(): # Act friends_unique_movies = get_friends_unique_watched(amandas_data) - + list_of_title = list() + for i in range(len(friends_unique_movies)): + list_of_title.append(friends_unique_movies[i]["title"]) + # Assert assert len(friends_unique_movies) == 3 - - raise Exception("Test needs to be completed.") + assert len(set(list_of_title)) == len(list_of_title) + #raise Exception("Test needs to be completed.") # ************************************************************************************************* # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** # ************************************************************************************************** -@pytest.mark.skip() +#@pytest.mark.skip() def test_friends_not_unique_movies(): # Arrange amandas_data = { diff --git a/viewing_party/party.py b/viewing_party/party.py index e2f27fe8f..72e17fc84 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -61,7 +61,41 @@ def get_most_watched_genre(user_data): # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +def get_unique_watched(user_data): + friends_movie_list = list() + unique_movies = list() + if len(user_data["watched"]) == 0: + unique_movies = [] + return unique_movies + else: + for i in range(len(user_data["friends"])): + for j in range(len(user_data["friends"][i]["watched"])): + friends_movie_list.append(user_data["friends"][i]["watched"][j]["title"]) + friends_movie_set = set(friends_movie_list) + for k in range(len(user_data["watched"])): + if user_data["watched"][k]["title"] not in friends_movie_set: + unique_movies.append(user_data["watched"][k]) + return unique_movies + +def get_friends_unique_watched(user_data): + friends_movie_list = list() + friends_unique_movies = list() + if len(user_data["watched"]) == 0: + for i in range(len(user_data["friends"])): + for j in range(len(user_data["friends"][i]["watched"])): + if (friends_movie_list[i] not in friends_unique_movies): + friends_movie_list.append(user_data["friends"][i]["watched"][j]) + #friends_unique_movies = set(friends_movie_list) + return friends_unique_movies + else: + for i in range(len(user_data["friends"])): + for j in range(len(user_data["friends"][i]["watched"])): + friends_movie_list.append(user_data["friends"][i]["watched"][j]) + for k in range(len(friends_movie_list)): + if (friends_movie_list[k] not in user_data["watched"]) and ((friends_movie_list[k] not in friends_unique_movies)): + friends_unique_movies.append(friends_movie_list[k]) + #friends_unique_movies_set = set(friends_unique_movies) + return friends_unique_movies#_set # ----------------------------------------- # ------------- WAVE 4 -------------------- From bbc97f688b22ae743f2c9581522d8cf7d8777129 Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Sun, 23 Oct 2022 21:13:42 -0700 Subject: [PATCH 4/7] create function get_available_recs. Complite test_wave_04 --- tests/test_wave_03.py | 16 ++++++---------- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 27 ++++++++++++++++++--------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index c525a3c16..e24ef91c2 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -2,7 +2,7 @@ from viewing_party.party import * from tests.test_constants import * -#@pytest.mark.skip() + def test_my_unique_movies(): # Arrange amandas_data = clean_wave_3_data() @@ -16,7 +16,7 @@ def test_my_unique_movies(): assert INTRIGUE_2 in amandas_unique_movies assert amandas_data == clean_wave_3_data() -#@pytest.mark.skip() + def test_my_not_unique_movies(): # Arrange amandas_data = clean_wave_3_data() @@ -28,7 +28,7 @@ def test_my_not_unique_movies(): # Assert assert len(amandas_unique_movies) == 0 -#@pytest.mark.skip() + def test_friends_unique_movies(): # Arrange amandas_data = clean_wave_3_data() @@ -43,7 +43,7 @@ def test_friends_unique_movies(): assert FANTASY_4 in friends_unique_movies assert amandas_data == clean_wave_3_data() -#@pytest.mark.skip() + def test_friends_unique_movies_not_duplicated(): # Arrange amandas_data = clean_wave_3_data() @@ -58,12 +58,8 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 assert len(set(list_of_title)) == len(list_of_title) - #raise Exception("Test needs to be completed.") - # ************************************************************************************************* - # ****** Add assertions here to test that the correct movies are 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..79ab18ff7 100644 --- a/tests/test_wave_04.py +++ b/tests/test_wave_04.py @@ -2,7 +2,7 @@ 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() @@ -16,7 +16,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 +38,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/viewing_party/party.py b/viewing_party/party.py index 72e17fc84..db70050c1 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -6,10 +6,10 @@ def create_movie(title, genre, rating): if title == None or genre == None or rating == None: return None else: - new_movie["title"] = title - new_movie["genre"] = genre - new_movie["rating"] = rating - return new_movie + new_movie["title"] = title + new_movie["genre"] = genre + new_movie["rating"] = rating + return new_movie def add_to_watched(user_data, movie): updated_user_data = { @@ -83,9 +83,7 @@ def get_friends_unique_watched(user_data): if len(user_data["watched"]) == 0: for i in range(len(user_data["friends"])): for j in range(len(user_data["friends"][i]["watched"])): - if (friends_movie_list[i] not in friends_unique_movies): - friends_movie_list.append(user_data["friends"][i]["watched"][j]) - #friends_unique_movies = set(friends_movie_list) + friends_movie_list.append(user_data["friends"][i]["watched"][j]) return friends_unique_movies else: for i in range(len(user_data["friends"])): @@ -94,13 +92,24 @@ def get_friends_unique_watched(user_data): for k in range(len(friends_movie_list)): if (friends_movie_list[k] not in user_data["watched"]) and ((friends_movie_list[k] not in friends_unique_movies)): friends_unique_movies.append(friends_movie_list[k]) - #friends_unique_movies_set = set(friends_unique_movies) return friends_unique_movies#_set # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- - +def get_available_recs(user_data): + list_of_recommended_movies = list() + unique_friends_movie = get_friends_unique_watched(user_data) + if not user_data["watched"] or not unique_friends_movie or not user_data["subscriptions"]: + return list_of_recommended_movies + else: + for i in range(len(unique_friends_movie)): + if unique_friends_movie[i]["host"] in user_data["subscriptions"]: + list_of_recommended_movies.append(unique_friends_movie[i]) + if not list_of_recommended_movies: + return list_of_recommended_movies + else: + return list_of_recommended_movies # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- From 3209aff1dac8fb12ccfb6a861101b49440594062 Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Sun, 23 Oct 2022 22:02:39 -0700 Subject: [PATCH 5/7] Complete test_wave_05.py and code get_rec_from_favorites and get_new_rec_by_genre functions. --- tests/test_wave_05.py | 23 ++++++++++++----------- viewing_party/party.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..a5d6f7f7f 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() + 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() + def test_new_genre_rec_from_empty_watched(): # Arrange sonyas_data = { @@ -38,7 +38,7 @@ def test_new_genre_rec_from_empty_watched(): # Assert assert len(recommendations) == 0 -@pytest.mark.skip() + def test_new_genre_rec_from_empty_friends(): # Arrange sonyas_data = { @@ -52,13 +52,14 @@ def test_new_genre_rec_from_empty_friends(): } ] } + + # Act + recommendations = get_new_rec_by_genre(sonyas_data) + + # Assert + assert len(recommendations) == 0 + - raise Exception("Test needs to be completed.") - # ********************************************************************* - # ****** Complete the Act and Assert Portions of theis tests ********** - # ********************************************************************* - -@pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +73,7 @@ def test_unique_rec_from_favorites(): assert INTRIGUE_2b in recommendations assert sonyas_data == clean_wave_5_data() -@pytest.mark.skip() + def test_unique_from_empty_favorites(): # Arrange sonyas_data = { @@ -94,7 +95,7 @@ def test_unique_from_empty_favorites(): # Assert assert len(recommendations) == 0 -@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 db70050c1..cef9215c8 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -113,4 +113,34 @@ def get_available_recs(user_data): # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + recommended_movies = list() + list_of_genre = list() + if not user_data["watched"]: + return recommended_movies + else: + for movie in user_data["watched"]: + list_of_genre.append(movie["genre"]) + most_ofen_genre = statistics.mode(list_of_genre) + list_of_movies = get_friends_unique_watched(user_data) + if not list_of_movies or not list_of_genre: + return recommended_movies + else: + for i in range(len(list_of_movies)): + if list_of_movies[i]["genre"] == most_ofen_genre: + recommended_movies.append(list_of_movies[i]) + return recommended_movies +def get_rec_from_favorites(user_data): + recommended_movies = list() + favorite_movies = list() + if not user_data["watched"]: + return recommended_movies + else: + unique_movies = get_unique_watched(user_data) + for i in range(len(user_data["favorites"])): + favorite_movies.append(user_data["favorites"][i]) + for movie in unique_movies: + if movie in favorite_movies: + recommended_movies.append(movie) + return recommended_movies \ No newline at end of file From 02192def6385f179178e527dbf3105c232e1bc1b Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Mon, 24 Oct 2022 18:10:22 -0700 Subject: [PATCH 6/7] finished --- viewing_party/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index cef9215c8..9305d870c 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -137,7 +137,7 @@ def get_rec_from_favorites(user_data): if not user_data["watched"]: return recommended_movies else: - unique_movies = get_unique_watched(user_data) + unique_movies = get_unique_watched(user_data) #user's watched movies, different from friend's movies for i in range(len(user_data["favorites"])): favorite_movies.append(user_data["favorites"][i]) for movie in unique_movies: From 94cd31dcdaea7abc02f2fcafb1ff27d9ebc0d802 Mon Sep 17 00:00:00 2001 From: Catherine Bandarchuk Date: Sun, 6 Nov 2022 16:37:23 -0800 Subject: [PATCH 7/7] refactor the code. --- tests/test_wave_01.py | 4 +- tests/test_wave_03.py | 7 +- viewing_party/party.py | 172 +++++++++++++++++------------------------ 3 files changed, 75 insertions(+), 108 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 4c1f28bae..9072364f4 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -132,9 +132,7 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - assert updated_data["watched"][0]["title"] == movie_to_watch["title"] - assert updated_data["watched"][0]["genre"] == movie_to_watch["genre"] - assert updated_data["watched"][0]["rating"] == movie_to_watch["rating"] + assert movie_to_watch in updated_data["watched"] def test_does_nothing_if_movie_not_in_watchlist(): # Arrange diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index e24ef91c2..1e14f2cff 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -51,13 +51,12 @@ def test_friends_unique_movies_not_duplicated(): # Act friends_unique_movies = get_friends_unique_watched(amandas_data) - list_of_title = list() - for i in range(len(friends_unique_movies)): - list_of_title.append(friends_unique_movies[i]["title"]) # Assert assert len(friends_unique_movies) == 3 - assert len(set(list_of_title)) == len(list_of_title) + assert INTRIGUE_3 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert FANTASY_4 in friends_unique_movies def test_friends_not_unique_movies(): diff --git a/viewing_party/party.py b/viewing_party/party.py index 9305d870c..498e93ee3 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -2,37 +2,30 @@ import statistics def create_movie(title, genre, rating): + if not title or not genre or not rating: + return None new_movie = dict() - if title == None or genre == None or rating == None: - return None - else: - new_movie["title"] = title - new_movie["genre"] = genre - new_movie["rating"] = rating - return new_movie + new_movie["title"] = title + new_movie["genre"] = genre + new_movie["rating"] = rating + return new_movie def add_to_watched(user_data, movie): - updated_user_data = { - "watched": [] - } - updated_user_data["watched"].insert(0,movie) - return updated_user_data + user_data["watched"].append(movie) + return user_data def add_to_watchlist(user_data, movie): - updated_user_data = { - "watchlist": [] - } - updated_user_data["watchlist"].insert(0,movie) - return updated_user_data + user_data["watchlist"].append(movie) + return user_data -def watch_movie(user_data, movie_title): - if movie_title == None or user_data["watchlist"] == None: +def watch_movie(user_data, title): + if not title or not user_data["watchlist"]: return user_data - else: - for movie in user_data["watchlist"]: - if movie["title"] == movie_title: - user_data["watched"].insert(0,movie) - user_data["watchlist"].remove(movie) + for i in range(len(user_data["watchlist"])): + movie = user_data["watchlist"][i] + if movie["title"] == title: + user_data["watched"].append(movie) + user_data["watchlist"].remove(movie) return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- @@ -42,105 +35,82 @@ def get_watched_avg_rating(user_data): sum_ratings = 0 if len(user_data["watched"]) == 0: return 0.0 - else: - for element in user_data["watched"]: - sum_ratings += element["rating"] - avg_rating = sum_ratings/len(user_data["watched"]) - return avg_rating + for element in user_data["watched"]: + sum_ratings += element["rating"] + avg_rating = sum_ratings/len(user_data["watched"]) + return avg_rating def get_most_watched_genre(user_data): - most_watched_genre = "" - list_of_genre = list() if len(user_data["watched"]) == 0: return None - else: - for i in range(len(user_data["watched"])): - list_of_genre.append(user_data["watched"][i]["genre"]) - most_watched_genre = statistics.mode(list_of_genre) - return most_watched_genre + most_watched_genre = "" + list_of_genre = list() + for movie in user_data["watched"]: + list_of_genre.append(movie["genre"]) + most_watched_genre = statistics.mode(list_of_genre) + return most_watched_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- def get_unique_watched(user_data): - friends_movie_list = list() + if not user_data["watched"]: + return [] + friends_movie_set = set() unique_movies = list() - if len(user_data["watched"]) == 0: - unique_movies = [] - return unique_movies - else: - for i in range(len(user_data["friends"])): - for j in range(len(user_data["friends"][i]["watched"])): - friends_movie_list.append(user_data["friends"][i]["watched"][j]["title"]) - friends_movie_set = set(friends_movie_list) - for k in range(len(user_data["watched"])): - if user_data["watched"][k]["title"] not in friends_movie_set: - unique_movies.append(user_data["watched"][k]) - return unique_movies + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_movie_set.add(movie["title"]) + for user_movie in user_data["watched"]: + if user_movie["title"] not in friends_movie_set: + unique_movies.append(user_movie) + return unique_movies def get_friends_unique_watched(user_data): - friends_movie_list = list() + if not user_data["watched"]: + return [] friends_unique_movies = list() - if len(user_data["watched"]) == 0: - for i in range(len(user_data["friends"])): - for j in range(len(user_data["friends"][i]["watched"])): - friends_movie_list.append(user_data["friends"][i]["watched"][j]) - return friends_unique_movies - else: - for i in range(len(user_data["friends"])): - for j in range(len(user_data["friends"][i]["watched"])): - friends_movie_list.append(user_data["friends"][i]["watched"][j]) - for k in range(len(friends_movie_list)): - if (friends_movie_list[k] not in user_data["watched"]) and ((friends_movie_list[k] not in friends_unique_movies)): - friends_unique_movies.append(friends_movie_list[k]) - return friends_unique_movies#_set - + for friend in user_data["friends"]: + for movie in friend["watched"]: + if ( movie not in user_data["watched"] and + movie not in friends_unique_movies): + friends_unique_movies.append(movie) + return friends_unique_movies # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- def get_available_recs(user_data): - list_of_recommended_movies = list() unique_friends_movie = get_friends_unique_watched(user_data) - if not user_data["watched"] or not unique_friends_movie or not user_data["subscriptions"]: - return list_of_recommended_movies - else: - for i in range(len(unique_friends_movie)): - if unique_friends_movie[i]["host"] in user_data["subscriptions"]: - list_of_recommended_movies.append(unique_friends_movie[i]) - if not list_of_recommended_movies: - return list_of_recommended_movies - else: - return list_of_recommended_movies + if ( not user_data["watched"] or + not unique_friends_movie or + not user_data["subscriptions"]): + return [] + list_of_recommended_movies = list() + for movie in unique_friends_movie: + if movie["host"] in user_data["subscriptions"]: + list_of_recommended_movies.append(movie) + return list_of_recommended_movies # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- def get_new_rec_by_genre(user_data): - recommended_movies = list() - list_of_genre = list() if not user_data["watched"]: - return recommended_movies - else: - for movie in user_data["watched"]: - list_of_genre.append(movie["genre"]) - most_ofen_genre = statistics.mode(list_of_genre) - list_of_movies = get_friends_unique_watched(user_data) - if not list_of_movies or not list_of_genre: - return recommended_movies - else: - for i in range(len(list_of_movies)): - if list_of_movies[i]["genre"] == most_ofen_genre: - recommended_movies.append(list_of_movies[i]) - return recommended_movies + return [] + list_of_genre = get_most_watched_genre(user_data) + list_of_movies = get_friends_unique_watched(user_data) + if not list_of_movies or not list_of_genre: + return [] + recommended_movies = list() + for movie in list_of_movies: + if movie["genre"] == list_of_genre: + recommended_movies.append(movie) + return recommended_movies def get_rec_from_favorites(user_data): - recommended_movies = list() - favorite_movies = list() if not user_data["watched"]: - return recommended_movies - else: - unique_movies = get_unique_watched(user_data) #user's watched movies, different from friend's movies - for i in range(len(user_data["favorites"])): - favorite_movies.append(user_data["favorites"][i]) - for movie in unique_movies: - if movie in favorite_movies: - recommended_movies.append(movie) - return recommended_movies \ No newline at end of file + return [] + recommended_movies = list() + unique_movies = get_unique_watched(user_data) + for movie in unique_movies: + if movie in user_data["favorites"]: + recommended_movies.append(movie) + return recommended_movies \ No newline at end of file