From 732daeb4c25b4c0bfd987d8eca3d79327ce2ddaf Mon Sep 17 00:00:00 2001 From: Paje Date: Thu, 22 Sep 2022 20:41:49 -0500 Subject: [PATCH 1/2] Viewing Party Completed Project --- tests/test_wave_01.py | 30 +++++------- tests/test_wave_02.py | 8 ++-- tests/test_wave_03.py | 15 +++--- tests/test_wave_04.py | 6 +-- tests/test_wave_05.py | 21 ++++---- viewing_party/party.py | 106 +++++++++++++++++++++++++++++++++++++++-- 6 files changed, 138 insertions(+), 48 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..d7ecd04ae 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() + 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() + 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() + 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() + 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() + 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() + 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() + def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -119,12 +119,10 @@ 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 janes_data["watched"][0]["genre"] == GENRE_1 + + -@pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -143,12 +141,10 @@ 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.") - # ******************************************************************************************* - # ****** Add assertions here to test that the correct movie was added to "watched" ********** - # ******************************************************************************************* + assert updated_data["watched"][1] == HORROR_1 + + -@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..2ec8fcac2 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() + 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() + 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() + 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() + 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..41aef05ba 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() @@ -54,13 +54,10 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 + + assert friends_unique_movies.count(INTRIGUE_3) == 1 - 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..67f432045 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() + 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() + 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() + 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 85ebb8b18..cd7bd65c0 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 recommendations == None + - 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 6d34a6b5f..e16208ebc 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,119 @@ -# ------------- WAVE 1 -------------------- +def division_lybl(first_num, second_num): + if second_num == 0: + print("A ZeroDivisionError has occurred.") + return None + value = first_num/second_num + return (first_num/second_num) + +def division_eafp(first_num, second_num): + try: + value = first_num/second_num + except ZeroDivisionError: + print("A ZeroDivisionError has occurred.") + return None def create_movie(title, genre, rating): - pass + if title and genre and rating: + movie = {"title": title, "genre": genre, "rating": rating} + else: + movie = None + return movie + +def add_to_watched(user_data, movie): + user_data["watched"] = [movie] + return user_data + +def add_to_watchlist(user_data, movie): + user_data["watchlist"] = [movie] + return user_data + +def watch_movie(user_data, movie_title): + for movies in user_data["watchlist"]: + if movies["title"] == movie_title: + user_data["watched"].append(movies) + user_data["watchlist"].remove(movies) + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + ratings_list = [] + for movies in user_data["watched"]: + ratings_list.append(movies["rating"]) + if ratings_list: + rating_average = sum(ratings_list)/len(ratings_list) + else: + rating_average = 0.0 + return rating_average - +def get_most_watched_genre(user_data): + genres = [] + for movies in user_data["watched"]: + genres.append(movies["genre"]) + if genres: + most_watched_genre = max(genres, key = genres.count) + else: + most_watched_genre = None + return most_watched_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + unique_watched = [] + friends_watched = [] + for i in range(len(user_data["friends"])): + for item in user_data["friends"][i]["watched"]: + friends_watched.append(item) + for movie in user_data["watched"]: + if movie not in friends_watched: + unique_watched.append(movie) + return unique_watched + +def get_friends_unique_watched(user_data): + friends_watched = [] + friends_unique_watched = [] + for i in range(len(user_data["friends"])): + for item in user_data["friends"][i]["watched"]: + friends_watched.append(item) + for movie in friends_watched: + if (movie not in user_data["watched"] + and movie not in friends_unique_watched): + friends_unique_watched.append(movie) + + return friends_unique_watched - # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- - +def get_available_recs(user_data): + friends_unique_watched = get_friends_unique_watched(user_data) + reccommendations = [] + for movie in friends_unique_watched: + if movie["host"] in user_data["subscriptions"]: + reccommendations.append(movie) + print(reccommendations) + return reccommendations # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + favorite_genre = get_most_watched_genre(user_data) + friends_movies = get_friends_unique_watched(user_data) + rec_list_by_genre = [] + if friends_movies: + for movie in friends_movies: + if movie["genre"] == favorite_genre: + rec_list_by_genre.append(movie) + else: + return None + return rec_list_by_genre +def get_rec_from_favorites(user_data): + user_unique_movies = get_unique_watched(user_data) + rec_list_from_favorites = [] + for movie in user_data["watched"]: + if (movie in user_unique_movies + and movie in user_data["favorites"]): + rec_list_from_favorites.append(movie) + return rec_list_from_favorites \ No newline at end of file From 66362b2f224f77ce10aaed0424e52c938756d76d Mon Sep 17 00:00:00 2001 From: Paje Date: Thu, 22 Sep 2022 20:45:20 -0500 Subject: [PATCH 2/2] Complete Viewing Party Project -Extraneous --- viewing_party/party.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index e16208ebc..0607cf90c 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,17 +1,3 @@ -def division_lybl(first_num, second_num): - if second_num == 0: - print("A ZeroDivisionError has occurred.") - return None - value = first_num/second_num - return (first_num/second_num) - -def division_eafp(first_num, second_num): - try: - value = first_num/second_num - except ZeroDivisionError: - print("A ZeroDivisionError has occurred.") - return None - def create_movie(title, genre, rating): if title and genre and rating: movie = {"title": title, "genre": genre, "rating": rating}