diff --git a/.gitignore b/.gitignore index 7b7b959c8..01228ce14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .vscode/ .DS_Store .vscode +.idea # GitHub's boilerplate Python gitignore # https://github.com/github/gitignore/blob/master/Python.gitignore diff --git a/requirements.txt b/requirements.txt index a1f490d3d..4071a1f89 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==7.1.0 toml==0.10.2 diff --git a/tests/test_constants.py b/tests/test_constants.py index 55d4dceb5..69805fd4b 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -78,6 +78,17 @@ ], } +USER_ADDITIONAL_DATA_2 = { + "watched": [ + ACTION_1, + INTRIGUE_1, + INTRIGUE_2, + FANTASY_1, + FANTASY_2, + FANTASY_3 + ], +} + #-----WAVE 3-------- USER_DATA_3 = copy.deepcopy(USER_DATA_2) USER_DATA_3["friends"] = [ @@ -173,6 +184,9 @@ def clean_wave_2_data(): return copy.deepcopy(USER_DATA_2) +def clean_wave_2_additional_data(): + return copy.deepcopy(USER_ADDITIONAL_DATA_2) + def clean_wave_3_data(): return copy.deepcopy(USER_DATA_3) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index c033af09f..aff04f4ba 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 @@ -30,9 +30,9 @@ def test_create_no_title_movie(): new_movie = create_movie(movie_title, genre, rating) # Assert - assert new_movie is None + assert new_movie == None -@pytest.mark.skip() +#@pytest.mark.skip() def test_create_no_genre_movie(): # Arrange movie_title = "Title A" @@ -43,9 +43,9 @@ def test_create_no_genre_movie(): new_movie = create_movie(movie_title, genre, rating) # Assert - assert new_movie is None + assert new_movie == None -@pytest.mark.skip() +#@pytest.mark.skip() def test_create_no_rating_movie(): # Arrange movie_title = "Title A" @@ -56,9 +56,9 @@ def test_create_no_rating_movie(): new_movie = create_movie(movie_title, genre, rating) # Assert - assert new_movie is None + assert new_movie == 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,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 + 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 # ******************************************************************************************* # ****** 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 +142,17 @@ 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 updated_data["watched"][1]["title"] == MOVIE_TITLE_1 + assert updated_data["watched"][1]["genre"] == GENRE_1 + assert updated_data["watched"][1]["rating"] == RATING_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..bfb2c902e 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,19 @@ def test_most_watched_genre(): assert popular_genre == "Fantasy" assert janes_data == clean_wave_2_data() -@pytest.mark.skip() +def test_most_watched_genre_additional(): #added an additional test to make sure the function picks up + #the most watched genre and not just the first one from the list + # Arrange + janes_data = clean_wave_2_additional_data() + + # Act + popular_genre = get_most_watched_genre(janes_data) + + # Assert + assert popular_genre == "Fantasy" + assert janes_data == clean_wave_2_additional_data() + +#@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..0c283e747 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 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..8bb8958d4 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..29deafb30 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,13 @@ def test_new_genre_rec_from_empty_friends(): } ] } - + recommendations = get_new_rec_by_genre(sonyas_data) + 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 +72,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 +93,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..16e5675c3 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,166 @@ # ------------- WAVE 1 -------------------- - def create_movie(title, genre, rating): - pass + if title != None and genre != None and rating != None: + movie_dict = {} + movie_dict["title"] = title + movie_dict["genre"] = genre + movie_dict["rating"] = rating + else: + return None + 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 = add_to_watched(user_data, movie) + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + watched_movies_list = [] + sum = 0 + for item in user_data["watched"]: + watched_movies_list.append(item["rating"]) + for number in watched_movies_list: + sum += number + if watched_movies_list: + return sum / len(watched_movies_list) + else: + return 0.0 + + +def get_most_watched_genre(user_data): + most_watched = {} + for movie in user_data["watched"]: + most_watched.setdefault(movie["genre"], 0) + most_watched[movie["genre"]] += 1 + + max_value = 0 + max_key = None + + for key, value in most_watched.items(): + if value > max_value: + max_value = value + max_key = key + return max_key # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +def get_unique_watched(user_data): + list_watched = [] + for movie in user_data["watched"]: + list_watched.append(movie) + + friends_watched_set = set() + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_set.add(movie["title"]) + + list_unique = [] + for movie in list_watched: + if movie["title"] not in friends_watched_set: + list_unique.append(movie) + return list_unique + + +def get_friends_unique_watched(user_data): + set_watched = set() + for movie in user_data["watched"]: + set_watched.add(movie["title"]) + + friends_watched_dict = {} + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_dict[movie["title"]] = movie + + list_unique = [] + for key, value in friends_watched_dict.items(): + if key not in set_watched: + list_unique.append(value) + + return list_unique + + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + set_watched = set() + for movie in user_data["watched"]: + set_watched.add(movie["title"]) + + friends_watched_list = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_list.append(movie) + + list_only_friends_watched = [] + for movie in friends_watched_list: + if movie["title"] not in set_watched: + list_only_friends_watched.append(movie) + + recs_list = [] + for movie in list_only_friends_watched: + if movie["host"] in user_data["subscriptions"]: + recs_list.append(movie) + + return recs_list + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + most_watched_genre = get_most_watched_genre(user_data) + + set_watched = set() + for movie in user_data["watched"]: + set_watched.add(movie["title"]) + + friends_watched_list = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_list.append(movie) + + list_only_friends_watched = [] + for movie in friends_watched_list: + if movie["title"] not in set_watched: + list_only_friends_watched.append(movie) + + rec_by_genre_list = [] + for movie in list_only_friends_watched: + if movie["genre"] == most_watched_genre: + rec_by_genre_list.append(movie) + return rec_by_genre_list + + +def get_rec_from_favorites(user_data): + friends_watched_set = set() + for friend in user_data["friends"]: + for movie in friend["watched"]: + friends_watched_set.add(movie["title"]) + + rec_from_fav_list = [] + for movie in user_data["favorites"]: + if movie["title"] not in friends_watched_set: + rec_from_fav_list.append(movie) + return rec_from_fav_list