From 54cc945b7ae11e9198b3536ef60a2bcc3650b6a0 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Thu, 15 Sep 2022 15:01:17 -0700 Subject: [PATCH 01/15] changed pass to return home --- viewing_party/party.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..cd971e002 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,7 +1,11 @@ # ------------- WAVE 1 -------------------- +from turtle import home + + def create_movie(title, genre, rating): - pass + return home + # this originally said "pass." Change to committ # ----------------------------------------- # ------------- WAVE 2 -------------------- From 82d1f18e309b77f6c8be77270d30673f41a1e678 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Wed, 21 Sep 2022 15:45:08 -0700 Subject: [PATCH 02/15] define create_movie function --- viewing_party/party.py | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index cd971e002..6534dd86e 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,11 +1,33 @@ # ------------- WAVE 1 -------------------- -from turtle import home - def create_movie(title, genre, rating): - return home - # this originally said "pass." Change to committ + title_genre_rating = {} + if title and genre and rating: + title_genre_rating.update({'title': title, 'genre': genre, 'rating': rating}) + return(title_genre_rating) + return None + +def add_to_watched(user_data, movie): + user_data["watched"].append(movie) + return user_data + + # user_data = {watched: [{movie}{moveie}]} + # add each movie to the watched key + +def add_to_watchlist(user_data, movie): + # user_data = {watchlist: [{movies}{user}]{wants}{to_watch}} + # add movie into the watchlist inside of user data + # return user_data + user_data["watchlist"].append(movie) + return(user_data) + + + + + # if truthy return a dictionary + # dictionary contains 3 key-value pairs + # return none if falsy # ----------------------------------------- # ------------- WAVE 2 -------------------- From 35bbe89f334437acb53b2db82035f22d4e22a48d Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Thu, 22 Sep 2022 22:38:12 -0700 Subject: [PATCH 03/15] Made assertions for Wave 1 tests --- viewing_party/party.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 6534dd86e..90e420a5f 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -22,6 +22,20 @@ def add_to_watchlist(user_data, movie): user_data["watchlist"].append(movie) return(user_data) +def watch_movie(user_data, title): +# user_data = {watchlist: watched:} +# if title is in watch_list then add to watched: +# return user_data +# if not in watch list: +# return user_data + + for movie in user_data["watchlist"]: + if title in movie.values(): + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + return(user_data) + + @@ -45,5 +59,4 @@ def add_to_watchlist(user_data, movie): # ----------------------------------------- # ------------- WAVE 5 -------------------- -# ----------------------------------------- - +# ----------------------------------------- \ No newline at end of file From cd130329956307584794da382f8ee9600ce8a062 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Thu, 22 Sep 2022 23:13:49 -0700 Subject: [PATCH 04/15] defined get_watched_avg_rating function --- viewing_party/party.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 90e420a5f..bc79aa0d0 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -35,6 +35,7 @@ def watch_movie(user_data, title): user_data["watched"].append(movie) return(user_data) + @@ -47,6 +48,17 @@ def watch_movie(user_data, title): # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): +# user data = {watched: [{movie2}, {movie2}]} + user_rating = [] + + for movie in user_data["watched"]: + user_rating.append(movie["rating"]) + average_rating = (sum(user_rating)) / (len(user_rating)) + # print(user_rating) + # print(average_rating) + return(average_rating) + # ----------------------------------------- # ------------- WAVE 3 -------------------- From aba741bfffdba264338573e14172297de25151c6 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Thu, 22 Sep 2022 23:47:30 -0700 Subject: [PATCH 05/15] updated get_watched_avg_rating function by adding if statement in order to return 0.0 rating if the watched list is empty --- viewing_party/party.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index bc79aa0d0..26cac3468 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -2,6 +2,9 @@ def create_movie(title, genre, rating): + # if truthy return a dictionary + # dictionary contains 3 key-value pairs + # return none if falsy title_genre_rating = {} if title and genre and rating: title_genre_rating.update({'title': title, 'genre': genre, 'rating': rating}) @@ -36,13 +39,6 @@ def watch_movie(user_data, title): return(user_data) - - - - - # if truthy return a dictionary - # dictionary contains 3 key-value pairs - # return none if falsy # ----------------------------------------- # ------------- WAVE 2 -------------------- @@ -51,13 +47,17 @@ def watch_movie(user_data, title): def get_watched_avg_rating(user_data): # user data = {watched: [{movie2}, {movie2}]} user_rating = [] - - for movie in user_data["watched"]: - user_rating.append(movie["rating"]) - average_rating = (sum(user_rating)) / (len(user_rating)) + + if len(user_data["watched"]) == 0: + average_rating = 0.0 + return average_rating + else: + for movie in user_data["watched"]: + user_rating.append(movie["rating"]) + average_rating = (sum(user_rating)) / (len(user_rating)) # print(user_rating) # print(average_rating) - return(average_rating) + return(average_rating) # ----------------------------------------- From 9bbee29e4cc8c31d4a519dc8f1a9fe9bbdc7854c Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Fri, 23 Sep 2022 00:52:43 -0700 Subject: [PATCH 06/15] defined function named ge_most_watched_genre --- viewing_party/party.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 26cac3468..94976bd7f 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -59,6 +59,24 @@ def get_watched_avg_rating(user_data): # print(average_rating) return(average_rating) +def get_most_watched_genre(user_data): + + genres_watched = {} + + for movie in user_data["watched"]: + if movie["genre"] not in genres_watched: + genres_watched[movie["genre"]] = 1 + elif movie["genre"] in genres_watched: + genres_watched[movie["genre"]] += 1 + + num_of_genres_watched = genres_watched.values() + max_num_genres_watched = max(num_of_genres_watched) + + for genre, times_watched in genres_watched.items(): + if times_watched == max_num_genres_watched: + return genre + + # ----------------------------------------- # ------------- WAVE 3 -------------------- From 03ee31c50e4c86e2cf4c358467b1b051038c46f5 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Fri, 23 Sep 2022 01:00:42 -0700 Subject: [PATCH 07/15] added an if statement to return None if the watched list is empty --- viewing_party/party.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 94976bd7f..1787e2491 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -62,6 +62,9 @@ def get_watched_avg_rating(user_data): def get_most_watched_genre(user_data): genres_watched = {} + + if not user_data["watched"]: + return None for movie in user_data["watched"]: if movie["genre"] not in genres_watched: From b96d781d08f7de52fb179e7450039e0df2812585 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Fri, 23 Sep 2022 08:46:24 -0700 Subject: [PATCH 08/15] final commit in order to push project --- tests/test_wave_01.py | 29 ++++++++++++++++++----------- tests/test_wave_02.py | 6 +++--- tests/test_wave_03.py | 2 +- viewing_party/party.py | 15 +++++++++++++++ 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..f6b2dc716 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 @@ -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 = { @@ -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 = { @@ -119,12 +119,16 @@ def test_moves_movie_from_watchlist_to_empty_watched(): assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 - raise Exception("Test needs to be completed.") + # 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 # ******************************************************************************************* # ****** 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 @@ -143,12 +147,15 @@ 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.") + + assert updated_data["watched"][1] == movie_to_watch + assert movie_to_watch in updated_data["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/tests/test_wave_02.py b/tests/test_wave_02.py index 3a588299e..7338978b4 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() @@ -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/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..1d7d3f654 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() diff --git a/viewing_party/party.py b/viewing_party/party.py index 1787e2491..3e5c1b9db 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -85,6 +85,21 @@ def get_most_watched_genre(user_data): # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + # user_data = {watched :[{"title: title"}, {"title": title}], friends: [{watched_key:[{"title:title"}{title:title}]}{watched_key:[{title:title}{title:title}]}]} + # each movie dict in watched_key has a title + + unique_movies = [] + for watched_movie in user_data["watched"]: + # friends_movies.append(watched_movie) + for movie in user_data["friends"]: + # for movie in user_data["friends"]: + if watched_movie["title"] in unique_movies: + continue + elif watched_movie["title"] not in movie["watched"]: + unique_movies.append(watched_movie["title"]) + return unique_movies + # ----------------------------------------- # ------------- WAVE 4 -------------------- From 8ac67e6b511ec07e67341f8bf02b9445c6871af2 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Fri, 14 Oct 2022 03:38:43 -0700 Subject: [PATCH 09/15] Define get_unique_watched function --- viewing_party/party.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 3e5c1b9db..1f4f27985 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -90,15 +90,20 @@ def get_unique_watched(user_data): # each movie dict in watched_key has a title unique_movies = [] - for watched_movie in user_data["watched"]: - # friends_movies.append(watched_movie) - for movie in user_data["friends"]: - # for movie in user_data["friends"]: - if watched_movie["title"] in unique_movies: - continue - elif watched_movie["title"] not in movie["watched"]: - unique_movies.append(watched_movie["title"]) - return unique_movies + movies_watched_by_friends = [] + + for friend in user_data["friends"]: + for movie_details in friend["watched"]: + movie_title = movie_details["title"] + movies_watched_by_friends.append(movie_title) + # print(movie_details["title"]) + for movie in user_data["watched"]: + movie_watched = movie["title"] + if movie_watched not in movies_watched_by_friends: + unique_movies.append(movie) + # watched_titles.append(movie["title"]) + return(unique_movies) + # ----------------------------------------- From dee698f39aaf5ec241997303ec9617d26829adc5 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Fri, 14 Oct 2022 04:02:01 -0700 Subject: [PATCH 10/15] defined get_friends_unique_watched function --- viewing_party/party.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 1f4f27985..1af3d2308 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -103,6 +103,22 @@ def get_unique_watched(user_data): unique_movies.append(movie) # watched_titles.append(movie["title"]) return(unique_movies) + +def get_friends_unique_watched(user_data): + all_movies_watched = [] + unique_movies_watched_by_friends = [] + + for movie in user_data["watched"]: + movie_watched = movie["title"] + # add all the movies watched to new list + all_movies_watched.append(movie_watched) + for friend in user_data["friends"]: + for movie_details in friend["watched"]: + movie_title = movie_details["title"] + if movie_title not in all_movies_watched: + # create list of dictionary containing movie details + unique_movies_watched_by_friends.append(movie_details) + return unique_movies_watched_by_friends From 714724e7471d47d80dbed411c99a1b0f44ce68e3 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Fri, 14 Oct 2022 04:22:21 -0700 Subject: [PATCH 11/15] add conditional statement to check if movie_details are in list to avoid duplication --- viewing_party/party.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 1af3d2308..7fe58b97c 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -115,7 +115,9 @@ def get_friends_unique_watched(user_data): for friend in user_data["friends"]: for movie_details in friend["watched"]: movie_title = movie_details["title"] - if movie_title not in all_movies_watched: + if (movie_title not in all_movies_watched and + movie_details not in unique_movies_watched_by_friends): + # check if details are unqie friends list to avoid duplicates # create list of dictionary containing movie details unique_movies_watched_by_friends.append(movie_details) return unique_movies_watched_by_friends From 18a56f11cbb5211128784a72e850f3416891664e Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Mon, 17 Oct 2022 02:23:49 -0700 Subject: [PATCH 12/15] add assertions to test in order to avoid duplicate movies in the unique movies watched by friends --- tests/test_wave_03.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 1d7d3f654..0695400be 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -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,14 @@ 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.") + + assert friends_unique_movies[-2] == HORROR_1 # ************************************************************************************************* # ****** 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 = { From 3ae983f074629684cd4900bb478b48eb5e187dd9 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Mon, 17 Oct 2022 02:24:56 -0700 Subject: [PATCH 13/15] Add assertion to check if the first item in unique movies watched by friends is FANTASY_1 movie --- tests/test_wave_03.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py index 0695400be..16079d240 100644 --- a/tests/test_wave_03.py +++ b/tests/test_wave_03.py @@ -58,6 +58,8 @@ def test_friends_unique_movies_not_duplicated(): # raise Exception("Test needs to be completed.") assert friends_unique_movies[-2] == HORROR_1 + assert friends_unique_movies[0] == FANTASY_4 + # this assert makes sures that the second to last item is not INTRIGUE_3 which would mean it was duplicated # ************************************************************************************************* # ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** # ************************************************************************************************** From fa912bc3fc3a3ec9869ff41e974f4f242bff2759 Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Mon, 17 Oct 2022 02:45:09 -0700 Subject: [PATCH 14/15] define get_available_recs functions --- viewing_party/party.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/viewing_party/party.py b/viewing_party/party.py index 7fe58b97c..547999143 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -128,6 +128,19 @@ def get_friends_unique_watched(user_data): # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data): + recommended_movies = [] + friends_watched = get_friends_unique_watched(user_data) + for movie in friends_watched: + if movie["host"] in user_data["subscriptions"]: + recommended_movies.append(movie) + return recommended_movies + + + + + + # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- \ No newline at end of file From c2f010253ababb6f30d574605ecd2dd57bdddb1e Mon Sep 17 00:00:00 2001 From: Jacqueline Hopkins <318jlh@gmail.com> Date: Mon, 17 Oct 2022 19:25:46 -0700 Subject: [PATCH 15/15] commit changes, before pushing. Updated the test waves --- play_tester.py | 12 ++++++------ tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 7 +------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/play_tester.py b/play_tester.py index 9e2aecf48..ca9614de1 100644 --- a/play_tester.py +++ b/play_tester.py @@ -9,16 +9,16 @@ pp = pprint.PrettyPrinter(indent=4) # play testing section -print("\n-----Wave 01 test data-----") -pp.pprint(HORROR_1) -pp.pprint(FANTASY_1) -pp.pprint(FANTASY_2) +# print("\n-----Wave 01 test data-----") +# pp.pprint(HORROR_1) +# pp.pprint(FANTASY_1) +# pp.pprint(FANTASY_2) # print("\n-----Wave 02 user_data-----") # pp.pprint(clean_wave_2_data()) -#print("\n-----Wave 03 user_data-----") -#pp.pprint(clean_wave_3_data()) +# print("\n-----Wave 03 user_data-----") +# pp.pprint(clean_wave_3_data()) # Wave 04 user data #print("\n-----Wave 04 user_data-----") 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 547999143..b9fbc6def 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -136,11 +136,6 @@ def get_available_recs(user_data): recommended_movies.append(movie) return recommended_movies - - - - - # ----------------------------------------- # ------------- WAVE 5 -------------------- -# ----------------------------------------- \ No newline at end of file +# -----------------------------------------