From 4d53f9845e73bd3da10876c11c03d58d79925e77 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 12:24:49 -0800 Subject: [PATCH 01/16] Add fixture for wave1 --- tests/test_constants.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_constants.py b/tests/test_constants.py index 55d4dceb5..cc41d6f32 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -11,6 +11,10 @@ GENRE_1 = "Horror" RATING_1 = 3.5 +MOVIE_TITLE_2 = "Ratatouille" +GENRE_2 = "Comedy" +RATING_2 = 4.3 + #----------WAVE02------------- HORROR_1 = { "title": MOVIE_TITLE_1, From f4c2b62214c84942194df1bd398a64ba7fa40104 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 12:26:38 -0800 Subject: [PATCH 02/16] Add tests for wave1 add_to_watched func --- tests/test_wave_01.py | 45 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..022bcd654 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -4,7 +4,6 @@ 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 +18,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 +30,6 @@ 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 +42,6 @@ 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,8 +54,20 @@ def test_create_no_rating_movie(): # Assert assert new_movie is None -@pytest.mark.skip() -def test_adds_movie_to_user_watched(): +def test_adds_no_movie_to_user_watched(): + # Arrange + movie = {} + user_data = { + "watched": [] + } + + # Act + updated_data = add_to_watched(user_data, movie) + + # Assert + assert len(updated_data["watched"]) == 0 + +def test_adds_movie_to_empty_user_watched_list(): # Arrange movie = { "title": MOVIE_TITLE_1, @@ -79,6 +87,31 @@ def test_adds_movie_to_user_watched(): assert updated_data["watched"][0]["genre"] == GENRE_1 assert updated_data["watched"][0]["rating"] == RATING_1 +def test_adds_movie_to_user_watched(): + # Arrange + movie = { + "title": MOVIE_TITLE_1, + "genre": GENRE_1, + "rating": RATING_1 + } + movie_watched = { + "title": MOVIE_TITLE_2, + "genre": GENRE_2, + "rating": RATING_2 + } + user_data = { + "watched": [movie_watched] + } + + # Act + updated_data = add_to_watched(user_data, movie) + + # Assert + 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 + @pytest.mark.skip() def test_adds_movie_to_user_watchlist(): # Arrange From 897a6d410380e06783ee47c75c8418177d908690 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 12:28:10 -0800 Subject: [PATCH 03/16] Add wave1 create_movie and add_to_watched --- tests/test_constants.py | 2 +- viewing_party/party.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/test_constants.py b/tests/test_constants.py index cc41d6f32..434abfd74 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -17,7 +17,7 @@ #----------WAVE02------------- HORROR_1 = { - "title": MOVIE_TITLE_1, + "title": s1, "genre": GENRE_1, "rating": RATING_1 } diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..f7aaef0e0 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,7 +1,17 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + if not bool(title) or not bool(genre) or not bool(rating): + return None + + new_movie = {"title": title, "genre": genre, "rating": rating} + return new_movie + +def add_to_watched(user_data, movie): + if not bool(movie): + return user_data + user_data["watched"].append(movie) + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- From 44839a067666dbaeaa6e2836d2e2c4d0b4b26199 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 12:30:05 -0800 Subject: [PATCH 04/16] revert wave1 fixture --- tests/test_constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_constants.py b/tests/test_constants.py index 434abfd74..cc41d6f32 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -17,7 +17,7 @@ #----------WAVE02------------- HORROR_1 = { - "title": s1, + "title": MOVIE_TITLE_1, "genre": GENRE_1, "rating": RATING_1 } From 279a95527b7affca2549989ae4bdc67c1fe03d8d Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 12:46:08 -0800 Subject: [PATCH 05/16] Add and update tests for add_to_watchlist func --- tests/test_wave_01.py | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 022bcd654..6ab554ac8 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -112,8 +112,20 @@ def test_adds_movie_to_user_watched(): assert updated_data["watched"][1]["genre"] == GENRE_1 assert updated_data["watched"][1]["rating"] == RATING_1 -@pytest.mark.skip() -def test_adds_movie_to_user_watchlist(): +def test_adds_no_movie_to_user_watchlist(): + # Arrange + movie = {} + user_data = { + "watchlist": [] + } + + # Act + updated_data = add_to_watchlist(user_data, movie) + + # Assert + assert len(updated_data["watchlist"]) == 0 + +def test_adds_movie_to_empty_user_watchlist(): # Arrange movie = { "title": MOVIE_TITLE_1, @@ -133,6 +145,31 @@ def test_adds_movie_to_user_watchlist(): assert updated_data["watchlist"][0]["genre"] == GENRE_1 assert updated_data["watchlist"][0]["rating"] == RATING_1 +def test_adds_movie_to_user_watchlist(): + # Arrange + movie = { + "title": MOVIE_TITLE_1, + "genre": GENRE_1, + "rating": RATING_1 + } + movie_watched = { + "title": MOVIE_TITLE_2, + "genre": GENRE_2, + "rating": RATING_2 + } + user_data = { + "watchlist": [movie_watched] + } + + # Act + updated_data = add_to_watchlist(user_data, movie) + + # Assert + assert len(updated_data["watchlist"]) == 2 + assert updated_data["watchlist"][1]["title"] == MOVIE_TITLE_1 + assert updated_data["watchlist"][1]["genre"] == GENRE_1 + assert updated_data["watchlist"][1]["rating"] == RATING_1 + @pytest.mark.skip() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange From 7baddec4af685ae4f30202e28a0d388546037c61 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 12:46:23 -0800 Subject: [PATCH 06/16] Add add_to_watchlist func --- viewing_party/party.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index f7aaef0e0..d088445f4 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -7,12 +7,20 @@ def create_movie(title, genre, rating): new_movie = {"title": title, "genre": genre, "rating": rating} return new_movie + def add_to_watched(user_data, movie): if not bool(movie): return user_data user_data["watched"].append(movie) return user_data + +def add_to_watchlist(user_data, movie): + if not bool(movie): + return user_data + user_data["watchlist"].append(movie) + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- From dd418154fa4d2a32480c922bd16c854c5b03784c Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 13:33:18 -0800 Subject: [PATCH 07/16] Updated wave 1 watch_movie tests --- tests/test_wave_01.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6ab554ac8..a2d23f94e 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -170,7 +170,6 @@ def test_adds_movie_to_user_watchlist(): assert updated_data["watchlist"][1]["genre"] == GENRE_1 assert updated_data["watchlist"][1]["rating"] == RATING_1 -@pytest.mark.skip() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -188,13 +187,10 @@ 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 @@ -212,13 +208,10 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert 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" ********** - # ******************************************************************************************* + assert updated_data["watched"][1]["title"] == movie_to_watch["title"] + assert updated_data["watched"][1]["genre"] == movie_to_watch["genre"] + assert updated_data["watched"][1]["rating"] == movie_to_watch["rating"] -@pytest.mark.skip() def test_does_nothing_if_movie_not_in_watchlist(): # Arrange movie_to_watch = HORROR_1 From 263755af240ae18e165ed4301a47154d0dda3403 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 13:33:39 -0800 Subject: [PATCH 08/16] Add watch_movie func --- viewing_party/party.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index d088445f4..92725b4cd 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -3,7 +3,7 @@ def create_movie(title, genre, rating): if not bool(title) or not bool(genre) or not bool(rating): return None - + new_movie = {"title": title, "genre": genre, "rating": rating} return new_movie @@ -21,6 +21,21 @@ 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: + add_to_watched(user_data, movie) + user_data["watchlist"].remove(movie) + return user_data + return user_data + +# movie not in watchlist +# move in watchlist move to watched +# check watchlist[title] for matches with title +# list user_data[tc] +# what if it already exists in watched_movie + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- From 71db575a2067d9a5763eb462004417bc8e12a30f Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 15:05:02 -0800 Subject: [PATCH 09/16] Add wave 2 functions --- tests/test_wave_02.py | 6 ++---- viewing_party/party.py | 30 +++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..25f0bf034 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -2,7 +2,6 @@ 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 +13,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 +25,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 +37,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 92725b4cd..a99c3dc02 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -30,17 +30,37 @@ def watch_movie(user_data, title): return user_data return user_data -# movie not in watchlist -# move in watchlist move to watched -# check watchlist[title] for matches with title -# list user_data[tc] -# what if it already exists in watched_movie +# what if it already exists in watched_movie: ASK # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + watched_len = len(user_data["watched"]) + if watched_len == 0: + return 0.0 + + rating_sum = 0 + for movie in user_data["watched"]: + rating_sum += movie["rating"] + + avg_rating = rating_sum / watched_len + return avg_rating + + +def get_most_watched_genre(user_data): + if len(user_data["watched"]) == 0: + return None + + watched_genres = {} + for movie in user_data["watched"]: + watched_genres[movie["genre"]] = watched_genres.get(movie["genre"], 0) + 1 + + popular_genre = max(watched_genres, key=watched_genres.get) + return popular_genre + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- From 8d38f5426a8f0710a7da84db746cb66921ac1ef6 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 7 Nov 2022 16:41:14 -0800 Subject: [PATCH 10/16] Add wave 3 get_unique_watched func --- tests/test_wave_03.py | 4 ++-- viewing_party/party.py | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..70325b172 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() diff --git a/viewing_party/party.py b/viewing_party/party.py index a99c3dc02..ac05d9833 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -65,7 +65,20 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # ----------------------------------------- - + +def get_unique_watched(user_data): + watched_movies_list = user_data["watched"] + friends_watched_movies_list = [] + + for friends_watched_movies in user_data["friends"]: + friends_watched_movies_list.append(friends_watched_movies["watched"]) + + friends_watched_movies_list = sum(friends_watched_movies_list, []) + return [movie for movie in watched_movies_list if movie not in friends_watched_movies_list] + + +def get_friends_unique_watched(user_data): + pass # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- From eec098245f5ce04f5c5722288e87e12dd6a9e4f7 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Thu, 10 Nov 2022 17:14:32 -0800 Subject: [PATCH 11/16] Wave 3 complete --- tests/test_wave_03.py | 14 ++++++-------- viewing_party/party.py | 25 ++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 70325b172..2c73b6499 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -9,7 +9,6 @@ def test_my_unique_movies(): # Act amandas_unique_movies = get_unique_watched(amandas_data) - # Assert assert len(amandas_unique_movies) == 2 assert FANTASY_2 in amandas_unique_movies @@ -28,7 +27,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,24 +42,23 @@ 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() amandas_data["friends"][0]["watched"].append(INTRIGUE_3) + # Act friends_unique_movies = get_friends_unique_watched(amandas_data) # Assert assert len(friends_unique_movies) == 3 + assert INTRIGUE_3 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert FANTASY_4 in friends_unique_movies - raise Exception("Test needs to be completed.") - # ************************************************************************************************* - # ****** 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/viewing_party/party.py b/viewing_party/party.py index ac05d9833..330821190 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -78,7 +78,30 @@ def get_unique_watched(user_data): def get_friends_unique_watched(user_data): - pass + watched_movies_list = user_data["watched"] + friends_watched_movies_list = [] + + for friends_watched_movies in user_data["friends"]: + friends_watched_movies_list.append(friends_watched_movies["watched"]) + + friends_watched_movies_list = sum(friends_watched_movies_list, []) + + # remove duplicate titles + friends_watched_movie_titles = {} + + for movie in friends_watched_movies_list: + friends_watched_movie_titles[movie["title"]] = friends_watched_movie_titles.get(movie["title"], 0) + 1 + + if friends_watched_movie_titles[movie["title"]] > 1: + friends_watched_movies_list.remove(movie) + friends_watched_movie_titles[movie["title"]] = friends_watched_movie_titles[movie["title"]] - 1 + + friends_unique_list = [movie for movie in friends_watched_movies_list if movie not in watched_movies_list] + return friends_unique_list + + + + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- From d2cfc8faac15fe0f9fdb989088848bddfb9f52b9 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Thu, 10 Nov 2022 17:26:55 -0800 Subject: [PATCH 12/16] Update wave3 functions --- viewing_party/party.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 330821190..e5aa22eb8 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -68,38 +68,37 @@ def get_most_watched_genre(user_data): def get_unique_watched(user_data): watched_movies_list = user_data["watched"] - friends_watched_movies_list = [] - - for friends_watched_movies in user_data["friends"]: - friends_watched_movies_list.append(friends_watched_movies["watched"]) - - friends_watched_movies_list = sum(friends_watched_movies_list, []) + friends_watched_movies_list = get_friends_watched_movies(user_data) return [movie for movie in watched_movies_list if movie not in friends_watched_movies_list] def get_friends_unique_watched(user_data): watched_movies_list = user_data["watched"] + friends_watched_movies_list = get_friends_watched_movies(user_data) + remove_movie_duplicates(friends_watched_movies_list) + + friends_unique_list = [movie for movie in friends_watched_movies_list if movie not in watched_movies_list] + return friends_unique_list + + +def get_friends_watched_movies(user_data): friends_watched_movies_list = [] for friends_watched_movies in user_data["friends"]: friends_watched_movies_list.append(friends_watched_movies["watched"]) friends_watched_movies_list = sum(friends_watched_movies_list, []) + return friends_watched_movies_list + - # remove duplicate titles +def remove_movie_duplicates(friends_watched_movies_list): friends_watched_movie_titles = {} - for movie in friends_watched_movies_list: friends_watched_movie_titles[movie["title"]] = friends_watched_movie_titles.get(movie["title"], 0) + 1 - if friends_watched_movie_titles[movie["title"]] > 1: friends_watched_movies_list.remove(movie) friends_watched_movie_titles[movie["title"]] = friends_watched_movie_titles[movie["title"]] - 1 - - friends_unique_list = [movie for movie in friends_watched_movies_list if movie not in watched_movies_list] - return friends_unique_list - - + return friends_watched_movies_list # ----------------------------------------- From c56ac14f84e1bba03df485a7d5223a2d170188b3 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Fri, 11 Nov 2022 15:46:44 -0800 Subject: [PATCH 13/16] Completed wave 4 --- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 16 ++++++++++++++++ 2 files changed, 19 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 e5aa22eb8..21d438631 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -105,7 +105,23 @@ def remove_movie_duplicates(friends_watched_movies_list): # ------------- WAVE 4 -------------------- # ----------------------------------------- + +def get_available_recs(user_data): + friends_available_recs = get_friends_unique_watched(user_data) + available_recs = [] + for movie in friends_available_recs: + if movie["host"] in user_data["subscriptions"]: + available_recs.append(movie) + return available_recs + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- + +def get_new_rec_by_genre(user_data): + pass + + +def get_rec_from_favorites(user_data): + pass From d6e1148d415c57b728d74c87d5e740641528a028 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Sat, 12 Nov 2022 22:28:35 -0800 Subject: [PATCH 14/16] Add wave5 function1 --- tests/test_wave_05.py | 15 ++++++++------- viewing_party/party.py | 12 +++++++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..bc72fc793 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 = { @@ -53,10 +53,11 @@ 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(): diff --git a/viewing_party/party.py b/viewing_party/party.py index 21d438631..16bafc2fc 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -120,7 +120,17 @@ def get_available_recs(user_data): def get_new_rec_by_genre(user_data): - pass + friends_available_recs = get_friends_unique_watched(user_data) + if len(user_data["watched"]) == 0 or len(friends_available_recs) == 0: + return [] + + popular_genre = get_most_watched_genre(user_data) + recs_by_genre = [] + for movie in friends_available_recs: + if movie["genre"] == popular_genre: + recs_by_genre.append(movie) + + return recs_by_genre def get_rec_from_favorites(user_data): From b36fc815514f2f25035a7554b637f94510033d81 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Sun, 13 Nov 2022 17:38:14 -0800 Subject: [PATCH 15/16] WIP neeed to finish last function, will finish on monday --- tests/test_wave_05.py | 6 +++--- viewing_party/party.py | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index bc72fc793..4925085de 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -59,7 +59,7 @@ def test_new_genre_rec_from_empty_friends(): # Assert assert len(recommendations) == 0 -@pytest.mark.skip() + def test_unique_rec_from_favorites(): # Arrange sonyas_data = clean_wave_5_data() @@ -73,7 +73,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 = { @@ -95,7 +95,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 16bafc2fc..a90c98094 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -134,4 +134,18 @@ def get_new_rec_by_genre(user_data): def get_rec_from_favorites(user_data): + + # if fav empty return list + if len(user_data["favorites"]) == 0: + return + + # empty watched list or favorites list, return [] + if len(user_data["watched"]) == 0: + return [] + + # empty friends list, then use entire watched list + + # other + unique_watched = get_unique_watched(user_data) + # check if movie in user_data["favorites"] pass From 32205daea5d613568f4464a5e8c4ed9c99761581 Mon Sep 17 00:00:00 2001 From: Diana Arreola Date: Mon, 14 Nov 2022 02:06:10 -0800 Subject: [PATCH 16/16] Complete wave 5 --- viewing_party/party.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index a90c98094..98bee32c8 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -30,8 +30,6 @@ def watch_movie(user_data, title): return user_data return user_data -# what if it already exists in watched_movie: ASK - # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- @@ -134,18 +132,15 @@ def get_new_rec_by_genre(user_data): def get_rec_from_favorites(user_data): - - # if fav empty return list - if len(user_data["favorites"]) == 0: - return - - # empty watched list or favorites list, return [] if len(user_data["watched"]) == 0: return [] - # empty friends list, then use entire watched list + if len(user_data["friends"]) == 0: + return user_data["watched"] - # other unique_watched = get_unique_watched(user_data) - # check if movie in user_data["favorites"] - pass + rec_from_favorites = [] + for movie in unique_watched: + if movie in user_data["favorites"]: + rec_from_favorites.append(movie) + return rec_from_favorites