From ff58afae770e9f4463cfd1f800aad82e68473452 Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Thu, 15 Sep 2022 18:36:32 -0400 Subject: [PATCH 1/9] first attempt to create def create_movie(title,genre,rating) Function --- tests/test_wave_01.py | 2 +- viewing_party/party.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..2611155de 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 diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..a2cc6e373 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -2,6 +2,14 @@ def create_movie(title, genre, rating): pass + #make a dictionary with these keys: "title","genre","rating" + movie_dict = {} + movie_dict["title"]= title + movie_dict["genre"] = genre + movie_dict["rating"] = rating + return movie_dict + + # ----------------------------------------- # ------------- WAVE 2 -------------------- From f16aa945ef355082ff66fca28e2356f4a3cbc242 Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Mon, 19 Sep 2022 13:32:24 -0400 Subject: [PATCH 2/9] wave 1 functions --- tests/test_wave_01.py | 16 ++++++++-------- viewing_party/party.py | 25 +++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 2611155de..60192b6bf 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -19,7 +19,6 @@ 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 +31,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 +44,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 +57,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 +78,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_user_watchlist(): # Arrange movie = { @@ -100,7 +99,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_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -124,7 +123,8 @@ 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() + +# @pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -148,7 +148,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() +# @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 a2cc6e373..273156632 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -7,9 +7,30 @@ def create_movie(title, genre, rating): movie_dict["title"]= title movie_dict["genre"] = genre movie_dict["rating"] = rating - return movie_dict - + information = [title,genre,rating] + if None in information: + return None + else: + return movie_dict + +def add_to_watched(user_data, movie): + user_data["watched"] = [movie] + return user_data + +def add_to_watchlist(user_data, movie): + user_data["watchlist"] = [movie] + return user_data + +def watch_movie(user_data,title): + watched_movie = title + for movie in user_data["watchlist"]: + for value in movie.values(): + if value == watched_movie: + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + + return(user_data) # ----------------------------------------- # ------------- WAVE 2 -------------------- From d0b5c35c0ffc5a982f99eea94f739777ab783d3b Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Tue, 20 Sep 2022 18:18:33 -0400 Subject: [PATCH 3/9] Added asserts to wave1 2nd and 3rd to last tests. Completed wave 2 functions, including getting most watched genre funct to pass all wave 2 tests --- tests/test_wave_01.py | 20 +++++++++++--------- tests/test_wave_02.py | 8 ++++---- viewing_party/party.py | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 13 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 60192b6bf..5b85024a9 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -117,11 +117,12 @@ 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 that movie name is what you think it is , rating, etc. + # raise Exception("Test needs to be completed.") + 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() @@ -143,10 +144,11 @@ 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.") - # ******************************************************************************************* - # ****** Add assertions here to test that the correct movie was added to "watched" ********** - # ******************************************************************************************* + # raise Exception("Test needs to be completed.") + 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 + # @pytest.mark.skip() def test_does_nothing_if_movie_not_in_watchlist(): diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..198e395b3 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/viewing_party/party.py b/viewing_party/party.py index 273156632..8f9dca112 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -35,6 +35,45 @@ def watch_movie(user_data,title): # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + ratings = [] + ratings_sum = 0 + + if(len(user_data["watched"])) is 0: + ratings_average = 0.0 + else: + for i in range(len(user_data["watched"])): + ratings.append((user_data["watched"][i]["rating"])) + i+=1 + + for rating in ratings: + ratings_sum += rating + + ratings_average = ratings_sum / len(ratings) + + return ratings_average + +def get_most_watched_genre(user_data): + genre_list = [] + genre_dictionary = {} + + if (len(user_data["watched"])) is 0: + popular_genre = None + else: + for i in range(len(user_data["watched"])): + genre_list.append((user_data["watched"][i]["genre"])) + i += 1 + + for genre in genre_list: + count = genre_list.count(genre) + genre_dictionary[genre] = count + + popular_genre = max(genre_dictionary, key=genre_dictionary.get) + return(popular_genre) + + + + # ----------------------------------------- From a0327096fc4383e6ae893f02c1c644818f24a1dc Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Wed, 21 Sep 2022 19:59:23 -0400 Subject: [PATCH 4/9] created wave three functions: 'get_unique_watched' and 'get_friends_unique_watched', all wave three tests passed --- tests/test_wave_03.py | 12 ++++----- viewing_party/party.py | 58 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..e80cbe183 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() @@ -55,12 +55,12 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - 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/viewing_party/party.py b/viewing_party/party.py index 8f9dca112..6c3c5d2f3 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -72,14 +72,66 @@ def get_most_watched_genre(user_data): return(popular_genre) +# ----------------------------------------- +# ------------- WAVE 3 -------------------- +# ----------------------------------------- +def get_unique_watched(user_data): + movie_titles_user_watched = set() + movie_titles_friends_watched = set() + list_of_movie_dictionaries_friends_have_not_watched = [] + for movie in user_data["watched"]: + movie_titles_user_watched.add((movie['title'])) + + for i in range(len(user_data["friends"])): + for movie in user_data["friends"][i]["watched"]: + title = movie.get("title") + movie_titles_friends_watched.add(title) + i += 1 + + movies_user_has_watched_but_not_friends = movie_titles_user_watched.difference(movie_titles_friends_watched) + for movie in movies_user_has_watched_but_not_friends: + for dictionary in user_data["watched"]: + if movie == dictionary['title']: + list_of_movie_dictionaries_friends_have_not_watched.append(dictionary) -# ----------------------------------------- -# ------------- WAVE 3 -------------------- -# ----------------------------------------- + return(list_of_movie_dictionaries_friends_have_not_watched) + +def get_friends_unique_watched(user_data): + movie_titles_friends_watched = set() + movie_titles_user_watched = set() + list_of_movie_dictionaries_user_has_not_watched = [] + for i in range(len(user_data["friends"])): + for movie in user_data["friends"][i]["watched"]: + title = movie.get("title") + movie_titles_friends_watched.add(title) + i += 1 + + for movie in user_data["watched"]: + movie_titles_user_watched.add((movie["title"])) + + movies_friends_have_watched_but_not_user = movie_titles_friends_watched.difference(movie_titles_user_watched) + + for movie in movies_friends_have_watched_but_not_user: + for i in range(len(user_data["friends"])): + for dictionary in user_data["friends"][i]["watched"]: + title = dictionary.get("title") + if title == movie: + list_of_movie_dictionaries_user_has_not_watched.append(dictionary) + i+=1 + + remove_dupes = set() + new_list_of_movie_dictionaries_user_has_not_watched = [] + for dictionary in list_of_movie_dictionaries_user_has_not_watched: + tuple_me = tuple(dictionary.items()) + if tuple_me not in remove_dupes: + remove_dupes.add(tuple_me) + new_list_of_movie_dictionaries_user_has_not_watched.append(dictionary) + + return(new_list_of_movie_dictionaries_user_has_not_watched) # ----------------------------------------- # ------------- WAVE 4 -------------------- From ed5e69817dcf80e1cf28ea269b19a6179f1e33a9 Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Thu, 22 Sep 2022 16:16:38 -0400 Subject: [PATCH 5/9] "created "get_available_recs" function for wave 4, all tests passed" --- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_04.py b/tests/test_wave_04.py index 499669077..0b0b3c7e2 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/viewing_party/party.py b/viewing_party/party.py index 6c3c5d2f3..a1061a6df 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -137,6 +137,19 @@ def get_friends_unique_watched(user_data): # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + movie_recs = [] + list_of_movie_dictionaries_user_has_not_watched_but_friend_has = get_friends_unique_watched(user_data) + for subscription in user_data["subscriptions"]: + for dictionary in list_of_movie_dictionaries_user_has_not_watched_but_friend_has: + if subscription == dictionary["host"]: + movie_recs.append(dictionary) + + return(movie_recs) + + + + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- From 8e12241923a6bf0f6eff2e99be7c8f69e3543b2d Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Thu, 22 Sep 2022 17:45:49 -0400 Subject: [PATCH 6/9] "wave 5 function, get_new_rec_by_genre, completed" --- tests/test_wave_05.py | 8 ++++---- viewing_party/party.py | 25 ++++++++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..ecbaccbfc 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 = { @@ -53,7 +53,7 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") + # raise Exception("Test needs to be completed.") # ********************************************************************* # ****** Complete the Act and Assert Portions of theis tests ********** # ********************************************************************* diff --git a/viewing_party/party.py b/viewing_party/party.py index a1061a6df..d0ece6a38 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -67,8 +67,13 @@ def get_most_watched_genre(user_data): for genre in genre_list: count = genre_list.count(genre) genre_dictionary[genre] = count - - popular_genre = max(genre_dictionary, key=genre_dictionary.get) + + try: + popular_genre = max(genre_dictionary, key=genre_dictionary.get) + except ValueError as err: + popular_genre = None + + return(popular_genre) @@ -147,10 +152,20 @@ def get_available_recs(user_data): return(movie_recs) - - - # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + movie_recs_by_genre = [] + users_most_frequently_watched_genre = get_most_watched_genre(user_data) + if users_most_frequently_watched_genre == None: + movie_recs_by_genre = [] + else: + list_of_movie_dictionaries_user_has_not_watched_but_friend_has = get_friends_unique_watched(user_data) + for dictionary in list_of_movie_dictionaries_user_has_not_watched_but_friend_has: + if users_most_frequently_watched_genre == dictionary["genre"]: + movie_recs_by_genre.append(dictionary) + + return(movie_recs_by_genre) + From 3f7ec3caa1c3e7a06c7873bf790fbc70341afed0 Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Thu, 22 Sep 2022 18:01:09 -0400 Subject: [PATCH 7/9] Wave 5 get_rec_from_favorites function created --- tests/test_wave_05.py | 6 +++--- viewing_party/party.py | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index ecbaccbfc..c92c74902 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -58,7 +58,7 @@ def test_new_genre_rec_from_empty_friends(): # ****** 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() @@ -72,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 = { @@ -94,7 +94,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 d0ece6a38..48612b47e 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -169,3 +169,11 @@ def get_new_rec_by_genre(user_data): return(movie_recs_by_genre) +def get_rec_from_favorites(user_data): + movie_recs_from_favorites = [] + list_of_movie_dictionaries_user_has_watched_but_friends_have_not = get_unique_watched(user_data) + for favorite in user_data["favorites"]: + for dictionary in list_of_movie_dictionaries_user_has_watched_but_friends_have_not: + if favorite["title"] == dictionary["title"]: + movie_recs_from_favorites.append(dictionary) + return(movie_recs_from_favorites) From 3e7205832f7b7ea0e4657136c43f5584e4fa84dd Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Thu, 22 Sep 2022 18:08:56 -0400 Subject: [PATCH 8/9] added act and assert statements to third test in wave 5, test passes --- tests/test_wave_05.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index c92c74902..1303d7a29 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -54,9 +54,10 @@ def test_new_genre_rec_from_empty_friends(): } # raise Exception("Test needs to be completed.") - # ********************************************************************* - # ****** Complete the Act and Assert Portions of theis tests ********** - # ********************************************************************* + # Act + recommendations = get_new_rec_by_genre(sonyas_data) + #Assert + assert len(recommendations) == 0 # @pytest.mark.skip() def test_unique_rec_from_favorites(): From 769c40fd23b673ba5f96806368687ff605ae7baf Mon Sep 17 00:00:00 2001 From: kindra greenawalt Date: Thu, 22 Sep 2022 18:18:37 -0400 Subject: [PATCH 9/9] added assert statements to test number 4 in test wave 3 --- tests/test_wave_03.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index e80cbe183..62f698c76 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -58,7 +58,10 @@ def test_friends_unique_movies_not_duplicated(): # 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():