From 249699a2bc9eec9567047bb6f65c85cd9be2d338 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Fri, 16 Sep 2022 15:35:16 -0400 Subject: [PATCH 1/7] Pass test_create_successful_movie --- tests/test_wave_01.py | 2 +- viewing_party/party.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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..0484d6e18 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,7 +1,14 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + movie_dict = {} + if title and genre and rating: + movie_dict.update({"title": title}) + movie_dict.update({"genre": genre}) + movie_dict.update({"rating": rating}) + return movie_dict + else: + return None # ----------------------------------------- # ------------- WAVE 2 -------------------- From 1d6e2a814930d043b3fb16afd25861cc91f74169 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Tue, 20 Sep 2022 18:19:40 -0400 Subject: [PATCH 2/7] passing all wave 1 tests --- tests/test_wave_01.py | 8 ++++---- viewing_party/party.py | 22 +++++++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 2611155de..d0f198669 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -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() +# @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() +# @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() +# @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() +# @pytest.mark.skip() def test_adds_movie_to_user_watched(): # Arrange movie = { diff --git a/viewing_party/party.py b/viewing_party/party.py index 0484d6e18..5334054d5 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -8,7 +8,27 @@ def create_movie(title, genre, rating): movie_dict.update({"rating": rating}) return movie_dict else: - return None + return None + +def add_to_watched(user_data, movie): + user_data["watched"].append(movie) + return user_data + + # for data in user_data: + # data.append(movie) + # print(user_data) + # return user_data + +def add_to_watchlist(user_data, movie): + for watchlist in user_data: + watchlist.append(movie) + +def watch_movie(user_data, title): + if title in user_data["watchlist"]: + user_data["watchlist"].remove(title) + user_data["watched"].append(title) + else: + return user_data # ----------------------------------------- # ------------- WAVE 2 -------------------- From abd61bdab93d9204d6b2b4835ddc1a6d01ca0edd Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Thu, 22 Sep 2022 19:31:35 -0400 Subject: [PATCH 3/7] waves 1 and 2 tests pass --- tests/test_wave_01.py | 23 ++++++++++----- tests/test_wave_02.py | 8 +++--- viewing_party/party.py | 64 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 73 insertions(+), 22 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index d0f198669..8f650828b 100644 --- a/tests/test_wave_01.py +++ b/tests/test_wave_01.py @@ -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() +# @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() +# @pytest.mark.skip() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -118,13 +118,18 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 + + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 + - 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" ********** - # ******************************************************************************************* + # + -@pytest.mark.skip() +# @pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -142,13 +147,17 @@ def test_moves_movie_from_watchlist_to_watched(): # Assert assert len(updated_data["watchlist"]) == 1 assert len(updated_data["watched"]) == 2 + + assert updated_data["watched"][0] == FANTASY_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" ********** # ******************************************************************************************* -@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..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 5334054d5..d214eb8b5 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,4 +1,6 @@ +# ----------------------------------------- # ------------- WAVE 1 -------------------- +# ----------------------------------------- def create_movie(title, genre, rating): movie_dict = {} @@ -14,31 +16,71 @@ def add_to_watched(user_data, movie): user_data["watched"].append(movie) return user_data - # for data in user_data: - # data.append(movie) - # print(user_data) - # return user_data def add_to_watchlist(user_data, movie): - for watchlist in user_data: - watchlist.append(movie) + user_data["watchlist"].append(movie) + return user_data + def watch_movie(user_data, title): - if title in user_data["watchlist"]: - user_data["watchlist"].remove(title) - user_data["watched"].append(title) - else: - return user_data + for movie_dict in user_data["watchlist"]: + if movie_dict["title"] == title: + user_data["watched"].append(movie_dict) + user_data["watchlist"].remove(movie_dict) + return user_data + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + rating_list = [] + rating_total = 0 + + for movie in user_data["watched"]: + if len(user_data["watched"]) == 0: + movie["rating"] = 0.0 + rating_list.append(movie['rating']) + + for rating in rating_list: + rating_total += rating + + if len(rating_list) == 0: + return 0.0 + else: + final_rating = rating_total / len(rating_list) + return final_rating + +def get_most_watched_genre(user_data): + genre_dict = {} + if user_data["watched"] == []: + return None + for movie_dict in user_data["watched"]: + if movie_dict["genre"] in genre_dict: + genre_dict[movie_dict["genre"]] += 1 + else: + genre_dict[movie_dict["genre"]] = 1 + best_genre = max(genre_dict, key=genre_dict.get) + return best_genre # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + user_watched_list = [] + friends_movie_list = [] + for i in range(len(user_data["friends"])): + for movie in user_data["friends"][i]["watched"]: + title = movie.get("title") + friends_movie_list.append(title) + for i in range(len(user_data["watched"])): + for movie in user_data["watched"][i]: + title = movie.get("title") + +# print("///////////////////////////////////////") # ----------------------------------------- # ------------- WAVE 4 -------------------- From cc865457a5d3119548a3437936e99034f5cc52b3 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Thu, 22 Sep 2022 22:45:53 -0400 Subject: [PATCH 4/7] all test cases for wave 3 are passing --- tests/test_wave_03.py | 15 ++++++++------ viewing_party/party.py | 45 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..343d0c503 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() @@ -54,13 +54,16 @@ def test_friends_unique_movies_not_duplicated(): # 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.") + # 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 d214eb8b5..94010d003 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -71,17 +71,50 @@ def get_most_watched_genre(user_data): def get_unique_watched(user_data): user_watched_list = [] friends_movie_list = [] + unique_user_watched = [] for i in range(len(user_data["friends"])): for movie in user_data["friends"][i]["watched"]: - title = movie.get("title") - friends_movie_list.append(title) + friends_movie_list.append(movie) for i in range(len(user_data["watched"])): - for movie in user_data["watched"][i]: - title = movie.get("title") - -# print("///////////////////////////////////////") + movie = user_data["watched"][i] + user_watched_list.append(movie) + for movie in user_watched_list: + if movie not in friends_movie_list: + unique_user_watched.append(movie) + + return unique_user_watched + +def get_friends_unique_watched(user_data): + user_watched_list = [] + friends_movie_list = [] + friends_unique_watched = [] + result = {} + new_list = [] + for i in range(len(user_data["friends"])): + for movie in user_data["friends"][i]["watched"]: + friends_movie_list.append(movie) + + for i in range(len(user_data["watched"])): + movie = user_data["watched"][i] + user_watched_list.append(movie) + + for movie in friends_movie_list: + if movie not in user_watched_list and movie not in friends_unique_watched: + friends_unique_watched.append(movie) + + # for movie in friends_unique_watched: + # for key, value in movie.items(): + # if value not in result.values(): + # result[key] = value + # new_list.append(result) + + + return friends_unique_watched + + + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- From 5180f028079212e2de46303d8cf9ebe2d7612382 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Fri, 23 Sep 2022 12:12:30 -0400 Subject: [PATCH 5/7] wave 1, 2, and 3 complete, wasn't able to complete 4 and 5 --- viewing_party/party.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 94010d003..ba4102aab 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -103,12 +103,6 @@ def get_friends_unique_watched(user_data): for movie in friends_movie_list: if movie not in user_watched_list and movie not in friends_unique_watched: friends_unique_watched.append(movie) - - # for movie in friends_unique_watched: - # for key, value in movie.items(): - # if value not in result.values(): - # result[key] = value - # new_list.append(result) return friends_unique_watched @@ -118,6 +112,10 @@ def get_friends_unique_watched(user_data): # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + movie_recommendations = [] + for i in range(len(user_data["friends"])): + for movie in # ----------------------------------------- # ------------- WAVE 5 -------------------- From ace469b2bc470beb6b23a4e1b6abedff308feea1 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Fri, 23 Sep 2022 12:16:42 -0400 Subject: [PATCH 6/7] comments out incomplete code on wave 4 --- viewing_party/party.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index ba4102aab..3e4bdf79b 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -112,10 +112,10 @@ def get_friends_unique_watched(user_data): # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- -def get_available_recs(user_data): - movie_recommendations = [] - for i in range(len(user_data["friends"])): - for movie in +# def get_available_recs(user_data): +# movie_recommendations = [] +# for i in range(len(user_data["friends"])): +# for movie in # ----------------------------------------- # ------------- WAVE 5 -------------------- From 174f4fcef12c08c205f88edf336486fdaa505685 Mon Sep 17 00:00:00 2001 From: Marie Keefer Date: Fri, 23 Sep 2022 13:26:22 -0400 Subject: [PATCH 7/7] wave 4 tests passing --- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 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 3e4bdf79b..984ff7ff1 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -112,10 +112,14 @@ def get_friends_unique_watched(user_data): # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- -# def get_available_recs(user_data): -# movie_recommendations = [] -# for i in range(len(user_data["friends"])): -# for movie in +def get_available_recs(user_data): + friends_unique_movies = get_friends_unique_watched(user_data) + movie_recommendations = [] + for movie in friends_unique_movies: + if movie["host"] in user_data["subscriptions"]: + movie_recommendations.append(movie) + + return movie_recommendations # ----------------------------------------- # ------------- WAVE 5 --------------------