diff --git a/play_tester.py b/play_tester.py index 9e2aecf48..7209aa042 100644 --- a/play_tester.py +++ b/play_tester.py @@ -14,11 +14,61 @@ pp.pprint(FANTASY_1) pp.pprint(FANTASY_2) -# print("\n-----Wave 02 user_data-----") -# pp.pprint(clean_wave_2_data()) +print("\n-----Wave 02 user_data-----") +pp.pprint(clean_wave_2_data()) -#print("\n-----Wave 03 user_data-----") -#pp.pprint(clean_wave_3_data()) +def get_most_watched_genre(user_data): + fantacy_count = 0 + action_count = 0 + intrigue_count = 0 + + if len(user_data["watched"]) < 1: + most_watched_genre = None + return most_watched_genre + + for movie in user_data["watched"]: + if movie["genre"] == "Fantacy": + fantacy_count += 1 + if movie["genre"] == "Action": + action_count += 1 + if movie["genre"] == "Intrigue": + intrigue_count += 1 + + if fantacy_count > action_count and fantacy_count > intrigue_count: + most_watched_genre = "Fantacy" + if action_count > fantacy_count and action_count > intrigue_count: + most_watched_genre = "Action" + if intrigue_count > action_count and intrigue_count > fantacy_count: + most_watched_genre = "Intrigue" + return most_watched_genre + + +print("\n-----Wave 03 user_data-----") +pp.pprint(clean_wave_3_data()) + +def get_unique_watched(user_data): + user_watched_list = [] + friend_watched_list = [] + + for movie in user_data["watched"]: + user_watched_list.append(movie["title"]) + + for friend in user_data["friends"]: + for movie in friend["watched"]: + friend_watched_list.append(movie["title"]) + + user_watched_set = set(user_watched_list) + friend_watched_set = set(friend_watched_list) + user_unique_watched_set = user_watched_set.difference(friend_watched_set) + user_unique_watched_list = [] + + for unique_movie in user_unique_watched_set: + for movie in user_data["watched"]: + for title in movie["title"]: + if title == unique_movie: + user_unique_watched_list.append(user_data["watched"][movie]) + + return user_unique_watched_list # Wave 04 user data #print("\n-----Wave 04 user_data-----") diff --git a/requirements.txt b/requirements.txt index a1f490d3d..f5ef51696 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ pluggy==0.13.1 pprintpp==0.4.0 py==1.10.0 pyparsing==2.4.7 -pytest==6.2.1 +pytest==6.2.5 toml==0.10.2 diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index c033af09f..23caf1816 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 @@ -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 = { @@ -74,12 +74,12 @@ def test_adds_movie_to_user_watched(): updated_data = add_to_watched(user_data, movie) # 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 len(updated_data["watched"]) == 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,14 +116,14 @@ 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 + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_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 = HORROR_1 @@ -139,14 +139,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 + assert movie_to_watch in updated_data["watched"] # ******************************************************************************************* # ****** 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..f7d3d46db 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 7c42a63c4..d8f299c22 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,14 @@ def test_friends_unique_movies_not_duplicated(): # Arrange 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 # ************************************************************************************************* # ****** 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 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..70f49eb99 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,12 +52,17 @@ def test_new_genre_rec_from_empty_friends(): } ] } + # Act + recommendations = get_new_rec_by_genre(sonyas_data) + + # Assert + assert len(recommendations) == 0 # ********************************************************************* # ****** 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() @@ -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..14cbdbdda 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,197 @@ # ------------- WAVE 1 -------------------- + +from logging.handlers import WatchedFileHandler +from tkinter import W + + def create_movie(title, genre, rating): - pass + new_movie = {} + if title and genre and rating: + new_movie = { + "title": title, + "genre": genre, + "rating": rating} + return new_movie + else: + new_movie = None + return new_movie + +# am i supposed to make this or is the test making it? +# user_data = { +# "watched": [ +# { +# "title": "Title A", +# "genre": "Horror", +# "rating": 3.5 + +# } + +# ] +# } + +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 title == movie["title"]: + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + return user_data + + return user_data + + + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + total_ratings = 0 + num_of_movies = len(user_data["watched"]) + + if len(user_data["watched"]) < 1: + watched_avg_rating = 0.0 + return watched_avg_rating + + for movie in user_data["watched"]: + total_ratings += movie["rating"] + + watched_avg_rating = total_ratings / num_of_movies + + return watched_avg_rating + +def get_most_watched_genre(user_data): + + if len(user_data["watched"]) < 1: + most_watched_genre = None + return most_watched_genre + + genre_count_dict = {} + + for movie in user_data["watched"]: + if movie["genre"] not in genre_count_dict: + genre_count_dict[movie["genre"]] = 1 + else: + genre_count_dict[movie["genre"]] += 1 + + highest_count_sofar = 0 + highest_genre = None + + for genre, count in genre_count_dict.items(): + if count > highest_count_sofar: + highest_count_sofar = count + highest_genre = genre + + return highest_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - + +def get_unique_watched(user_data): + user_watched_list = [] + friend_watched_list = [] + + for movie in user_data["watched"]: + user_watched_list.append(movie["title"]) + + for friend in user_data["friends"]: + for movie in friend["watched"]: + friend_watched_list.append(movie["title"]) + + user_watched_set = set(user_watched_list) + friend_watched_set = set(friend_watched_list) + user_unique_watched_set = user_watched_set.difference(friend_watched_set) + user_unique_watched_list = [] + + for unique_movie in user_unique_watched_set: + for movie in user_data["watched"]: + if movie["title"] == unique_movie: + user_unique_watched_list.append(movie) + + return user_unique_watched_list + +def get_friends_unique_watched(user_data): + user_watched_list = [] + friend_watched_list = [] + + for movie in user_data["watched"]: + user_watched_list.append(movie["title"]) + + for friend in user_data["friends"]: + for movie in friend["watched"]: + friend_watched_list.append(movie["title"]) + + user_watched_set = set(user_watched_list) + friend_watched_set = set(friend_watched_list) + friend_unique_watched_set = friend_watched_set.difference(user_watched_set) + friend_unique_watched_list = [] + + for unique_movie in friend_unique_watched_set: + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in friend_unique_watched_list: + if movie["title"] == unique_movie: + friend_unique_watched_list.append(movie) + + return friend_unique_watched_list + + + + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + + friends_unique_watched_list = get_friends_unique_watched(user_data) + + available_recommended_movies_list = [] + + for movie in friends_unique_watched_list: + for subscription in user_data["subscriptions"]: + if subscription == movie["host"]: + available_recommended_movies_list.append(movie) + + return available_recommended_movies_list + + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + + most_watched_genre = get_most_watched_genre(user_data) + friend_unique_watched = get_friends_unique_watched(user_data) + recommended_movies = [] + + for movie in friend_unique_watched: + if movie not in recommended_movies and movie["genre"] == most_watched_genre: + recommended_movies.append(movie) + return recommended_movies + +def get_rec_from_favorites(user_data): + + user_unique = get_unique_watched(user_data) + rec_from_fav = [] + + for favorite_movie in user_data["favorites"]: + for unique_movie in user_unique: + if favorite_movie["title"] == unique_movie["title"]: + if favorite_movie not in rec_from_fav: + rec_from_fav.append(favorite_movie) + return rec_from_fav + +#HAZZAH \ No newline at end of file