From f31537816c4632de23f079fb23ddcb6cdc4d3bd6 Mon Sep 17 00:00:00 2001 From: maple-megan333 Date: Wed, 2 Nov 2022 13:56:23 -0700 Subject: [PATCH 1/5] Completed First wave of testing/ program creation --- tests/test_wave_01.py | 27 +++++++++++++++------------ viewing_party/party.py | 29 ++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..099f0db08 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"] == 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,7 @@ 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 +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() + def test_adds_movie_to_user_watchlist(): # Arrange movie = { @@ -100,7 +100,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() + def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -118,13 +118,15 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 - - raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* + 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() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -143,12 +145,13 @@ def test_moves_movie_from_watchlist_to_watched(): assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 - raise Exception("Test needs to be completed.") + #raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* + assert movie_to_watch not in updated_data["watchlist"] + assert movie_to_watch in updated_data["watched"] -@pytest.mark.skip() def test_does_nothing_if_movie_not_in_watchlist(): # Arrange movie_to_watch = HORROR_1 diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..76c3ee610 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,8 +1,35 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + print("***************************") + new_movie = { + 'title': title, + 'genre': genre, + 'rating' : rating + } + for value in new_movie.values(): + if value is None: + return None + return new_movie +def add_to_watchlist(user_data, movie): + print("*******************************") + if "watchlist" in user_data: + user_data["watchlist"].append(movie) + return user_data + +def add_to_watched(user_data, movie): + print("*******************************") + if "watched" in user_data: + user_data["watched"].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 = add_to_watched(user_data, movie) + user_data["watchlist"].remove(movie) + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- From 1f6095e0d90a3b424c1ea2b5d6eaa65a4470eec9 Mon Sep 17 00:00:00 2001 From: maple-megan333 Date: Wed, 2 Nov 2022 14:15:25 -0700 Subject: [PATCH 2/5] Second wave complete --- tests/test_wave_02.py | 7 +++---- viewing_party/party.py | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..5dc1d7c74 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,6 @@ 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 +26,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 +38,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/viewing_party/party.py b/viewing_party/party.py index 76c3ee610..b50b306f4 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -34,6 +34,30 @@ def watch_movie(user_data, movie_title): # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + if user_data["watched"]: + num_of_watched = 0 + rating_sum = 0 + for movie in user_data["watched"]: + num_of_watched+=1 + rating_sum += movie["rating"] + return rating_sum/num_of_watched + + return 0 + +def get_most_watched_genre(user_data): + if user_data["watched"]: + movie_genres = { + + } + for movie in user_data["watched"]: + if movie['genre'] in movie_genres.keys(): + movie_genres[movie['genre']] += 1 + else: + movie_genres[movie['genre']] = 1 + return max(movie_genres, key=movie_genres.get) + return None + # ----------------------------------------- # ------------- WAVE 3 -------------------- From c0128be47d79143cfd2814ce5f80213f06f915c6 Mon Sep 17 00:00:00 2001 From: maple-megan333 Date: Wed, 2 Nov 2022 16:23:48 -0700 Subject: [PATCH 3/5] Wave 3 complete --- tests/test_wave_03.py | 14 ++++++++------ viewing_party/party.py | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..7ba4e79f3 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(): # Assert 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() @@ -55,12 +55,14 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - raise Exception("Test needs to be completed.") # ************************************************************************************************* # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** # ************************************************************************************************** + assert INTRIGUE_3 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert FANTASY_4 in friends_unique_movies + -@pytest.mark.skip() def test_friends_not_unique_movies(): # Arrange amandas_data = { diff --git a/viewing_party/party.py b/viewing_party/party.py index b50b306f4..29ee445c6 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -63,6 +63,25 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + unique_list = [] + if user_data["watched"]: + for movie in user_data["watched"]: + unique_list.append(movie) + for friend in user_data["friends"]: + if movie in friend["watched"]: + unique_list.remove(movie) + break + return unique_list + +def get_friends_unique_watched(user_data): + friends_unique_list = [] + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in user_data["watched"] and movie not in friends_unique_list: + friends_unique_list.append(movie) + + return friends_unique_list # ----------------------------------------- # ------------- WAVE 4 -------------------- From 62717b3a55513fa7cc8f7e77096be0e3b7f612e5 Mon Sep 17 00:00:00 2001 From: maple-megan333 Date: Wed, 2 Nov 2022 16:35:33 -0700 Subject: [PATCH 4/5] Wave 4 complete --- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index 499669077..67f432045 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 = { @@ -38,7 +38,7 @@ def test_no_available_friend_recs(): # Assert assert len(recommendations) == 0 -@pytest.mark.skip() + def test_no_available_friend_recs_watched_all(): # Arrange amandas_data = { diff --git a/viewing_party/party.py b/viewing_party/party.py index 29ee445c6..e9e084c53 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -86,6 +86,15 @@ def get_friends_unique_watched(user_data): # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + friends_unique_movies = get_friends_unique_watched(user_data) + available_reccomended = [] + for movie in friends_unique_movies: + if movie["host"] in user_data["subscriptions"]: + available_reccomended.append(movie) + return available_reccomended + + # ----------------------------------------- # ------------- WAVE 5 -------------------- From 4bd1f356a66ca06c37fca4787c28de3c5de8b471 Mon Sep 17 00:00:00 2001 From: maple-megan333 Date: Wed, 2 Nov 2022 17:02:05 -0700 Subject: [PATCH 5/5] Final Wave Complete! --- tests/test_wave_05.py | 17 ++++++++++------- viewing_party/party.py | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..535205cb5 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,6 @@ 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 = { @@ -53,12 +52,16 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") + # Act + recommendations = get_new_rec_by_genre(sonyas_data) # ********************************************************************* # ****** Complete the Act and Assert Portions of theis tests ********** # ********************************************************************* -@pytest.mark.skip() + # Assert + assert len(recommendations) == 0 + + def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -72,7 +75,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 = { @@ -94,7 +97,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 e9e084c53..70e5bb18a 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -100,3 +100,24 @@ def get_available_recs(user_data): # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + reccomendations_by_genere = [] + if user_data["watched"]: + filter_genere = get_most_watched_genre(user_data) + if "subscriptions" in user_data.keys(): + available_recs = get_available_recs(user_data) + for movie in available_recs: + if movie["genre"] == filter_genere: + reccomendations_by_genere.append(movie) + + return reccomendations_by_genere + + +def get_rec_from_favorites(user_data): + unique_user_movies = get_unique_watched(user_data) + unique_recs_by_faves = [] + for movie in unique_user_movies: + if movie in user_data["favorites"]: + unique_recs_by_faves.append(movie) + return unique_recs_by_faves +