diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 669efee6..13d019da 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,8 @@ def test_create_no_genre_movie(): # Assert assert new_movie is None -@pytest.mark.skip() +# @pytest.mark.skip() +# @pytest.mark.skip() def test_create_no_rating_movie(): # Arrange movie_title = "Title A" @@ -58,7 +59,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 +80,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 +100,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 +121,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 +141,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 +156,21 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Act updated_data = watch_movie(janes_data, MOVIE_TITLE_1) + expected_movie = { + "title": MOVIE_TITLE_1, + "genre": GENRE_1, + "rating": RATING_1 + } + # Assert 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 in updated_data["watched"][0]["title"] + assert GENRE_1 in updated_data["watched"][0]["genre"] + assert expected_movie in updated_data["watched"] + -@pytest.mark.skip() +# @pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -182,13 +188,12 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert 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 movie_to_watch not in updated_data["watchlist"] + assert movie_to_watch in updated_data["watched"] + assert FANTASY_2 in updated_data["watched"] + assert FANTASY_1 in updated_data["watchlist"] -@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 19f045c7..64b62729 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 04642936..8de6d996 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() @@ -54,13 +54,14 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 + assert INTRIGUE_3 in friends_unique_movies + assert FANTASY_4 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert FANTASY_1 not in friends_unique_movies + assert INTRIGUE_1 not 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 49966907..0b0b3c7e 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 b2ba9ad3..b6f84094 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,13 @@ 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 len(recommendations) == 0 -@pytest.mark.skip() +# @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() +# @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() +# @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 6d34a6b5..ee46a7e9 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,159 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass +# if falsy return none + if not title or not genre or not rating: + return None + + return { + "title": title, + "genre": genre, + "rating": rating + } + +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): + # Loop through watchlist dict + for movie in user_data["watchlist"]: + # check if the tile of movie is in the user_data dict + if title == movie["title"]: + # remove the movie from watchlist if user already watched it + user_data["watchlist"].remove(movie) + # add movie to watched list if user already watched it + user_data["watched"].append(movie) + break # exit the loop once movie is found and moved + return user_data # return updated dict # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + if not user_data["watched"]: + return 0.0 + + ratings_total = 0 + + for movie in user_data["watched"]: + ratings_total += movie["rating"] + + return ratings_total/len(user_data["watched"]) + +def get_most_watched_genre(user_data): + if not user_data["watched"]: + return None + + genre_frequency = {} + + #first for loop tracks amount of times a genre appears + for movie in user_data["watched"]: + genre_type = movie["genre"] + if genre_type in genre_frequency: + genre_frequency[genre_type] += 1 + else: + genre_frequency[genre_type] =1 + + most_watched_genre = None + highest_genre_count = 0 + #second for loop picks out which genre is the most watched + for genre, count in genre_frequency.items(): + if count > highest_genre_count: + highest_genre_count = count + most_watched_genre = genre + + return most_watched_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +#HELPER FUNCTION: creates list of movies friends have watched without any duplicate code# +def get_friends_movies(user_data): + #loops through values of key 'friends' in user data, and friends_movies is added to movies_all_friends_watched set to make sure each movie is unique + movies_all_friends_watched = [] + + for friends_movies in user_data["friends"]: + for movie in friends_movies["watched"]: + if movie not in movies_all_friends_watched: + movies_all_friends_watched.append(movie) + + return movies_all_friends_watched + + +def get_unique_watched(user_data): + user_movies_list = [] + total_friends_movies_watched = get_friends_movies(user_data) + + #loops through values of key 'watched' in user_data to get movies watched + for user_movies in user_data["watched"]: + if user_movies not in total_friends_movies_watched: + user_movies_list.append(user_movies) + + return user_movies_list + + +def get_friends_unique_watched(user_data): + unique_movies_list = [] + total_friends_watched = get_friends_movies(user_data) + + #loops through movies in the total_friends_watched list to compare (in the if statement) if the movie is not in the user's watched list and hasn't appeared in the unique_movies_list (checks for duplicates) to then append the unique movie + for movies in total_friends_watched: + if movies not in user_data["watched"]: + unique_movies_list.append(movies) + + return unique_movies_list + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + #calling get_friends_unique_watched from wave 3 + unique_movies_from_friends = get_friends_unique_watched(user_data) + recommendations = [] + + for movies in unique_movies_from_friends: + if movies["host"] in user_data["subscriptions"]: + recommendations.append(movies) + return recommendations + + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + #use existing function (get_most_watched_genre) to get the user's most frequently watched genre + most_frequent_genre = get_most_watched_genre(user_data) + + #use existing function (get_friends_unique_watched) to get friends most frequently watched movies + unique_movies_from_friends = get_friends_unique_watched(user_data) + recommendations = [] + + if not most_frequent_genre: + return [] + + #iterates through list of movies by most watched genre + for movies in unique_movies_from_friends: + if movies["genre"] == most_frequent_genre: + recommendations.append(movies) + return recommendations + + +def get_rec_from_favorites(user_data): + #use existing function (get_unique_watched) to get user's watched movies + unique_watched_movies = get_unique_watched(user_data) + recommendations = [] + + #iterates through user's favorite movies in unique_watched_movies + for movies in user_data["favorites"]: + if movies in unique_watched_movies: + recommendations.append(movies) + return recommendations \ No newline at end of file