From 1dd27186f5115336d85f007137e27c81af693236 Mon Sep 17 00:00:00 2001 From: Monica Date: Mon, 22 May 2023 15:28:21 -0700 Subject: [PATCH 1/5] finished all of wave 1, passing 9/11 tests for wave 1 --- tests/test_wave_01.py | 22 +++++++++++----------- viewing_party/party.py | 22 +++++++++++++++++++++- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 669efee6a..010ddc03d 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_non_empty_user_watched(): # Arrange movie = { @@ -99,7 +99,7 @@ def test_adds_movie_to_non_empty_user_watched(): assert movie in updated_data["watched"] assert FANTASY_2 in updated_data["watched"] -@pytest.mark.skip() +#@pytest.mark.skip() def test_adds_movie_to_user_watchlist(): # Arrange movie = { @@ -120,7 +120,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_adds_movie_to_non_empty_user_watchlist(): # Arrange movie = { @@ -140,7 +140,7 @@ def test_adds_movie_to_non_empty_user_watchlist(): assert movie in updated_data["watchlist"] assert FANTASY_2 in updated_data["watchlist"] -@pytest.mark.skip() +#@pytest.mark.skip() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -164,7 +164,7 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # ****** 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 @@ -188,7 +188,7 @@ def test_moves_movie_from_watchlist_to_watched(): # ****** 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..51ce5f467 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,7 +1,27 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + if title and genre and rating: + movie_dict = { + "title": title, + "genre": genre, + "rating": rating + } + return movie_dict + +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): + if title in user_data["watchlist"]: + user_data["watchlist"].remove(title) + user_data["watched"].append(title) + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- From ac6e7c8f67462ac6d4abc1a591983e812b24ebc8 Mon Sep 17 00:00:00 2001 From: Monica Date: Wed, 24 May 2023 11:09:10 -0700 Subject: [PATCH 2/5] VS code debugger not working, commiting & restarting vs code --- tests/test_wave_01.py | 5 +---- viewing_party/party.py | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 010ddc03d..768161230 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -159,10 +159,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.") - # ******************************************************************************************* - # ****** Add assertions here to test that the correct movie was added to "watched" ********** - # ******************************************************************************************* + assert MOVIE_TITLE_1 == updated_data["watched"][0]["title"] #@pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): diff --git a/viewing_party/party.py b/viewing_party/party.py index 51ce5f467..1e7044be7 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -18,9 +18,9 @@ def add_to_watchlist(user_data, movie): return user_data def watch_movie(user_data, title): - if title in user_data["watchlist"]: - user_data["watchlist"].remove(title) - user_data["watched"].append(title) + if title in user_data["watchlist"][0]: + user_data["watchlist"].remove([0]) + user_data["watched"].append([0]) return user_data # ----------------------------------------- From 05a254b65b168a79a14c780d8d84e49bd3cf7c63 Mon Sep 17 00:00:00 2001 From: Monica Date: Mon, 29 May 2023 20:35:55 -0700 Subject: [PATCH 3/5] one last test to finish before wave one is complete --- tests/test_wave_01.py | 3 ++- viewing_party/party.py | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 768161230..14b99211d 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -179,8 +179,9 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 + assert HORROR_1 == updated_data["watched"][1]["title"] - 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" ********** # ******************************************************************************************* diff --git a/viewing_party/party.py b/viewing_party/party.py index 1e7044be7..cd2c6ad97 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -18,9 +18,20 @@ def add_to_watchlist(user_data, movie): return user_data def watch_movie(user_data, title): - if title in user_data["watchlist"][0]: - user_data["watchlist"].remove([0]) - user_data["watched"].append([0]) + watchlist = user_data.get("watchlist", []) + watched = user_data.get("watched", []) + + found_movie = None + + for movie in watchlist: + if movie["title"] == title: + found_movie = movie + break + + if found_movie: + watchlist.remove(found_movie) + watched.append(found_movie) + return user_data # ----------------------------------------- From a2880f38da1204e7bc7c188ffbaad446df16cd3c Mon Sep 17 00:00:00 2001 From: Monica Date: Thu, 20 Jul 2023 22:27:21 -0700 Subject: [PATCH 4/5] worked on move_to_watched function, 1/10 tests still not passing --- viewing_party/party.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index cd2c6ad97..e2d972f9f 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -26,13 +26,12 @@ def watch_movie(user_data, title): for movie in watchlist: if movie["title"] == title: found_movie = movie - break - - if found_movie: - watchlist.remove(found_movie) - watched.append(found_movie) - + watchlist.remove(movie) + watched.append(movie) + + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- From 3e055633361f125f6d7be96b14e96a2a27573a73 Mon Sep 17 00:00:00 2001 From: Monica Date: Wed, 16 Aug 2023 13:21:58 -0700 Subject: [PATCH 5/5] finished --- tests/test_wave_01.py | 8 ++++ tests/test_wave_02.py | 10 ++-- tests/test_wave_03.py | 22 +++++---- tests/test_wave_04.py | 6 +-- tests/test_wave_05.py | 19 +++++--- viewing_party/party.py | 104 ++++++++++++++++++++++++++++++++++++++++- 6 files changed, 145 insertions(+), 24 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 14b99211d..f3551d1af 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -172,14 +172,22 @@ def test_moves_movie_from_watchlist_to_watched(): ], "watched": [FANTASY_2] } + print("Before watch_movie:") + print("Watchlist:", janes_data["watchlist"]) + print("Watched:", janes_data["watched"]) # Act updated_data = watch_movie(janes_data, movie_to_watch["title"]) + print("After watch_movie:") + print("Watchlist:", updated_data["watchlist"]) + print("Watched:", updated_data["watched"]) + # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 assert HORROR_1 == updated_data["watched"][1]["title"] + assert any(movie["title"] == movie_to_watch["title"] for movie in updated_data["watched"]) #raise Exception("Test needs to be completed.") # ******************************************************************************************* diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 19f045c79..ff8a229e4 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_most_watched_genre_order_mixed(): # Arrange janes_data = clean_wave_2b_data() @@ -51,7 +51,7 @@ def test_most_watched_genre_order_mixed(): assert popular_genre == "Fantasy" assert janes_data == clean_wave_2b_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..8a8ea66e5 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -2,7 +2,8 @@ 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 +17,8 @@ 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 +30,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 +45,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() @@ -54,13 +56,17 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - - raise Exception("Test needs to be completed.") + assert FANTASY_4 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert INTRIGUE_3 in friends_unique_movies + + + #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 = { @@ -86,4 +92,4 @@ def test_friends_not_unique_movies(): friends_unique_movies = get_friends_unique_watched(amandas_data) # Assert - assert len(friends_unique_movies) == 0 + assert len(friends_unique_movies) == 0 \ No newline at end of file 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/tests/test_wave_05.py b/tests/test_wave_05.py index b2ba9ad33..90b02d1cc 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,17 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") + # Act + recommended_movies = get_new_rec_by_genre(sonyas_data) + + # Assert + assert len(recommended_movies) == 0 + # raise Exception("Test needs to be completed.") # ********************************************************************* # ****** Complete the Act and Assert Portions of these tests ********** # ********************************************************************* -@pytest.mark.skip() +#@pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +77,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 +99,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 e2d972f9f..bea79a5b2 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -37,17 +37,119 @@ def watch_movie(user_data, title): # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + watched_movies = user_data["watched"] + if not watched_movies: + return 0.0 + + total_ratings = sum(movie.get("rating", 0) for movie in watched_movies) + average_rating = total_ratings / len(watched_movies) + return average_rating + +def get_most_watched_genre(user_data): + watched_movies = user_data["watched"] + if not watched_movies: + return None + + genre_count = {} + for movie in watched_movies: + genre = movie.get("genre") + if genre: + genre_count[genre] = genre_count.get(genre, 0) + 1 + + most_watched_genre = max(genre_count, key=genre_count.get) + return most_watched_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +def get_unique_watched(user_data): + + friends_watched_list = [] + friends_watched_set = None + friends_list = [] + + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_list.append(movie["title"]) + friends_watched_set = set(friends_watched_list) + + for movie in user_data["watched"]: + if movie["title"] not in friends_watched_set and movie not in friends_list: + friends_list.append(movie) + + return friends_list + + +def get_friends_unique_watched(user_data): + + user_watched = set([movie["title"] for movie in user_data["watched"]]) + friends_list = [] + + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie["title"] not in user_watched and movie not in friends_list: + friends_list.append(movie) + + return friends_list + + + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + + unseen_by_user = get_friends_unique_watched(user_data) + user_subscriptions = user_data["subscriptions"] + available_recs = [] + + for movie in unseen_by_user: + if movie["host"] in user_subscriptions: + available_recs.append(movie) + return available_recs + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + + user_watched = set([movie["title"] for movie in user_data["watched"]]) + friends_unique_watched = get_friends_unique_watched(user_data) + + genre_count = {} + for movie in user_data["watched"]: + genre = movie["genre"] + genre_count[genre] = genre_count.get(genre, 0) + 1 + best_genre = None + best_genre_count = 0 + for genre, count in genre_count.items(): + if count > best_genre_count: + best_genre = genre + best_genre_count = count + + recommended_movies = [] + for movie in friends_unique_watched: + if movie["title"] not in user_watched and movie["genre"] == best_genre: + recommended_movies.append(movie) + + return recommended_movies + + +# 2ND function in Wave 5 +def get_rec_from_favorites(user_data): + + user_favorites = user_data["favorites"] + recommended_movies = [] + + if user_data["friends"] == []: + return user_favorites + else: + unseen_by_friends = get_unique_watched(user_data) + for movie in unseen_by_friends: + if movie in user_favorites: + recommended_movies.append(movie) + return recommended_movies \ No newline at end of file