From 76aef7508a39c1f725195f9d8b9b4cbd2eab1739 Mon Sep 17 00:00:00 2001 From: Hillary Smith Date: Fri, 25 Mar 2022 00:18:44 -0700 Subject: [PATCH 1/2] Make tests pass and improve readability --- tests/test_wave_01.py | 19 +++--- tests/test_wave_02.py | 8 +-- tests/test_wave_03.py | 10 +-- tests/test_wave_04.py | 4 +- tests/test_wave_05.py | 11 ++-- viewing_party/party.py | 140 ++++++++++++++++++++++++++++++++++++++++- 6 files changed, 164 insertions(+), 28 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index c033af09f..86aca36bd 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() + def test_create_successful_movie(): # Arrange movie_title = MOVIE_TITLE_1 @@ -19,7 +19,7 @@ def test_create_successful_movie(): assert new_movie["genre"] is GENRE_1 assert new_movie["rating"] == pytest.approx(RATING_1) -@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() + 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() + def test_create_no_rating_movie(): # Arrange movie_title = "Title A" @@ -58,7 +58,8 @@ def test_create_no_rating_movie(): # Assert assert new_movie is None -@pytest.mark.skip() + + def test_adds_movie_to_user_watched(): # Arrange movie = { @@ -79,7 +80,7 @@ def test_adds_movie_to_user_watched(): assert updated_data["watched"][0]["genre"] is GENRE_1 assert updated_data["watched"][0]["rating"] is RATING_1 -@pytest.mark.skip() + def test_adds_movie_to_user_watchlist(): # Arrange movie = { @@ -100,7 +101,7 @@ def test_adds_movie_to_user_watchlist(): assert updated_data["watchlist"][0]["genre"] is GENRE_1 assert updated_data["watchlist"][0]["rating"] is RATING_1 -@pytest.mark.skip() + def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -123,7 +124,7 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* -@pytest.mark.skip() + def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -146,7 +147,7 @@ def test_moves_movie_from_watchlist_to_watched(): # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* -@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..2ec8fcac2 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() + 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() + 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() + 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() + 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..6934b69f2 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() + 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() + 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() + 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() + def test_friends_unique_movies_not_duplicated(): # Arrange amandas_data = clean_wave_3_data() @@ -59,7 +59,7 @@ def test_friends_unique_movies_not_duplicated(): # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** # ************************************************************************************************** -@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..ed456f00e 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() + 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() + 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..72c91c0b5 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() + 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() + 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() + def test_new_genre_rec_from_empty_friends(): # Arrange sonyas_data = { @@ -57,7 +57,6 @@ def test_new_genre_rec_from_empty_friends(): # ****** Complete the Act and Assert Portions of theis tests ********** # ********************************************************************* -@pytest.mark.skip() def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -71,7 +70,7 @@ def test_unique_rec_from_favorites(): assert INTRIGUE_2b in recommendations assert sonyas_data == clean_wave_5_data() -@pytest.mark.skip() + def test_unique_from_empty_favorites(): # Arrange sonyas_data = { @@ -92,7 +91,7 @@ def test_unique_from_empty_favorites(): # Assert assert len(recommendations) == 0 -@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..c9c80cfac 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,159 @@ # ------------- WAVE 1 -------------------- +from enum import unique + + def create_movie(title, genre, rating): - pass + movie = {"title" : title, "genre" : genre, "rating" : rating} + + if not title or not genre or not rating: + movie = None + + return movie + +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["watchlist"].remove(movie) + user_data["watched"].append(movie) + break + + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + movie_counter = 0 + rating_total = 0 + + for movie in user_data["watched"]: + movie_counter += 1 + rating_total += movie["rating"] + if movie_counter == 0: + average_rating = 0.0 + else: + average_rating = rating_total / movie_counter + + return average_rating + +def get_most_watched_genre(user_data): + + if not user_data["watched"]: + return None + else: + genre_dict = { + "Intrigue" : 0, "Action" : 0, "Horror" : 0, "Fantasy" : 0 + } + for movie in user_data["watched"]: + if movie["genre"] == "Intrigue": + genre_dict["Intrigue"] +=1 + elif movie["genre"] == "Action": + genre_dict["Action"] +=1 + elif movie["genre"] == "Horror": + genre_dict["Horror"] +=1 + elif movie["genre"] == "Fantasy": + genre_dict["Fantasy"] +=1 + + popular_genre = max(genre_dict, key=genre_dict.get) + + return popular_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +def get_unique_watched(user_data): + unique_movies = [] + friend_watched_movies = [] + + for movies in user_data["friends"]: + for movie in movies["watched"]: + friend_watched_movies.append(movie["title"]) + + for film in user_data["watched"]: + if film ["title"] not in friend_watched_movies: + unique_movies.append(film) + + return unique_movies + +def get_friends_unique_watched(user_data): + users_watched_movies = [] + friends_unique_movies= [] + + for film in user_data["watched"]: + users_watched_movies.append(film["title"]) + + for movies in user_data["friends"]: + for movie in movies["watched"]: + if movie["title"] not in users_watched_movies\ + and movie not in friends_unique_movies: + friends_unique_movies.append(movie) + + return friends_unique_movies # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + recommended_movies = [] + users_watched_movies = [] + + for film in user_data["watched"]: + users_watched_movies.append(film["title"]) + + for movies in user_data["friends"]: + for movie in movies["watched"]: + if movie["title"] not in users_watched_movies\ + and movie["host"] in user_data["subscriptions"]: + recommended_movies.append(movie) + + return recommended_movies # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + recommended_movies_by_genre = [] + users_watched_movies = [] + + for film in user_data["watched"]: + users_watched_movies.append(film["title"]) + + fav_genre = get_most_watched_genre(user_data) + + for movies in user_data["friends"]: + for movie in movies["watched"]: + if movie["title"] not in users_watched_movies\ + and movie["genre"] == fav_genre: + recommended_movies_by_genre.append(movie) + + return recommended_movies_by_genre + +def get_rec_from_favorites (user_data): + recommended_movies_from_favorites = [] + friends_watched_movies = [] + + for movies in user_data["friends"]: + for movie in movies["watched"]: + friends_watched_movies.append(movie["title"]) + + for film in user_data["favorites"]: + if film["title"] not in friends_watched_movies: + recommended_movies_from_favorites.append(film) + + return recommended_movies_from_favorites \ No newline at end of file From 45c46eda81ffd5c5407cad03094028eb3cb95e8f Mon Sep 17 00:00:00 2001 From: Hillary Smith Date: Fri, 25 Mar 2022 18:18:23 -0700 Subject: [PATCH 2/2] Add missing acts and asserts in tests, add helper function, change get_most_watched_genre to allow more genres --- tests/test_wave_01.py | 7 ++++++- tests/test_wave_03.py | 1 + tests/test_wave_05.py | 5 +++++ viewing_party/party.py | 42 +++++++++++++++++------------------------- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 86aca36bd..d3a9159ae 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -1,3 +1,4 @@ +from turtle import up import pytest # NOTE: In production code, we developers should change import * to something more specific. Due to some constraints of this project, we will import * in our test files. # from viewing_party.main import * @@ -119,7 +120,10 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) is 0 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 + # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* @@ -142,6 +146,7 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) is 1 assert len(updated_data["watched"]) is 2 + assert updated_data["watched"][1] is movie_to_watch # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 6934b69f2..65a15b699 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -54,6 +54,7 @@ def test_friends_unique_movies_not_duplicated(): # Arrange assert len(friends_unique_movies) == 3 + assert friends_unique_movies[2] is INTRIGUE_3 # ************************************************************************************************* # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 72c91c0b5..2ac50b874 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -52,6 +52,11 @@ 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 ********** diff --git a/viewing_party/party.py b/viewing_party/party.py index c9c80cfac..aec45459d 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -2,6 +2,12 @@ from enum import unique +# This is a helper function used in some above functions +def get_users_watched_movie_titles(user_data): + users_watched_movies = [] + for film in user_data["watched"]: + users_watched_movies.append(film["title"]) + return users_watched_movies def create_movie(title, genre, rating): movie = {"title" : title, "genre" : genre, "rating" : rating} @@ -56,21 +62,15 @@ def get_most_watched_genre(user_data): if not user_data["watched"]: return None else: - genre_dict = { - "Intrigue" : 0, "Action" : 0, "Horror" : 0, "Fantasy" : 0 - } + genre_dict = {} for movie in user_data["watched"]: - if movie["genre"] == "Intrigue": - genre_dict["Intrigue"] +=1 - elif movie["genre"] == "Action": - genre_dict["Action"] +=1 - elif movie["genre"] == "Horror": - genre_dict["Horror"] +=1 - elif movie["genre"] == "Fantasy": - genre_dict["Fantasy"] +=1 + if movie["genre"] in genre_dict: + genre_dict[movie["genre"]] += 1 + else: + genre_dict[movie["genre"]] = 1 popular_genre = max(genre_dict, key=genre_dict.get) - + print(genre_dict) return popular_genre # ----------------------------------------- @@ -92,11 +92,8 @@ def get_unique_watched(user_data): return unique_movies def get_friends_unique_watched(user_data): - users_watched_movies = [] friends_unique_movies= [] - - for film in user_data["watched"]: - users_watched_movies.append(film["title"]) + users_watched_movies = get_users_watched_movie_titles(user_data) for movies in user_data["friends"]: for movie in movies["watched"]: @@ -111,10 +108,7 @@ def get_friends_unique_watched(user_data): def get_available_recs(user_data): recommended_movies = [] - users_watched_movies = [] - - for film in user_data["watched"]: - users_watched_movies.append(film["title"]) + users_watched_movies = get_users_watched_movie_titles(user_data) for movies in user_data["friends"]: for movie in movies["watched"]: @@ -129,10 +123,7 @@ def get_available_recs(user_data): def get_new_rec_by_genre(user_data): recommended_movies_by_genre = [] - users_watched_movies = [] - - for film in user_data["watched"]: - users_watched_movies.append(film["title"]) + users_watched_movies = get_users_watched_movie_titles(user_data) fav_genre = get_most_watched_genre(user_data) @@ -156,4 +147,5 @@ def get_rec_from_favorites (user_data): if film["title"] not in friends_watched_movies: recommended_movies_from_favorites.append(film) - return recommended_movies_from_favorites \ No newline at end of file + return recommended_movies_from_favorites +