diff --git a/README.md b/README.md index 10fd9a0c3..3eeb9a1d9 100644 --- a/README.md +++ b/README.md @@ -359,4 +359,4 @@ Create a function named `get_rec_from_favorites` - Then, determine a list of recommended movies. A movie should be added to this list if and only if: - The movie is in the user's `"favorites"` - None of the user's friends have watched it -- Return the list of recommended movies +- Return the list of recommended movies \ No newline at end of file diff --git a/play_tester.py b/play_tester.py index 9e2aecf48..dfcfb0b53 100644 --- a/play_tester.py +++ b/play_tester.py @@ -9,21 +9,21 @@ pp = pprint.PrettyPrinter(indent=4) # play testing section -print("\n-----Wave 01 test data-----") -pp.pprint(HORROR_1) -pp.pprint(FANTASY_1) -pp.pprint(FANTASY_2) +# print("\n-----Wave 01 test data-----") +# pp.pprint(HORROR_1) +# pp.pprint(FANTASY_1) +# pp.pprint(FANTASY_2) # print("\n-----Wave 02 user_data-----") # pp.pprint(clean_wave_2_data()) -#print("\n-----Wave 03 user_data-----") -#pp.pprint(clean_wave_3_data()) +print("\n-----Wave 03 user_data-----") +pp.pprint(clean_wave_3_data()) # Wave 04 user data -#print("\n-----Wave 04 user_data-----") -#pp.pprint(clean_wave_4_data()) +# print("\n-----Wave 04 user_data-----") +# pp.pprint(clean_wave_4_data()) # Wave 05 user data -#print("\n-----Wave 05 user_data-----") -#pp.pprint(clean_wave_5_data()) +# print("\n-----Wave 05 user_data-----") +# pp.pprint(clean_wave_5_data()) \ No newline at end of file diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index c033af09f..e7f4ad436 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 @@ -15,11 +15,11 @@ def test_create_successful_movie(): new_movie = create_movie(movie_title, genre, rating) # Assert - assert new_movie["title"] is MOVIE_TITLE_1 - assert new_movie["genre"] is GENRE_1 + assert new_movie["title"] == MOVIE_TITLE_1 + 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 @@ -28,11 +28,11 @@ def test_create_no_title_movie(): # Act new_movie = create_movie(movie_title, genre, rating) - + # 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 = { @@ -75,11 +75,11 @@ def test_adds_movie_to_user_watched(): # Assert assert len(updated_data["watched"]) is 1 - assert updated_data["watched"][0]["title"] is MOVIE_TITLE_1 - assert updated_data["watched"][0]["genre"] is GENRE_1 - assert updated_data["watched"][0]["rating"] is RATING_1 + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 + 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 = { @@ -95,12 +95,12 @@ def test_adds_movie_to_user_watchlist(): updated_data = add_to_watchlist(user_data, movie) # Assert - assert len(updated_data["watchlist"]) is 1 - assert updated_data["watchlist"][0]["title"] is MOVIE_TITLE_1 - assert updated_data["watchlist"][0]["genre"] is GENRE_1 - assert updated_data["watchlist"][0]["rating"] is RATING_1 + assert len(updated_data["watchlist"]) == 1 + assert updated_data["watchlist"][0]["title"] == MOVIE_TITLE_1 + 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 = { @@ -116,16 +116,17 @@ def test_moves_movie_from_watchlist_to_empty_watched(): updated_data = watch_movie(janes_data, MOVIE_TITLE_1) # Assert - assert len(updated_data["watchlist"]) is 0 - assert len(updated_data["watched"]) is 1 + assert len(updated_data["watchlist"]) == 0 + assert len(updated_data["watched"]) == 1 # ******************************************************************************************* # ****** 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 = {'genre': 'Horror', 'rating': 3.5, 'title': 'It Came from the Stack Trace'} movie_to_watch = HORROR_1 janes_data = { "watchlist": [ @@ -139,14 +140,14 @@ def test_moves_movie_from_watchlist_to_watched(): updated_data = watch_movie(janes_data, movie_to_watch["title"]) # Assert - assert len(updated_data["watchlist"]) is 1 - assert len(updated_data["watched"]) is 2 + assert len(updated_data["watchlist"]) == 1 + assert len(updated_data["watched"]) == 2 # ******************************************************************************************* # ****** 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 @@ -162,4 +163,4 @@ def test_does_nothing_if_movie_not_in_watchlist(): assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 1 assert movie_to_watch not in updated_data["watchlist"] - assert movie_to_watch not in updated_data["watched"] + assert movie_to_watch not in updated_data["watched"] \ No newline at end of file diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..2c9108475 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 = { @@ -50,4 +50,4 @@ def test_genre_is_None_if_empty_watched(): popular_genre = get_most_watched_genre(janes_data) # Assert - assert popular_genre == None + assert popular_genre == None \ No newline at end of file diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 7c42a63c4..e5c1a83d9 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(): # Arrange 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,12 +54,15 @@ def test_friends_unique_movies_not_duplicated(): # Arrange assert len(friends_unique_movies) == 3 + assert friends_unique_movies.count(INTRIGUE_3) == 1 + 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 ********** # ************************************************************************************************** -@pytest.mark.skip() +# @pytest.mark.skip() def test_friends_not_unique_movies(): # Arrange amandas_data = { @@ -85,4 +88,4 @@ def test_friends_not_unique_movies(): friends_unique_movies = get_friends_unique_watched(amandas_data) # Arrange - assert len(friends_unique_movies) == 0 + assert len(friends_unique_movies) == 0 \ No newline at end of file diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index 72888410f..8cb037a87 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 = { diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 8ce5b57db..468342ada 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 = { @@ -56,8 +56,13 @@ def test_new_genre_rec_from_empty_friends(): # ********************************************************************* # ****** 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() +# @pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -71,7 +76,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 = { @@ -92,7 +97,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..ae62bb979 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,191 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + if not title or not genre or not rating: + movie_data = None + + else: + movie_data = { + 'title': title, + 'genre': genre, + 'rating': rating + } + + return movie_data + + +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, movie_title): + for movie in user_data["watchlist"]: + if movie["title"] == movie_title: + user_data["watched"].append(movie) + user_data["watchlist"].remove(movie) + break + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + """Returns the average rating of the user's watched movies.""" + try: + total = 0 + for movie in user_data["watched"]: + total += movie['rating'] + average = total / len(user_data["watched"]) + + except ZeroDivisionError: + average = 0.0 + + return average + + +def get_most_watched_genre(user_data): + """Returns user's most watched genre.""" + if user_data["watched"]: + # Iterates over the movies in the user's watched list and adds the movie genre into a list + genre_list = [movie["genre"] for movie in user_data["watched"]] + # Find the most frequent movie genre + most_popular_genre = max(genre_list, key = genre_list.count) + else: + most_popular_genre = None + + return most_popular_genre + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_friends_watched_movies(user_data): + """Returns a list of the friends' watched movies.""" + friends_watched_movies = [] + # Uses range to loop over the friends + for index in range(len(user_data["friends"])): + # for each friend, if the movie is not in friends_watched_movies, add the movie to the friends_watched_movies + if user_data["friends"][index]["watched"] not in friends_watched_movies: + friends_watched_movies += user_data["friends"][index]["watched"] + + return friends_watched_movies + + +def get_user_watched_movies(user_data): + """Returns a list of the user's watched movies.""" + user_watched_movies = [] + # Loops over each movie in the user's watched movies + for movie in range(len(user_data["watched"])): + if user_data["watched"][movie] not in user_watched_movies: + # if the movie is not in the user_watched_movies, add the movie to user_watched_movies + user_watched_movies.append(user_data["watched"][movie]) + + return user_watched_movies + + +def get_unique_watched(user_data): + ''' + Determines which movies the user has watched, but none of their friends have watched. + + Returns: + unique_watched_movies (list): Each movie represents a dictionary. + ''' + unique_watched = [] + + friends_watched_movies = get_friends_watched_movies(user_data) + user_watched_movies = get_user_watched_movies(user_data) + + for movie in user_watched_movies: + if (movie not in friends_watched_movies) and (movie not in unique_watched): + unique_watched.append(movie) + + return unique_watched + + +def get_friends_unique_watched(user_data): + ''' + Determines which movies at least one of the user's friends have watched, but the user has not watched. + + Returns: + friends_unique_watched (list): Each movie represents a dictionary. + ''' + friends_unique_watched = [] + + friends_watched_movies = get_friends_watched_movies(user_data) + user_watched_movies = get_user_watched_movies(user_data) + + for movie in friends_watched_movies: + if (movie not in user_watched_movies) and (movie not in friends_unique_watched): + friends_unique_watched.append(movie) + + return friends_unique_watched - # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + ''' + Determines recommended movies if the user has not watched it, the movie is a host of the user, and at least one friend has watched the movie. + + Returns: + available_recs (list): Each movie represents a dictionary. + ''' + available_recs = [] + + friends_watched_movies = get_friends_watched_movies(user_data) + user_watched_movies = get_user_watched_movies(user_data) + + for movie in friends_watched_movies: + if (movie not in user_watched_movies) and (movie["host"] in user_data["subscriptions"]) and (movie not in available_recs): + available_recs.append(movie) + + return available_recs + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + ''' + Determines recommended movies based on the user's most frequently watched genre. + + Returns: + new_rec_by_genre (list): Each movie represents a dictionary. + ''' + friends_watched_movies = get_friends_watched_movies(user_data) + user_watched_movies = get_user_watched_movies(user_data) + pass + user_most_watched_genre = get_most_watched_genre(user_data) + + new_rec_by_genre = [] + + for movie in friends_watched_movies: + if (movie not in user_watched_movies) and (movie["genre"] == user_most_watched_genre) and (movie not in new_rec_by_genre): + new_rec_by_genre.append(movie) + + return new_rec_by_genre + + +def get_rec_from_favorites(user_data): + ''' + Determines a list of recommended movies from the user's favorite movies. + + Returns: + rec_from_favorites (list): Each movie represents a dictionary. + ''' + friends_watched_movies = get_friends_watched_movies(user_data) + + rec_from_favorites = [] + for movie in user_data["favorites"]: + if movie not in friends_watched_movies and movie not in rec_from_favorites: + rec_from_favorites.append(movie) + + return rec_from_favorites \ No newline at end of file