From 32383b97840f2c4ceb8cc7f8e92a8b5af0f93ddf Mon Sep 17 00:00:00 2001 From: Reyna Diaz Date: Thu, 15 Sep 2022 17:36:16 -0400 Subject: [PATCH 1/6] updated README title --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 187cdb442..ee87a9052 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Viewing Party +# Viewing Party - Reyna (Tigers) ## Skills Assessed From 5428336d73174ddf112ff5e8f167f5d91168e89c Mon Sep 17 00:00:00 2001 From: Reyna Diaz Date: Tue, 20 Sep 2022 15:06:19 -0400 Subject: [PATCH 2/6] "waves 1 & 2 tests passing" --- play_tester.py | 6 +++-- tests/test_wave_01.py | 25 +++++++++--------- tests/test_wave_02.py | 8 +++--- viewing_party/party.py | 58 ++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 77 insertions(+), 20 deletions(-) diff --git a/play_tester.py b/play_tester.py index 9e2aecf48..93d5d1c9c 100644 --- a/play_tester.py +++ b/play_tester.py @@ -14,11 +14,13 @@ pp.pprint(FANTASY_1) pp.pprint(FANTASY_2) +create_movie("title", "genre", "rating") + # print("\n-----Wave 02 user_data-----") # pp.pprint(clean_wave_2_data()) -#print("\n-----Wave 03 user_data-----") -#pp.pprint(clean_wave_3_data()) +# print("\n-----Wave 03 user_data-----") +# pp.pprint(clean_wave_3_data()) # Wave 04 user data #print("\n-----Wave 04 user_data-----") diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..ae3d386b3 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() # delete or comment this out when ready to run tests 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,13 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 - - raise Exception("Test needs to be completed.") + assert MOVIE_TITLE_1 == updated_data["watched"][0]["title"] + # 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 +142,14 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 + assert movie_to_watch in updated_data["watched"] - 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..198e395b3 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 6d34a6b5f..23f17672c 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,18 +1,72 @@ # ------------- WAVE 1 -------------------- +from tests.test_constants import GENRE_1, MOVIE_TITLE_1, RATING_1 + + def create_movie(title, genre, rating): - pass + new_movie = {} + if title and genre and rating: + new_movie["title"] = title + new_movie["genre"] = genre + new_movie["rating"] = rating + return new_movie + + return None + +def add_to_watched(user_data, movie): + user_data["watched"].append(movie) + + return user_data + +def add_to_watchlist(user_data, movie): + user_data["watchlist"].append(movie) + + return user_data + +def watch_movie(user_data, title): + for movie in user_data["watchlist"]: + if movie["title"] == title: + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + if len(user_data.get("watched")) == 0: + return 0.0 + + rating_average = 0 + for movie in user_data.get("watched"): + rating_average += movie["rating"] + return rating_average / len(user_data.get("watched")) + +def get_most_watched_genre(user_data): + if len(user_data.get("watched")) == 0: + return None + + popular_genre = {} + for movie in user_data.get("watched"): + genre = movie["genre"] + if genre not in popular_genre: + popular_genre[genre] = 1 + else: + popular_genre[genre] += 1 + + genre_count = 0 + most_popular_genre = "" + for g, value in popular_genre.items(): + if value > genre_count: + genre_count = value + most_popular_genre = g + return most_popular_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- From cfcdad60c0d735e4a4fef0afee7f1060aa76d7e2 Mon Sep 17 00:00:00 2001 From: Reyna Diaz Date: Wed, 21 Sep 2022 18:13:51 -0400 Subject: [PATCH 3/6] "updated asserts on test_wave_01&03, wave 3 done" --- tests/test_wave_01.py | 3 +-- tests/test_wave_03.py | 16 +++++++++------- viewing_party/party.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index ae3d386b3..65784dd20 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -142,13 +142,12 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - assert movie_to_watch in updated_data["watched"] # raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* - + assert movie_to_watch in updated_data["watched"] # @pytest.mark.skip() 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 046429360..df60ea94a 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() @@ -55,12 +55,14 @@ def test_friends_unique_movies_not_duplicated(): # 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 FANTASY_4 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert INTRIGUE_3 in friends_unique_movies +# @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 23f17672c..0bd861291 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -67,6 +67,37 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + unique_watched_list = [] + friends_watched_list = [] + user_watched = user_data['watched'] + complete_list_of_friends = user_data['friends'] + + for friend in complete_list_of_friends: + for movie in friend["watched"]: + friends_watched_list.append(movie["title"]) + + for movie in user_watched: + if movie["title"] not in friends_watched_list: + unique_watched_list.append(movie) + return unique_watched_list + +def get_friends_unique_watched(user_data): + friends_unique_watched_list = [] + complete_list_of_friends = user_data['friends'] + user_unwatched_list = [] + user_watched_list = user_data["watched"] + + for friend in complete_list_of_friends: + for movie in friend["watched"]: + if movie not in friends_unique_watched_list: + friends_unique_watched_list.append(movie) + + for movie in friends_unique_watched_list: + if movie not in user_watched_list: + user_unwatched_list.append(movie) + + return user_unwatched_list # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- From f9da3ddeb9814d3b6d19aa6f92ad7b004d5432f2 Mon Sep 17 00:00:00 2001 From: Reyna Diaz Date: Thu, 22 Sep 2022 01:42:39 -0400 Subject: [PATCH 4/6] "wave 4 + refactoring" --- tests/test_wave_04.py | 6 ++--- viewing_party/party.py | 57 ++++++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index 499669077..0b0b3c7e2 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 0bd861291..e9e2cf842 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -27,7 +27,8 @@ def watch_movie(user_data, title): for movie in user_data["watchlist"]: if movie["title"] == title: user_data["watchlist"].remove(movie) - user_data["watched"].append(movie) + user_data["watched"].append(movie) + return user_data # ----------------------------------------- @@ -35,20 +36,23 @@ def watch_movie(user_data, title): # ----------------------------------------- def get_watched_avg_rating(user_data): - if len(user_data.get("watched")) == 0: + if len(user_data["watched"]) == 0: + return 0.0 rating_average = 0 - for movie in user_data.get("watched"): + for movie in user_data["watched"]: rating_average += movie["rating"] + return rating_average / len(user_data.get("watched")) def get_most_watched_genre(user_data): - if len(user_data.get("watched")) == 0: + if len(user_data["watched"]) == 0: + return None popular_genre = {} - for movie in user_data.get("watched"): + for movie in user_data["watched"]: genre = movie["genre"] if genre not in popular_genre: popular_genre[genre] = 1 @@ -57,10 +61,11 @@ def get_most_watched_genre(user_data): genre_count = 0 most_popular_genre = "" - for g, value in popular_genre.items(): + for genre, value in popular_genre.items(): if value > genre_count: genre_count = value - most_popular_genre = g + most_popular_genre = genre + return most_popular_genre # ----------------------------------------- @@ -68,39 +73,49 @@ def get_most_watched_genre(user_data): # ----------------------------------------- def get_unique_watched(user_data): - unique_watched_list = [] - friends_watched_list = [] - user_watched = user_data['watched'] complete_list_of_friends = user_data['friends'] + friends_watched_list = [] for friend in complete_list_of_friends: for movie in friend["watched"]: - friends_watched_list.append(movie["title"]) + friends_watched_list.append(movie) + + user_watched = user_data['watched'] + unique_watched_list = [] for movie in user_watched: - if movie["title"] not in friends_watched_list: + if movie not in friends_watched_list: unique_watched_list.append(movie) + return unique_watched_list def get_friends_unique_watched(user_data): - friends_unique_watched_list = [] complete_list_of_friends = user_data['friends'] - user_unwatched_list = [] - user_watched_list = user_data["watched"] - + friends_watched_list = [] for friend in complete_list_of_friends: for movie in friend["watched"]: - if movie not in friends_unique_watched_list: - friends_unique_watched_list.append(movie) + if movie not in friends_watched_list: + friends_watched_list.append(movie) - for movie in friends_unique_watched_list: + user_watched_list = user_data["watched"] + friends_unique_watched_list = [] + for movie in friends_watched_list: if movie not in user_watched_list: - user_unwatched_list.append(movie) + friends_unique_watched_list.append(movie) - return user_unwatched_list + return friends_unique_watched_list # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + recommendations = [] + friends_unique_watched_list = get_friends_unique_watched(user_data) + for movie in friends_unique_watched_list: + if movie["host"] in user_data["subscriptions"]: + recommendations.append(movie) + + return recommendations + # ----------------------------------------- # ------------- WAVE 5 -------------------- From 260ad7e34325245a4785ee8854d1551c791b324e Mon Sep 17 00:00:00 2001 From: Reyna Diaz Date: Thu, 22 Sep 2022 21:03:49 -0400 Subject: [PATCH 5/6] "wave 5 passing + refactoring" --- tests/test_wave_05.py | 20 +++++++++++++------- viewing_party/party.py | 29 +++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..77e64c33e 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,7 @@ 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 +53,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 ********** # ********************************************************************* + + # Act + recommendations = get_new_rec_by_genre(sonyas_data) + + # Assert + assert recommendations == [] -@pytest.mark.skip() +# @pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +78,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 +100,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 e9e2cf842..e0a3587e4 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -73,10 +73,9 @@ def get_most_watched_genre(user_data): # ----------------------------------------- def get_unique_watched(user_data): - complete_list_of_friends = user_data['friends'] friends_watched_list = [] - for friend in complete_list_of_friends: + for friend in user_data["friends"]: for movie in friend["watched"]: friends_watched_list.append(movie) @@ -90,9 +89,8 @@ def get_unique_watched(user_data): return unique_watched_list def get_friends_unique_watched(user_data): - complete_list_of_friends = user_data['friends'] friends_watched_list = [] - for friend in complete_list_of_friends: + for friend in user_data["friends"]: for movie in friend["watched"]: if movie not in friends_watched_list: friends_watched_list.append(movie) @@ -107,6 +105,7 @@ def get_friends_unique_watched(user_data): # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- + def get_available_recs(user_data): recommendations = [] friends_unique_watched_list = get_friends_unique_watched(user_data) @@ -121,3 +120,25 @@ def get_available_recs(user_data): # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + friends_unique_watched = get_friends_unique_watched(user_data) + most_popular_genre = get_most_watched_genre(user_data) + recommendations = [] + for movie in friends_unique_watched: + if most_popular_genre == movie["genre"]: + recommendations.append(movie) + + return recommendations + +def get_rec_from_favorites(user_data): + friends_watched_list = [] + recommendations = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_list.append(movie) + + recommendations = [] + for movie in user_data["favorites"]: + if movie not in friends_watched_list: + recommendations.append(movie) + return recommendations From 98875d99acc5b06cd4bbe91aab855503f32e01fe Mon Sep 17 00:00:00 2001 From: Reyna Diaz Date: Fri, 23 Sep 2022 09:25:09 -0400 Subject: [PATCH 6/6] "final refactor" --- viewing_party/party.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index e0a3587e4..cbbadd1fa 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -36,15 +36,15 @@ def watch_movie(user_data, title): # ----------------------------------------- def get_watched_avg_rating(user_data): + rating_average = 0.0 if len(user_data["watched"]) == 0: - return 0.0 + return rating_average - rating_average = 0 for movie in user_data["watched"]: rating_average += movie["rating"] - return rating_average / len(user_data.get("watched")) + return rating_average / len(user_data["watched"]) def get_most_watched_genre(user_data): if len(user_data["watched"]) == 0: @@ -79,10 +79,8 @@ def get_unique_watched(user_data): for movie in friend["watched"]: friends_watched_list.append(movie) - user_watched = user_data['watched'] unique_watched_list = [] - - for movie in user_watched: + for movie in user_data["watched"]: if movie not in friends_watched_list: unique_watched_list.append(movie)