diff --git a/play_tester.py b/play_tester.py index 9e2aecf48..596a4a5ab 100644 --- a/play_tester.py +++ b/play_tester.py @@ -10,9 +10,10 @@ # play testing section print("\n-----Wave 01 test data-----") -pp.pprint(HORROR_1) -pp.pprint(FANTASY_1) -pp.pprint(FANTASY_2) +print(create_movie(MOVIE_TITLE_1,GENRE_1,RATING_1)) +# pp.pprint(HORROR_1) +# pp.pprint(FANTASY_1) +# pp.pprint(FANTASY_2) # print("\n-----Wave 02 user_data-----") # pp.pprint(clean_wave_2_data()) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..164cf97bc 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 = { @@ -119,12 +119,13 @@ 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.") + # raise Exception("Test needs to be completed.") + assert MOVIE_TITLE_1 == updated_data["watched"][0]["title"] # ******************************************************************************************* # ****** 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 @@ -143,12 +144,13 @@ 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.") + # raise Exception("Test needs to be completed.") + assert updated_data["watched"] == [FANTASY_2,HORROR_1] # ******************************************************************************************* # ****** 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 046429360..2f9726d0c 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,14 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - raise Exception("Test needs to be completed.") + for movie in friends_unique_movies: + assert movie in [HORROR_1, FANTASY_4, INTRIGUE_3] + # 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/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..e0c033da8 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 = { @@ -52,13 +52,18 @@ def test_new_genre_rec_from_empty_friends(): } ] } - - raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") + #Act + friend_movie_list = get_rec_from_favorites(sonyas_data) + assert len(friend_movie_list) == 0 + ## WHAT I WANT TO TEST FOR AND CONFIRM ANSWER + #ASSERT + ##CONFIRM THE RESULT THAT I EXPECT TO HAPPEN # ********************************************************************* # ****** 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 +77,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 +99,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..2aafdf62c 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,166 @@ -# ------------- WAVE 1 -------------------- +from pprint import pprint +#HELPER FUNCTION +def _get_movies_watched_by_friends(user_data): + movies_watched_by_friends = [] + + for friend in user_data["friends"]: #[{}] + for friend_movie in friend["watched"]: #{} + if friend_movie in movies_watched_by_friends: + continue + else: + movies_watched_by_friends.append(friend_movie) + + return movies_watched_by_friends + +def _get_movies_not_watched_user(user_data): + movies_not_watched_user = [] + movies_watched_by_friends = _get_movies_watched_by_friends(user_data) + + for movie in user_data["watched"]: + if movie not in movies_watched_by_friends: + movies_not_watched_user.append(movie) + return movies_not_watched_user + +# ------------- 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} + + +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 movie in user_data["watchlist"]: + watchlist_title = movie["title"] + if title == watchlist_title: + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + return user_data + + return user_data +# Note: For Waves 2, 3, 4, and 5, your implementation of each of the functions should not modify user_data. # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + rating = 0 + num_of_movies = len(user_data["watched"]) + + for movie in user_data["watched"]: + rating += movie["rating"] + + if rating == 0: + return 0 + else: + average_rating = rating/num_of_movies + return average_rating + + + + +def get_most_watched_genre(user_data): + favorite_genre = "" + genre_list = [] + genre = "" + + # If the value of "watched" is an empty list, get_most_watched_genre should return None. + if user_data["watched"] == []: + return None + for movie in user_data["watched"]: #this giving each movie dictionary inside the watched list + genre = movie['genre'] #accessing the movie genre and assigning to the genre + genre_list.append(genre) #each genre will be added to the genre_list # the congregate of all genres + + favorite_genre = max(set(genre_list), key= genre_list.count) + return favorite_genre + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + user_not_watched_movies = [] + movies_watched_by_friends = _get_movies_watched_by_friends(user_data) + + for movie in user_data["watched"]: + if movie not in movies_watched_by_friends: + user_not_watched_movies.append(movie) + return user_not_watched_movies + + +def get_friends_unique_watched(user_data): + recommended_movies = [] + + movies_watched_by_friends = [] + movies_watched_by_friends = _get_movies_watched_by_friends(user_data) + user_watched_movies = user_data["watched"] + + for friend_movie in movies_watched_by_friends: #user_data = "friends": [{}] + if friend_movie not in user_watched_movies: + recommended_movies.append(friend_movie) + + return recommended_movies + - # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + recommended_movies = [] + recommended_movies_subscription = [] + + user_watched_movies = user_data["watched"] + user_subscriptions = user_data["subscriptions"] + movies_watched_by_friends = _get_movies_watched_by_friends(user_data) + if user_data["friends"] == []: + return len(recommended_movies) + + for friend_movie in movies_watched_by_friends: + if friend_movie not in user_watched_movies: + recommended_movies.append(friend_movie) + + for movie in recommended_movies: + if movie["host"] in user_subscriptions: + pprint(recommended_movies_subscription.append(movie)) + + return recommended_movies_subscription # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + list_rec_movies_genre = [] + + popular_genre = get_most_watched_genre(user_data) + + friend_movies = _get_movies_watched_by_friends(user_data) + + for friend_movie in friend_movies: + if friend_movie["genre"] == popular_genre: + if friend_movie not in user_data["watched"]: + list_rec_movies_genre.append(friend_movie) + print(list_rec_movies_genre) + return list_rec_movies_genre + + +def get_rec_from_favorites(user_data): + list_rec_favorites= [] + friend_favorite_movies = _get_movies_watched_by_friends(user_data) + for favorite_movie in user_data["favorites"]: + if favorite_movie not in friend_favorite_movies: + list_rec_favorites.append(favorite_movie) + print(list_rec_favorites) + return list_rec_favorites +