diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 669efee6a..32670c6f6 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 = { @@ -158,13 +158,22 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 + + assert updated_data == { + "watchlist": [], + "watched": [{ + "title": MOVIE_TITLE_1, + "genre": GENRE_1, + "rating": RATING_1 + }] + } - 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_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -183,12 +192,18 @@ 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 == { + "watchlist": [ + FANTASY_1 + ], + "watched": [FANTASY_2, HORROR_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_does_nothing_if_movie_not_in_watchlist(): # Arrange movie_to_watch = HORROR_1 @@ -205,3 +220,6 @@ def test_does_nothing_if_movie_not_in_watchlist(): assert len(updated_data["watched"]) == 1 assert movie_to_watch not in updated_data["watchlist"] assert movie_to_watch not in updated_data["watched"] + + + 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..1fda38e6a 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,15 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - raise Exception("Test needs to be completed.") + assert friends_unique_movies == [FANTASY_4, HORROR_1, INTRIGUE_3] + + # assert 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..973a3c677 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..950ca6870 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,12 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") - # ********************************************************************* - # ****** Complete the Act and Assert Portions of these tests ********** - # ********************************************************************* + # Act + recommendations = get_new_rec_by_genre(sonyas_data) + + # Assert + assert recommendations == [] -@pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +72,6 @@ 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 +93,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 6d34a6b5f..c84a56854 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,127 @@ -# ------------- WAVE 1 -------------------- +# ---------------------------------------------------- WAVE 1 ---------------------------------------------------- +#----------------------------------------------------------------------------------------------------------------- def create_movie(title, genre, rating): - pass + if not title or not genre or not rating: + return None + + return {"title": title, "genre": genre, "rating": rating} -# ----------------------------------------- -# ------------- WAVE 2 -------------------- -# ----------------------------------------- +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 -# ----------------------------------------- -# ------------- WAVE 3 -------------------- -# ----------------------------------------- +def watch_movie(user_data, title): + + new_copy_watchlist = [] - -# ----------------------------------------- -# ------------- WAVE 4 -------------------- -# ----------------------------------------- + for movie in user_data["watchlist"]: + if movie["title"] == title: + add_to_watched(user_data, movie) + else: + new_copy_watchlist.append(movie) + + user_data["watchlist"] = new_copy_watchlist + return user_data -# ----------------------------------------- -# ------------- WAVE 5 -------------------- -# ----------------------------------------- +# ---------------------------------------------------- WAVE 2 ---------------------------------------------------- +def get_watched_avg_rating(user_data): + if not user_data["watched"]: + return 0 + + total_movie_ratings = 0 + + for movie_rating in user_data["watched"]: + total_movie_ratings += movie_rating["rating"] + + average_movie_rating = total_movie_ratings / len(user_data["watched"]) + + return average_movie_rating + +def get_most_watched_genre(user_data): + frequency_of_genre_index = {} + max_frequency = 0 + most_watched_genre = None + + for single_movie in user_data["watched"]: + genre_type = single_movie.get("genre") + if genre_type: + frequency_of_genre_index[genre_type] = frequency_of_genre_index.get(genre_type,0) + 1 + if frequency_of_genre_index[genre_type] > max_frequency: + max_frequency = frequency_of_genre_index[genre_type] + most_watched_genre = genre_type + + return most_watched_genre + +# ---------------------------------------------------- WAVE 3 ---------------------------------------------------- + +def get_unique_watched(user_data): + if not user_data["watched"]: + return [] + + my_friends_unique = {movie["title"] for my_friends in user_data["friends"] + for movie in my_friends["watched"]} + + my_unique_movies = [movie for movie in user_data["watched"] + if movie["title"] not in my_friends_unique] + + return my_unique_movies + +def get_friends_unique_watched(user_data): + friends_unique_movies = [] + my_movie_titles = [] + + my_movie_titles = [movie["title"] for movie in user_data["watched"]] + + for my_friend in user_data["friends"]: + for movie in my_friend["watched"]: + if movie["title"] not in my_movie_titles and movie not in friends_unique_movies: + friends_unique_movies.append(movie) + + return friends_unique_movies + +# ---------------------------------------------------- WAVE 4 ---------------------------------------------------- + +def get_available_recs(user_data): + recommended_movies = [] + friends_unique_movies = get_friends_unique_watched(user_data) + + user_watched_titles = set() + + for movie in user_data.get('watched', []): + user_watched_titles.add(movie['title']) + + user_subscriptions = set(user_data.get('subscriptions', [])) + for movie in friends_unique_movies: + if movie['host'] in user_subscriptions and movie['title'] not in user_watched_titles: + if movie not in recommended_movies: + recommended_movies.append(movie) + + return recommended_movies + +# ---------------------------------------------------- WAVE 5 ---------------------------------------------------- + +def get_new_rec_by_genre(user_data): + most_watched_genre = get_most_watched_genre(user_data) + friends_unique_watched = get_friends_unique_watched(user_data) + + recommended_movie = [movie for movie in friends_unique_watched + if movie["genre"] == most_watched_genre] + + return recommended_movie + +def get_rec_from_favorites(user_data): + my_friends_watched = set() + + my_friends_watched = [movie["title"] for my_friends in user_data["friends"] + for movie in my_friends["watched"]] + + recommended_movie = [movie for movie in user_data["favorites"] + if movie["title"] not in my_friends_watched] + + return recommended_movie \ No newline at end of file