From a7193e3754d001dc3466d4ebf483549b0165014a Mon Sep 17 00:00:00 2001 From: Arika Agnew Date: Thu, 15 Sep 2022 16:54:58 -0400 Subject: [PATCH 1/7] updated README title --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 187cdb442..34f47aad8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Viewing Party +# Viewing Party - Arika (Snow Leopards) ## Skills Assessed From 853b2d32fe8234cad9826026d72efe369e418afc Mon Sep 17 00:00:00 2001 From: arika Date: Thu, 15 Sep 2022 17:57:34 -0400 Subject: [PATCH 2/7] test commit --- viewing_party/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..f1696d818 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,7 +1,7 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + return None # ----------------------------------------- # ------------- WAVE 2 -------------------- From c31f45d96b87fffb4fc6e91bb6e7edc310478096 Mon Sep 17 00:00:00 2001 From: arika Date: Sat, 17 Sep 2022 21:58:03 -0400 Subject: [PATCH 3/7] wave 1 complete all tests pass --- tests/test_wave_01.py | 33 ++++++++++++++++++++++----------- viewing_party/party.py | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..1cb669e27 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,18 @@ 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 +149,17 @@ 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]["title"] == MOVIE_TITLE_1 + assert updated_data["watched"][1]["genre"] == GENRE_1 + assert updated_data["watched"][1]["rating"] == RATING_1 + # ******************************************************************************************* # ****** 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 f1696d818..cf703def9 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,13 +1,44 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - return None + movie_dict = {} + movie_dict["title"] = title + movie_dict["genre"] = genre + movie_dict ["rating"] = rating + + movie_info = [title,genre,rating] + if None in movie_info: + return None + else: + return movie_dict + +def add_to_watched(user_data,movie): + user_data = {} + user_data["watched"] = [movie] + + return user_data + +def add_to_watchlist(user_data,movie): + user_data = {} + user_data["watchlist"] = [movie] + + return user_data + +def watch_movie(user_data,title): + for movie in user_data["watchlist"]: + if movie["title"] == title: + user_data["watchlist"].remove(movie) + user_data["watched"].append(movie) + return user_data + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- From 2364a05267b6e7011cb53d078d262088edefb369 Mon Sep 17 00:00:00 2001 From: arika Date: Wed, 21 Sep 2022 11:06:48 -0400 Subject: [PATCH 4/7] wave 2 and 3 complete all tests pass --- tests/test_wave_02.py | 8 +++---- tests/test_wave_03.py | 15 +++++-------- tests/test_wave_05.py | 1 + viewing_party/party.py | 51 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 14 deletions(-) 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/tests/test_wave_03.py b/tests/test_wave_03.py index 046429360..6e8b3af1f 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,10 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 + assert INTRIGUE_3 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() +# @pytest.mark.skip() def test_friends_not_unique_movies(): # Arrange amandas_data = { diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..2311cad02 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -54,6 +54,7 @@ def test_new_genre_rec_from_empty_friends(): } 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 cf703def9..907be723e 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,5 +1,8 @@ # ------------- WAVE 1 -------------------- +from tests.test_constants import USER_DATA_2 + + def create_movie(title, genre, rating): movie_dict = {} movie_dict["title"] = title @@ -37,13 +40,60 @@ def watch_movie(user_data,title): # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data): + watched_value = [] + avg = 0 + + for key in user_data["watched"]: + avg += 1 + watched_value.append(key["rating"]) + + if avg == 0: + return 0.0 + + average = sum(watched_value) / len (watched_value) + return average + +def get_most_watched_genre(user_data): + watched_genre = [] + for key in user_data["watched"]: + watched_genre.append(key["genre"]) + return max(set(watched_genre), key = watched_genre.count) # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- +def get_unique_watched(user_data): + my_movies = [] + same_movies = [] + + for movie in user_data["watched"]: + for friend in user_data["friends"]: + if movie in friend["watched"]: + same_movies.append(movie) + print(movie, same_movies) + + for movies in user_data["watched"]: + if movies not in same_movies: + my_movies.append(movies) + return my_movies +def get_friends_unique_watched(user_data): + friends_unique_watched = [] + friends_movie_list = [] + user_movie_list = user_data["watched"] + + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in friends_movie_list: + friends_movie_list.append(movie) + + for movie in friends_movie_list: + if movie not in user_movie_list: + friends_unique_watched.append(movie) + return friends_unique_watched # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- @@ -51,4 +101,3 @@ def watch_movie(user_data,title): # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- - From 72b49ea48e74cf3ce04002b9d72649616c0889e5 Mon Sep 17 00:00:00 2001 From: arika Date: Wed, 21 Sep 2022 17:21:22 -0400 Subject: [PATCH 5/7] wave 4 complete tests passed --- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 8 ++++++++ 2 files changed, 11 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 907be723e..ab689a72f 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -97,6 +97,14 @@ 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.get("subscriptions"): + recommended_movies.append(movie) + return recommended_movies # ----------------------------------------- # ------------- WAVE 5 -------------------- From d1d32630e5f3d7c96e8663091b5e997e63f069d9 Mon Sep 17 00:00:00 2001 From: arika Date: Thu, 22 Sep 2022 15:51:02 -0400 Subject: [PATCH 6/7] "edited wave 2 function did not pass test, began wave 5" --- tests/test_wave_05.py | 21 ++++++++++++++------- viewing_party/party.py | 21 ++++++++++++++++++++- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 2311cad02..dbea6682e 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,13 +53,20 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") + # Act + recommendations = get_new_rec_by_genre(sonyas_data) + + # Assert + + assert len(recommendations) == 0 + + # raise Exception("Test needs to be completed.") # ********************************************************************* # ****** 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() @@ -73,7 +80,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 = { @@ -95,7 +102,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 ab689a72f..eea8513e8 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -58,7 +58,7 @@ def get_most_watched_genre(user_data): watched_genre = [] for key in user_data["watched"]: watched_genre.append(key["genre"]) - return max(set(watched_genre), key = watched_genre.count) + return max(set(watched_genre), key = watched_genre.count) # ----------------------------------------- @@ -109,3 +109,22 @@ def get_available_recs(user_data): # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + recommended_movies= [] + my_genre = get_most_watched_genre(user_data) + friends_watched = get_friends_unique_watched(user_data) + + for movie in friends_watched: + if my_genre == movie["genre"]: + recommended_movies.append(movie) + return recommended_movies + + +def get_rec_from_favorites(user_data): + recommended_movies = [] + friends_watched = get_friends_unique_watched(user_data) + + for movie in user_data["favorites"]: + if movie not in friends_watched: + recommended_movies.append(movie) + return recommended_movies \ No newline at end of file From 4bdd5f59dd3b60c2376c55a314af09244e4cf597 Mon Sep 17 00:00:00 2001 From: arika Date: Thu, 22 Sep 2022 17:10:21 -0400 Subject: [PATCH 7/7] "wave 5 complete all tests pass" --- viewing_party/party.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/viewing_party/party.py b/viewing_party/party.py index eea8513e8..a02dc1df6 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -122,9 +122,9 @@ def get_new_rec_by_genre(user_data): def get_rec_from_favorites(user_data): recommended_movies = [] - friends_watched = get_friends_unique_watched(user_data) + friends_watched = get_unique_watched(user_data) for movie in user_data["favorites"]: - if movie not in friends_watched: + if movie in friends_watched: recommended_movies.append(movie) return recommended_movies \ No newline at end of file