From e6d011bc9f12906c17917db396355b2ea2a3cd1e Mon Sep 17 00:00:00 2001 From: AstryBrana Date: Mon, 23 Sep 2024 14:47:24 -0400 Subject: [PATCH 01/10] Wave 1 completed and tests passed --- tests/test_wave_01.py | 33 ++++++++++++++------------------- viewing_party/party.py | 26 +++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 20 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 669efee6a..4d27e28d7 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 = { @@ -155,16 +155,14 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Act updated_data = watch_movie(janes_data, MOVIE_TITLE_1) + # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 + assert updated_data["watched"][-1]["title"] == MOVIE_TITLE_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 @@ -182,13 +180,10 @@ 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"][-1]["title"] == movie_to_watch["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_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..2d7e2d781 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,8 +1,32 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + if not title or not genre or not rating: + return None + + new_movie = {} + new_movie["title"] = title + new_movie["genre"] = genre + new_movie["rating"] = rating + + return new_movie + +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 i in range(len(user_data["watchlist"])): + if user_data["watchlist"][i]["title"] == title: + user_data["watched"].append(user_data["watchlist"][i]) + user_data["watchlist"].pop(i) + return user_data + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- From 1b261f6fd3779d3de3d13688ed1d59a1c7b33b1b Mon Sep 17 00:00:00 2001 From: AstryBrana Date: Mon, 23 Sep 2024 18:55:00 -0400 Subject: [PATCH 02/10] Wave 2 completed with tests passing, wave 3 partially done --- tests/test_wave_02.py | 10 ++++----- tests/test_wave_03.py | 4 ++-- viewing_party/party.py | 47 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 19f045c79..64b62729d 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..289edfc70 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() diff --git a/viewing_party/party.py b/viewing_party/party.py index 2d7e2d781..4acac3e4f 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,4 +1,4 @@ -# ------------- WAVE 1 -------------------- +# ------------- WAVE 1 -------------------- # def create_movie(title, genre, rating): if not title or not genre or not rating: @@ -27,15 +27,52 @@ def watch_movie(user_data, title): user_data["watchlist"].pop(i) return user_data return user_data -# ----------------------------------------- -# ------------- WAVE 2 -------------------- -# ----------------------------------------- + +# ------------- WAVE 2 -------------------- # + +def get_watched_avg_rating(user_data): + avg_rating = 0 + + if not user_data["watched"]: + return avg_rating + + for movie in user_data["watched"]: + avg_rating += movie["rating"] + avg_rating = avg_rating/len(user_data["watched"]) + + return avg_rating + +def get_most_watched_genre(user_data): + if not user_data["watched"]: + return None + genre_count={} + for movie in user_data["watched"]: + current_genre= movie["genre"] + if current_genre not in genre_count.keys(): + genre_count[current_genre] = 1 + else: + genre_count[current_genre] += 1 + most_popular =[] + for genre, count in genre_count.items(): + if not most_popular or most_popular[1] < count: + most_popular= [genre, count] + return most_popular[0] + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +def get_unique_watched(user_data): + unique_movie_list = [] + + for movie in user_data["watched"]: + for friend in user_data["friends"]: + if movie["title"] == friend["title"]: + continue + else: + unique_movie_list.append(movie) + return unique_movie_list # ----------------------------------------- # ------------- WAVE 4 -------------------- From 1f5e8a26ca92c3b7ee5b67c54bd40e992d77eaa4 Mon Sep 17 00:00:00 2001 From: Amber <110812972+Msambere@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:55:57 -0500 Subject: [PATCH 03/10] Honestly not sure --- viewing_party/party.py | 1 + 1 file changed, 1 insertion(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 2d7e2d781..84fd4d54a 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -27,6 +27,7 @@ def watch_movie(user_data, title): user_data["watchlist"].pop(i) return user_data return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- From a108dc79b310d82b9a905b9c103f2fad1b14aea2 Mon Sep 17 00:00:00 2001 From: Amber <110812972+Msambere@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:58:05 -0500 Subject: [PATCH 04/10] Make small formatting changes --- viewing_party/party.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 4acac3e4f..61a36adda 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,4 +1,6 @@ +# ----------------------------------------- # ------------- WAVE 1 -------------------- # +# ----------------------------------------- def create_movie(title, genre, rating): if not title or not genre or not rating: @@ -28,7 +30,9 @@ def watch_movie(user_data, title): return user_data return user_data +# ----------------------------------------- # ------------- WAVE 2 -------------------- # +# ----------------------------------------- def get_watched_avg_rating(user_data): avg_rating = 0 From 5f382e0b15028eb804185ffb0eaa57b384df6664 Mon Sep 17 00:00:00 2001 From: Amber <110812972+Msambere@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:16:24 -0500 Subject: [PATCH 05/10] Create get_unique_watched() --- viewing_party/party.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 61a36adda..deb16cd29 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -68,15 +68,19 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # ----------------------------------------- def get_unique_watched(user_data): - unique_movie_list = [] - - for movie in user_data["watched"]: - for friend in user_data["friends"]: - if movie["title"] == friend["title"]: - continue - else: - unique_movie_list.append(movie) + unique_movie_list = user_data["watched"].copy() + removal_list = [] + for friend in user_data["friends"]: + friend_movie_list = friend["watched"] + for user_movie in unique_movie_list: + if user_movie in friend_movie_list: + removal_list.append(user_movie) + for movie in removal_list: + if movie in unique_movie_list: + unique_movie_list.remove(movie) return unique_movie_list + + # ----------------------------------------- # ------------- WAVE 4 -------------------- From acc2ed2e0cc2c2085a11e2da96eb37ac803172f5 Mon Sep 17 00:00:00 2001 From: Amber <110812972+Msambere@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:59:03 -0500 Subject: [PATCH 06/10] Complete wave 4 created get_available_recs() --- tests/test_wave_03.py | 15 +++++++-------- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 289edfc70..2b7ebe6d6 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -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() @@ -54,13 +54,12 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 + #assert desired movies on in list + 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 = { 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 deb16cd29..4da59d05c 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -80,12 +80,27 @@ def get_unique_watched(user_data): unique_movie_list.remove(movie) return unique_movie_list +def get_friends_unique_watched(user_data): + user_movie_list = user_data["watched"].copy() + friend_unique_list = [] + for friend in user_data["friends"]: + friend_movie_list = friend["watched"] + for friend_movie in friend_movie_list: + if friend_movie not in user_movie_list and friend_movie not in friend_unique_list: + friend_unique_list.append(friend_movie) + return friend_unique_list # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- - +def get_available_recs(user_data): + recommendations = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie["host"] in user_data["subscriptions"] and movie not in user_data["watched"] and movie not in recommendations: + recommendations.append(movie) + return recommendations # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- From cdf780d1f8a8558ef4c6f372158754f7856f4049 Mon Sep 17 00:00:00 2001 From: AstryBrana Date: Tue, 24 Sep 2024 14:49:02 -0400 Subject: [PATCH 07/10] wave 4 and 5 worked on and completed for empty situations, still working on specifics --- tests/test_wave_05.py | 23 +++++++++++++---------- viewing_party/party.py | 42 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index b2ba9ad33..89a2153f7 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,8 @@ 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 +39,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 = { @@ -52,13 +53,15 @@ 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 these tests ********** - # ********************************************************************* -@pytest.mark.skip() +# @pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +75,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 +97,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 4acac3e4f..4c92c206e 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -47,7 +47,7 @@ def get_most_watched_genre(user_data): return None genre_count={} for movie in user_data["watched"]: - current_genre= movie["genre"] + current_genre = movie["genre"] if current_genre not in genre_count.keys(): genre_count[current_genre] = 1 else: @@ -55,14 +55,12 @@ def get_most_watched_genre(user_data): most_popular =[] for genre, count in genre_count.items(): if not most_popular or most_popular[1] < count: - most_popular= [genre, count] + most_popular = [genre, count] return most_popular[0] +# ------------- WAVE 3 -------------------- # -# ----------------------------------------- -# ------------- WAVE 3 -------------------- -# ----------------------------------------- def get_unique_watched(user_data): unique_movie_list = [] @@ -78,7 +76,35 @@ def get_unique_watched(user_data): # ------------- WAVE 4 -------------------- # ----------------------------------------- -# ----------------------------------------- -# ------------- WAVE 5 -------------------- -# ----------------------------------------- +# ------------- WAVE 5 -------------------- # +def get_new_rec_by_genre(user_data): + recommendations = [] + if not user_data["watched"]: + return recommendations + for friend in user_data["friends"]: + if not friend["watched"]: + return recommendations + + # most_watched_genre = get_most_watched_genre(user_data["watched"]) + # friend_unique_watched = get_friends_unique_watched(user_data) + +def get_rec_from_favorites(user_data): + reccomendations = [] + if not user_data["favorites"]: + return reccomendations + elif not user_data["friends"]: + reccomendations = user_data["favorites"] + return reccomendations + + + # neither of these are working but they are general idea of how I had need to keep working on it + + for movie in user_data["favorites"]: + if movie["title"] not in user_data["friends"][0]["watched"]: + reccomendations.append(movie["title"]) + return reccomendations + # for i in range(len(user_data["favorites"])): + # if user_data["favorites"][i]["title"] not in user_data["friends"]["watched"]: + # reccomendations.append(user_data["favorites"][i]) + # return reccomendations \ No newline at end of file From 6e25f8f93d108b439e2de32420a435aaa2e16dd5 Mon Sep 17 00:00:00 2001 From: AstryBrana Date: Tue, 24 Sep 2024 16:02:45 -0400 Subject: [PATCH 08/10] wave 5 function 1 completed, still working on function 2 for wave 5 --- viewing_party/party.py | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 42af5452d..5f2c7eeb3 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,6 +1,4 @@ -# ----------------------------------------- # ------------- WAVE 1 -------------------- # -# ----------------------------------------- def create_movie(title, genre, rating): if not title or not genre or not rating: @@ -30,9 +28,7 @@ def watch_movie(user_data, title): return user_data return user_data -# ----------------------------------------- # ------------- WAVE 2 -------------------- # -# ----------------------------------------- def get_watched_avg_rating(user_data): avg_rating = 0 @@ -62,7 +58,6 @@ def get_most_watched_genre(user_data): most_popular = [genre, count] return most_popular[0] - # ------------- WAVE 3 -------------------- # def get_unique_watched(user_data): @@ -88,10 +83,8 @@ def get_friends_unique_watched(user_data): friend_unique_list.append(friend_movie) return friend_unique_list - -# ----------------------------------------- -# ------------- WAVE 4 -------------------- -# ----------------------------------------- +# ------------- WAVE 4 -------------------- # + def get_available_recs(user_data): recommendations = [] for friend in user_data["friends"]: @@ -99,7 +92,9 @@ def get_available_recs(user_data): if movie["host"] in user_data["subscriptions"] and movie not in user_data["watched"] and movie not in recommendations: recommendations.append(movie) return recommendations + # ------------- WAVE 5 -------------------- # + def get_new_rec_by_genre(user_data): recommendations = [] if not user_data["watched"]: @@ -107,27 +102,25 @@ def get_new_rec_by_genre(user_data): for friend in user_data["friends"]: if not friend["watched"]: return recommendations - - # most_watched_genre = get_most_watched_genre(user_data["watched"]) - # friend_unique_watched = get_friends_unique_watched(user_data) + + most_watched_genre = get_most_watched_genre(user_data) + friend_unique_watched = get_friends_unique_watched(user_data) + + for movie in friend_unique_watched: + if movie["genre"] == most_watched_genre: + recommendations.append(movie) + + return recommendations def get_rec_from_favorites(user_data): - reccomendations = [] + recommendations = [] if not user_data["favorites"]: - return reccomendations + return recommendations elif not user_data["friends"]: - reccomendations = user_data["favorites"] - return reccomendations - + recommendations = user_data["favorites"] + return recommendations - # neither of these are working but they are general idea of how I had need to keep working on it - - for movie in user_data["favorites"]: - if movie["title"] not in user_data["friends"][0]["watched"]: - reccomendations.append(movie["title"]) - return reccomendations - - # for i in range(len(user_data["favorites"])): - # if user_data["favorites"][i]["title"] not in user_data["friends"]["watched"]: - # reccomendations.append(user_data["favorites"][i]) - # return reccomendations \ No newline at end of file + # for movie in user_data["favorites"]: + # if movie["title"] not in user_data["friends"][0]["watched"]: + # recommendations.append(movie["title"]) + # return recommendations \ No newline at end of file From 602011a275d637a10a986f8226e9c204a19eb034 Mon Sep 17 00:00:00 2001 From: AstryBrana Date: Tue, 24 Sep 2024 17:14:49 -0400 Subject: [PATCH 09/10] all waves done, refactoring --- viewing_party/party.py | 54 ++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 5f2c7eeb3..cf873bf52 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -31,14 +31,14 @@ def watch_movie(user_data, title): # ------------- WAVE 2 -------------------- # def get_watched_avg_rating(user_data): + rating_sum = 0 avg_rating = 0 - if not user_data["watched"]: return avg_rating for movie in user_data["watched"]: - avg_rating += movie["rating"] - avg_rating = avg_rating/len(user_data["watched"]) + rating_sum += movie["rating"] + avg_rating = rating_sum/len(user_data["watched"]) return avg_rating @@ -48,10 +48,8 @@ def get_most_watched_genre(user_data): genre_count={} for movie in user_data["watched"]: current_genre = movie["genre"] - if current_genre not in genre_count.keys(): - genre_count[current_genre] = 1 - else: - genre_count[current_genre] += 1 + current_genre_count = genre_count.get(current_genre, 0) + genre_count[current_genre] = current_genre_count + 1 most_popular =[] for genre, count in genre_count.items(): if not most_popular or most_popular[1] < count: @@ -61,17 +59,28 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # def get_unique_watched(user_data): - unique_movie_list = user_data["watched"].copy() - removal_list = [] + user_movie_list = user_data["watched"].copy() + user_unique_list = [] + common_movies_list = [] for friend in user_data["friends"]: friend_movie_list = friend["watched"] - for user_movie in unique_movie_list: - if user_movie in friend_movie_list: - removal_list.append(user_movie) - for movie in removal_list: - if movie in unique_movie_list: - unique_movie_list.remove(movie) - return unique_movie_list + for user_movie in user_movie_list: + if user_movie in friend_movie_list and user_movie in user_unique_list: + user_unique_list.remove(user_movie) + elif user_movie not in friend_movie_list and user_movie not in user_unique_list: + user_unique_list.append(user_movie) + return user_unique_list + # unique_movie_list = user_data["watched"].copy() + # removal_list = [] + # for friend in user_data["friends"]: + # friend_movie_list = friend["watched"] + # for user_movie in unique_movie_list: + # if user_movie in friend_movie_list: + # removal_list.append(user_movie) + # for movie in removal_list: + # if movie in unique_movie_list: + # unique_movie_list.remove(movie) + # return unique_movie_list def get_friends_unique_watched(user_data): user_movie_list = user_data["watched"].copy() @@ -119,8 +128,11 @@ def get_rec_from_favorites(user_data): elif not user_data["friends"]: recommendations = user_data["favorites"] return recommendations - - # for movie in user_data["favorites"]: - # if movie["title"] not in user_data["friends"][0]["watched"]: - # recommendations.append(movie["title"]) - # return recommendations \ No newline at end of file + else: + for movie in user_data["favorites"]: + for friend in user_data["friends"]: + if movie in friend["watched"] and movie in recommendations: + recommendations.remove(movie) + if movie not in friend["watched"] and movie not in recommendations: + recommendations.append(movie) + return recommendations \ No newline at end of file From a73723c6ee84721caa4bb6634f6c8ddcc0426dde Mon Sep 17 00:00:00 2001 From: AstryBrana Date: Tue, 24 Sep 2024 18:43:01 -0400 Subject: [PATCH 10/10] all waves refactored and all tests passing --- viewing_party/party.py | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index cf873bf52..7de51ba62 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -59,28 +59,17 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # def get_unique_watched(user_data): - user_movie_list = user_data["watched"].copy() - user_unique_list = [] - common_movies_list = [] + unique_movie_list = user_data["watched"].copy() + removal_list = [] for friend in user_data["friends"]: friend_movie_list = friend["watched"] - for user_movie in user_movie_list: - if user_movie in friend_movie_list and user_movie in user_unique_list: - user_unique_list.remove(user_movie) - elif user_movie not in friend_movie_list and user_movie not in user_unique_list: - user_unique_list.append(user_movie) - return user_unique_list - # unique_movie_list = user_data["watched"].copy() - # removal_list = [] - # for friend in user_data["friends"]: - # friend_movie_list = friend["watched"] - # for user_movie in unique_movie_list: - # if user_movie in friend_movie_list: - # removal_list.append(user_movie) - # for movie in removal_list: - # if movie in unique_movie_list: - # unique_movie_list.remove(movie) - # return unique_movie_list + for user_movie in unique_movie_list: + if user_movie in friend_movie_list: + removal_list.append(user_movie) + for movie in removal_list: + if movie in unique_movie_list: + unique_movie_list.remove(movie) + return unique_movie_list def get_friends_unique_watched(user_data): user_movie_list = user_data["watched"].copy() @@ -98,7 +87,7 @@ def get_available_recs(user_data): recommendations = [] for friend in user_data["friends"]: for movie in friend["watched"]: - if movie["host"] in user_data["subscriptions"] and movie not in user_data["watched"] and movie not in recommendations: + if movie["host"] in user_data["subscriptions"] and movie not in user_data["watched"] and movie not in recommendations: recommendations.append(movie) return recommendations @@ -106,11 +95,8 @@ def get_available_recs(user_data): def get_new_rec_by_genre(user_data): recommendations = [] - if not user_data["watched"]: + if not user_data["watched"] or not user_data["friends"]: return recommendations - for friend in user_data["friends"]: - if not friend["watched"]: - return recommendations most_watched_genre = get_most_watched_genre(user_data) friend_unique_watched = get_friends_unique_watched(user_data) @@ -133,6 +119,6 @@ def get_rec_from_favorites(user_data): for friend in user_data["friends"]: if movie in friend["watched"] and movie in recommendations: recommendations.remove(movie) - if movie not in friend["watched"] and movie not in recommendations: + elif movie not in friend["watched"] and movie not in recommendations: recommendations.append(movie) return recommendations \ No newline at end of file