diff --git a/README.md b/README.md index ba28bf2ab..2cc534e3b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Viewing Party - +# vs code test ## Skills Assessed Solving problems with... diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 669efee6a..71a53bfe5 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 = { @@ -159,12 +159,18 @@ 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.") + if updated_data["watched"][0] != { + "title": MOVIE_TITLE_1, + "genre": GENRE_1, + "rating": RATING_1 + }: + raise Exception("The movie was not moved to the watched.") + # ******************************************************************************************* # ****** 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 @@ -182,13 +188,15 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 + assert updated_data["watched"][-1] == movie_to_watch - raise Exception("Test needs to be completed.") + # if updated_data["watched"][1] != FANTASY_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 diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 19f045c79..ff8a229e4 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..1a1d6fb61 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,16 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 + assert FANTASY_4 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert INTRIGUE_3 in friends_unique_movies - raise Exception("Test needs to be completed.") + # 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..79ab18ff7 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..3a93b06f4 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 = { @@ -52,13 +52,17 @@ def test_new_genre_rec_from_empty_friends(): } ] } + # Act + recommendations = get_new_rec_by_genre(sonyas_data) - raise Exception("Test needs to be completed.") + # Assert + assert len(recommendations) == 0 + # raise Exception("Test needs to be completed.") # ********************************************************************* # ****** Complete the Act and Assert Portions of these tests ********** # ********************************************************************* -@pytest.mark.skip() +#@pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,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 = { @@ -94,7 +98,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..c6ab242aa 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,184 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + movie_dict = {} + + if not title or not genre or not rating: + return None + else: + movie_dict['title'] = title + movie_dict['genre'] = genre + movie_dict['rating'] = rating + + return movie_dict + +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"]: + if movie["title"] == title: + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + break + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + + if not user_data["watched"]: + return 0.0 + + total_rating = 0 + for movie in user_data["watched"]: + total_rating += movie["rating"] + + average = total_rating / len(user_data["watched"]) + + return average + +def get_most_watched_genre(user_data): + genre_count = {"Fantasy": 0, "Intrigue": 0, "Action": 0} #change method so that other genres can be included + + if not user_data["watched"]: + return None + + for movie in user_data["watched"]: + genre = movie["genre"] + if genre in genre_count: + genre_count[genre] += 1 + top_genre = max(genre_count, key=genre_count.get) + + return top_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + + movies_not_watched_by_friends = [] + + for movie_watched_by_user in user_data["watched"]: + watched_by_any_friend = False + + # checks if the movie is has been watched by a friend + for friend in user_data["friends"]: + if movie_watched_by_user in friend["watched"]: + watched_by_any_friend = True + break + + # If no friend has watched it, adds it to the final list + if not watched_by_any_friend: + movies_not_watched_by_friends.append(movie_watched_by_user) + + return movies_not_watched_by_friends + +def get_friends_unique_watched(user_data): + movies_watched_by_friends_not_user = [] + + # loops through each friend's watched list + for friend in user_data["friends"]: + for movie in friend["watched"]: + # appends to list if 1) movie is not in the user's watched list and 2) not already in the result list + if movie not in user_data["watched"] and movie not in movies_watched_by_friends_not_user: + movies_watched_by_friends_not_user.append(movie) + + return movies_watched_by_friends_not_user # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + subscriptions = set(user_data.get("subscriptions", [])) + + recommended_movies = set() # Using a set to ensure uniqueness + user_watched = set() # Track movies the user has already watched + + # Populate user_watched set with movie titles from user_data + for movie in user_data.get("watched"): + if "title" in movie: + user_watched.add(movie["title"]) + + # Loop through each friend and their watched movies + for friend in user_data.get("friends"): + for movie in friend.get("watched"): + # Only add the movie if it's hosted on a subscribed platform and not watched by the user + if movie["host"] in subscriptions and movie["title"] not in user_watched: + recommended_movies.add((movie["title"], movie["host"], movie["rating"], movie["genre"])) + + # Convert the set of tuples back to a list of dictionaries, including the 'genre' key + updated_recommendation = [ + {"title": title, "host": host, "rating": rating, "genre": genre} + for title, host, rating, genre in recommended_movies + ] + + return updated_recommendation + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + watched_movies = user_data["watched"] + if not watched_movies: + return [] # If there are no watched movies, return an empty list + + # Count the genres of watched movies + genre_counter = {} + for movie in watched_movies: + genre = movie["genre"] + if genre not in genre_counter: + genre_counter[genre] = 0 + genre_counter[genre] += 1 + + # Get the most common genre + top_genre = max(genre_counter, key=genre_counter.get) + + recommendations = [] # List to store recommendations + watched_titles = [] # List to store titles the user has watched + + for movie in watched_movies: + watched_titles.append(movie["title"]) + + for friend in user_data["friends"]: + for movie in friend["watched"]: + if (movie["genre"] == top_genre and + movie["title"] not in watched_titles): + # Check for duplicates + if movie not in recommendations: + recommendations.append(movie) + + return recommendations + +def get_rec_from_favorites(user_data): + + favorites = user_data["favorites"] + if not favorites: + return [] + + friends_watched_titles = [] + recommendations = [] + + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_titles.append(movie["title"]) + + for movie in favorites: + if movie["title"] not in friends_watched_titles: + recommendations.append(movie) + return recommendations \ No newline at end of file diff --git a/viewing_party/test b/viewing_party/test new file mode 100644 index 000000000..25e1e1553 --- /dev/null +++ b/viewing_party/test @@ -0,0 +1,100 @@ +# # def get_new_rec_by_genre(user_data): +# # # Determine user's most frequently watched genre +# # genre_counter = {} +# # recommendations = [] + +# # # Count the genres from the user's favorites (or watched) movies +# # for movie in user_data.get("favorites"): +# # genre = movie["genre"] +# # if genre not in genre_counter: +# # genre_counter[genre] = 0 +# # genre_counter[genre] += 1 + +# # # If no favorites, return an empty recommendation list +# # if not genre_counter: +# # return recommendations # Return empty list + +# # # Identify the top genre +# # top_genre = max(genre_counter, key=genre_counter.get) + +# # # Recommend movies from friends that match the top genre and are not in user's favorites +# # for friend in user_data.get("friends"): +# # for movie in friend.get("watched"): +# # if movie["genre"] == top_genre and movie not in user_data["favorites"]and movie not in recommendations: +# # recommendations.append(movie) # Add movie to recommendations if it's not a duplicate + +# # return recommendations +# ======================================== +# def get_new_rec_by_genre(user_data): +# #determine users most frequently watched genre +# genre_counter = {} +# recommendations = [] +# for movie in user_data["movie"]: +# genre = movie["genre"] +# if genre not in genre_counter: +# genre_counter[genre] = 0 +# genre_counter[genre] += 1 +# top_genre = max(genre_counter, key=genre_counter.get) + +# for friend in user_data["friends"]: +# for movie in friend["watched"]: +# if movie["genre"] == top_genre and movie not in user_data["watched"]: +# recommendations.append(movie) + +# return recommendations +# get_new_rec_by_genre( +# { +# "watched": [{...}, {...}, {...}, {...}, {...}, {...}], +# "friends": [{...}, {...}], +# "subscriptions": ["netflix", "hulu"], +# "favorites": [{...}, {...}, {...}, {...}], +# } +# ) +def get_new_rec_by_genre(user_data): + # genre_counter = {} + # recommendations = [] + for movie in user_data["favorites"]: + # genre = user_data["watched"] + print(movie) + # if genre not in genre_counter: + # genre_counter[genre] = 0 + # genre_counter[genre] += 1 + # top_genre = max(genre_counter, key=genre_counter.get) + + # for friend in user_data["friends"]: + # for movie in friend["watched"]: + # if movie["genre"] == top_genre and movie not in user_data["watched"]: + # recommendations.append(movie) + + # return recommendations + + return (print(movie)) +get_new_rec_by_genre( { + "watched": [{ + "title": "MOVIE_TITLE_1", + "genre": "GENRE_1", + "rating": "RATING_1" + }, + { + "title": "The Lord of the Functions: The Fellowship of the Function", + "genre": "Fantasy", + "rating": 4.8 + }], + "subscriptions":["netflix", "hulu"], + "friends":[ + { + "watched": [ + { + "title": "The Lord of the Functions: The Fellowship of the Function", + "genre": "Fantasy", + "rating": 4.8 + }, + { + "title": "The Programmer: An Unexpected Stack Trace", + "genre": "Fantasy", + "rating": 4.0 + } + ] + } + ] +}) \ No newline at end of file