From b489c39eb37e010d5d5bde8fc32b80dac4479a93 Mon Sep 17 00:00:00 2001 From: mckay Date: Thu, 10 Nov 2022 14:14:51 -0500 Subject: [PATCH 1/4] first wave completed --- tests/test_wave_01.py | 4 ++-- viewing_party/party.py | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..63356a27d 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -119,7 +119,7 @@ def test_moves_movie_from_watchlist_to_empty_watched(): assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 - raise Exception("Test needs to be completed.") + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* @@ -143,7 +143,7 @@ def test_moves_movie_from_watchlist_to_watched(): assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - raise Exception("Test needs to be completed.") + assert updated_data["watched"][1]["title"] == HORROR_1["title"] # ******************************************************************************************* # ****** 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 6d34a6b5f..2a1f53821 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,12 +1,45 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + if title and genre and rating: + return { + "title": title, + "genre": genre, + "rating": rating, + } + else: + return None + +def add_to_watched(user_data, movie): + user_data.setdefault("watched", []).append(movie) + return user_data + +def add_to_watchlist(user_data, movie): + user_data.setdefault("watchlist", []).append(movie) + return user_data + +def watch_movie(user_data, title): + for movie in user_data["watchlist"]: + if movie["title"] == title: + add_to_watched(user_data, movie) + user_data["watchlist"].remove(movie) + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + total_rating_score = 0 + num_of_movies = len(user_data["watched"]) + for movie in user_data["watched"]: + total_rating_score += movie["rating"] + if num_of_movies == 0: + return 0.0 + else: + return total_rating_score / num_of_movies + # ----------------------------------------- # ------------- WAVE 3 -------------------- From 8458a9862c4a0e6a08b5227060c251cf29f58f19 Mon Sep 17 00:00:00 2001 From: mckay Date: Fri, 11 Nov 2022 10:58:29 -0500 Subject: [PATCH 2/4] waves 1-4 completed --- tests/test_wave_03.py | 5 ++-- tests/test_wave_05.py | 12 ++++---- viewing_party/party.py | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..591c2842e 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -54,8 +54,9 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - - raise Exception("Test needs to be completed.") + assert INTRIGUE_3 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert FANTASY_4 in friends_unique_movies # ************************************************************************************************* # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** # ************************************************************************************************** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..e35917967 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 = { @@ -58,7 +58,7 @@ def test_new_genre_rec_from_empty_friends(): # ****** Complete the Act and Assert Portions of theis tests ********** # ********************************************************************* -@pytest.mark.skip() +# @pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +72,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 +94,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 2a1f53821..fd41215a1 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,5 +1,8 @@ # ------------- WAVE 1 -------------------- +from shutil import move + + def create_movie(title, genre, rating): if title and genre and rating: return { @@ -40,17 +43,79 @@ def get_watched_avg_rating(user_data): else: return total_rating_score / num_of_movies +def get_most_watched_genre(user_data): + genres = {} + if user_data["watched"] == []: + return None + for movie in user_data["watched"]: + if movie["genre"] in genres: + genres[movie["genre"]] += 1 + else: + genres[movie["genre"]] = 1 + #review this concept + return max(genres, key=genres.get) + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + friends_movies = [] + unique_movies = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in friends_movies: + friends_movies.append(movie) + for movie in user_data["watched"]: + if movie not in friends_movies: + unique_movies.append(movie) + return unique_movies + +def get_friends_unique_watched(user_data): + friends_movies = [] + # user_movies = [] + # for movie in user_data["watched"]: + # user_movies.append(movie) + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in user_data["watched"] and movie not in friends_movies: + friends_movies.append(movie) + return friends_movies # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + recommended_movies = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in user_data["watched"] and movie["host"] in user_data["subscriptions"] and movie not in recommended_movies: + recommended_movies.append(movie) + return recommended_movies + + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + fav_genre = get_most_watched_genre(user_data) + recommended_movies = get_available_recs(user_data) + for movie in recommended_movies: + if movie["genre"] not in fav_genre: + recommended_movies.remove(movie) + return recommended_movies + +# def get_new_rec_by_genre(user_data): +# fav_genre = get_most_watched_genre(user_data) +# recommended_movies = [] +# for friend in user_data["friends"]: +# for movie in friend["watched"]: +# if movie not in user_data["watched"] and movie not in recommended_movies: +# recommended_movies.append(movie) +# for movie in recommended_movies: +# if movie["genre"] not in fav_genre: +# recommended_movies.remove(movie) +# return recommended_movies \ No newline at end of file From bee4b1d07fee69bcbe525768aa39dc66408845c5 Mon Sep 17 00:00:00 2001 From: mckay Date: Fri, 11 Nov 2022 11:36:43 -0500 Subject: [PATCH 3/4] all waves completed --- tests/test_wave_05.py | 9 +++++---- viewing_party/party.py | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index e35917967..4534b31fe 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -53,10 +53,11 @@ def test_new_genre_rec_from_empty_friends(): ] } - 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 len(recommendations) == 0 # @pytest.mark.skip() def test_unique_rec_from_favorites(): diff --git a/viewing_party/party.py b/viewing_party/party.py index fd41215a1..d351a2221 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -74,9 +74,6 @@ def get_unique_watched(user_data): def get_friends_unique_watched(user_data): friends_movies = [] - # user_movies = [] - # for movie in user_data["watched"]: - # user_movies.append(movie) for friend in user_data["friends"]: for movie in friend["watched"]: if movie not in user_data["watched"] and movie not in friends_movies: @@ -102,20 +99,23 @@ def get_available_recs(user_data): def get_new_rec_by_genre(user_data): fav_genre = get_most_watched_genre(user_data) - recommended_movies = get_available_recs(user_data) - for movie in recommended_movies: - if movie["genre"] not in fav_genre: - recommended_movies.remove(movie) + recommended_movies = [] + if fav_genre == None: + return recommended_movies + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie["genre"] == fav_genre: + if movie not in user_data["watched"] and movie not in recommended_movies: + recommended_movies.append(movie) return recommended_movies -# def get_new_rec_by_genre(user_data): -# fav_genre = get_most_watched_genre(user_data) -# recommended_movies = [] -# for friend in user_data["friends"]: -# for movie in friend["watched"]: -# if movie not in user_data["watched"] and movie not in recommended_movies: -# recommended_movies.append(movie) -# for movie in recommended_movies: -# if movie["genre"] not in fav_genre: -# recommended_movies.remove(movie) -# return recommended_movies \ No newline at end of file +def get_rec_from_favorites(user_data): + friends_movies = [] + recommended_movies = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_movies.append(movie) + for movie in user_data["favorites"]: + if movie not in friends_movies: + recommended_movies.append(movie) + return recommended_movies \ No newline at end of file From 42ecec6df35f50c4707d855a30b6bbbc5ad3c25e Mon Sep 17 00:00:00 2001 From: mckay Date: Fri, 11 Nov 2022 11:44:39 -0500 Subject: [PATCH 4/4] activate all tests --- tests/test_wave_01.py | 18 +++++++++--------- tests/test_wave_02.py | 8 ++++---- tests/test_wave_03.py | 10 +++++----- tests/test_wave_04.py | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 63356a27d..a1888cb33 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 = { @@ -124,7 +124,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 @@ -148,7 +148,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/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/tests/test_wave_03.py b/tests/test_wave_03.py index 591c2842e..c5283d28e 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() @@ -61,7 +61,7 @@ def test_friends_unique_movies_not_duplicated(): # ****** 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 = {