From 7cc892fabb26ca6203b5f9ce0011a77aa41b4af8 Mon Sep 17 00:00:00 2001 From: Franklyn Rodriguez Date: Thu, 15 Sep 2022 16:59:32 -0400 Subject: [PATCH 1/5] Add information to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 187cdb442..7b5020a94 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Viewing Party +# Viewing Party (Franklyn Rod) ## Skills Assessed From ed0440d20545f08d595ee115acbf8d61ba5dbc8e Mon Sep 17 00:00:00 2001 From: Franklyn Rodriguez Date: Sun, 18 Sep 2022 22:34:14 -0400 Subject: [PATCH 2/5] All tests pass in Wave 1 --- tests/test_wave_01.py | 25 +++++++++-------- tests/test_wave_02.py | 6 ++-- viewing_party/party.py | 62 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 77 insertions(+), 16 deletions(-) diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..cb1a67c1d 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 = { @@ -118,13 +118,14 @@ 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 +143,15 @@ 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"][1]["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_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..218a83d0d 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() diff --git a/viewing_party/party.py b/viewing_party/party.py index 6d34a6b5f..56d76b0a4 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,15 +1,74 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + new_dict = {} + new_dict["title"] = title + new_dict["genre"] = genre + new_dict["rating"] = rating + for key in new_dict: + if not new_dict[key]: + return None + return new_dict + + +def add_to_watched(user_data, movie): + user_data["watched"].append(movie) + return user_data + + +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: + user_data["watched"].append(movie) + i = user_data["watchlist"].index(movie) + user_data["watchlist"].pop(i) + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- + +def get_watched_avg_rating(user_data): + rating_list=[] + for movie in user_data["watched"]: + if movie["rating"]> 0: + rating_list.append(movie["rating"]) + + rating_sum=sum(rating_list) + ave_rating=rating_sum/len(rating_list) + + return ave_rating + + +# def get_most_watched_genre(user_data): +# frequent_genre={} +# for movie in user_data["watched"]: +# # if genre in frequent_genre: +# frequent_genre+= 1 +# else: +# frequent_genre+=1 +# return frequent_genre +# else: +# return None + + + + +# def get_unique_watched(user_data): + + # ----------------------------------------- # ----------------------------------------- # ------------- WAVE 3 -------------------- + + # ----------------------------------------- @@ -20,4 +79,3 @@ def create_movie(title, genre, rating): # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- - From d496e59699ccc24f2cd520eaf8262f58b38008ab Mon Sep 17 00:00:00 2001 From: Franklyn Rodriguez Date: Wed, 21 Sep 2022 12:35:00 -0400 Subject: [PATCH 3/5] Wave 3 was added --- tests/test_wave_02.py | 2 +- tests/test_wave_03.py | 17 +++--- viewing_party/party.py | 130 ++++++++++++++++++++++++++++++++++------- 3 files changed, 119 insertions(+), 30 deletions(-) diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py index 218a83d0d..198e395b3 100644 --- a/tests/test_wave_02.py +++ b/tests/test_wave_02.py @@ -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..3675c3a5f 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,12 +28,12 @@ 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() - # Act + # Act friends_unique_movies = get_friends_unique_watched(amandas_data) # Assert @@ -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,14 @@ def test_friends_unique_movies_not_duplicated(): # Assert assert len(friends_unique_movies) == 3 - - raise Exception("Test needs to be completed.") + 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() +# @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 56d76b0a4..3be0c029d 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,13 +1,20 @@ # ------------- WAVE 1 -------------------- +from tkinter.tix import InputOnly + + def create_movie(title, genre, rating): + if not title or not genre or not rating: + return None + # validate input new_dict = {} new_dict["title"] = title new_dict["genre"] = genre new_dict["rating"] = rating - for key in new_dict: - if not new_dict[key]: - return None + # if not new_dict["key"] + # for key in new_dict: + # if not new_dict[key]: + # return None return new_dict @@ -34,6 +41,9 @@ def watch_movie(user_data, title): # ------------- WAVE 2 -------------------- def get_watched_avg_rating(user_data): + if not user_data["watched"]: + return 0.0 + rating_list=[] for movie in user_data["watched"]: if movie["rating"]> 0: @@ -43,24 +53,23 @@ def get_watched_avg_rating(user_data): ave_rating=rating_sum/len(rating_list) return ave_rating + - -# def get_most_watched_genre(user_data): -# frequent_genre={} -# for movie in user_data["watched"]: -# # if genre in frequent_genre: -# frequent_genre+= 1 -# else: -# frequent_genre+=1 -# return frequent_genre -# else: -# return None - - - - -# def get_unique_watched(user_data): - +def get_most_watched_genre(user_data): + if not user_data["watched"]: + return None + frequent_genre_counter={} + for movie in user_data["watched"]: + genre = movie["genre"] + if genre in frequent_genre_counter: + frequent_genre_counter[genre]+=1 + else: + frequent_genre_counter[genre]=1 + max_genre = max(frequent_genre_counter.values()) + for key in frequent_genre_counter: + if frequent_genre_counter[key]== max_genre: + return key + # ----------------------------------------- @@ -68,14 +77,93 @@ def get_watched_avg_rating(user_data): # ----------------------------------------- # ------------- WAVE 3 -------------------- +def get_unique_watched(user_data): + # user_data= watched + # input return user_data which is a dict + # output return list of dictionaries, (movies we've seen only -# ----------------------------------------- + #=movies I saw + + # movies_i_saw=user_data["watched"] + # movies_they_saw=user_data["friends"]["watched"] + my_movies=[] + same_movies=[] + + for movie in user_data["watched"]: + for friend in user_data["friends"]:# friend is a dict with watched key referring to list of movies + if movie in friend["watched"]: + same_movies.append(movie) + 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): + friend_movies=[] + # same_movies=[] + # for friend in user_data["friends"]:# friend is a dict with watched key referring to list of movies + # for movie in user_data["watched"]: + # if movie in friend["watched"]: + # same_movies.append(movie) + # print(f"{friend}") + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in user_data["watched"] and movie not in friend_movies: + friend_movies.append(movie) + return friend_movies + + + """ + user_data= watched + input return user_data which is a dict + output return list of dictionaries, (movies we've seen only + + user_data["watched"]#=movies I saw + user_data["friends"]["watched"] + movies_i_saw=["Jaws","Titanic","Avatar"] + movies_they_saw=["Jaws","Inception"] + final_answer=[list of movies I've seen and friends haven't] + delete_movies=[this is where shared movies go] + for elem in movies_i_saw: + if elem in movies_they_saw: + delete_movies.append(elem) + for movies in movies_i_saw: + if movies not in delete_movies: + final_answer.append(movies) + return final_answer + + """ +# ----------------------------------------- +#input: dict user_data +#outpus: list of dictionaries # ----------------------------------------- # ------------- WAVE 4 -------------------- + +def get_available_recs(user_data): + rec_movie_list=[] + subscriptions_list= user_data["subscriptions"] + host_str_list= friend["watched"]["movie"] + + for friend in user_data["friends"]: + for movie in friend["watched"]: + if movie not in user_data["watched"] and movie in rec_movie_list and friend["watched"]["movie"]: + rec_movie_list.append() # ----------------------------------------- # ----------------------------------------- +#input= +#output= # ------------- WAVE 5 -------------------- +# def get_new_rec_by_genre(user_data): +# rec_movies=[] +# #genre= +# # get most frequent movie["genre"] + +# if movie not in user_data["watched"] and movie in rec_movies and genre the same as user frequent +# return rec_movies + +# def get_rec_from_favorites(user_data): + # ----------------------------------------- From 472ba1b71069c88d08889feddb9582c4f15b4bf5 Mon Sep 17 00:00:00 2001 From: Franklyn Rodriguez Date: Wed, 21 Sep 2022 17:26:41 -0400 Subject: [PATCH 4/5] Completed Wave 4 --- tests/test_wave_04.py | 6 +++--- viewing_party/party.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 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 3be0c029d..68f7e7df0 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,6 +1,6 @@ # ------------- WAVE 1 -------------------- -from tkinter.tix import InputOnly +# from tkinter.tix import InputOnly def create_movie(title, genre, rating): @@ -142,14 +142,12 @@ def get_friends_unique_watched(user_data): # ------------- WAVE 4 -------------------- def get_available_recs(user_data): + friends_watched = get_friends_unique_watched(user_data) rec_movie_list=[] - subscriptions_list= user_data["subscriptions"] - host_str_list= friend["watched"]["movie"] - - for friend in user_data["friends"]: - for movie in friend["watched"]: - if movie not in user_data["watched"] and movie in rec_movie_list and friend["watched"]["movie"]: - rec_movie_list.append() + for friend in friends_watched: + if friend["host"] in user_data.get("subscriptions"): + rec_movie_list.append(friend) + return rec_movie_list # ----------------------------------------- # ----------------------------------------- From a86be378191b5f296ba4d9e8d2dcd822cfac4948 Mon Sep 17 00:00:00 2001 From: Franklyn Rodriguez Date: Wed, 21 Sep 2022 22:24:56 -0400 Subject: [PATCH 5/5] Completed Wave 5! Yay! --- tests/test_wave_05.py | 19 ++++++++++++------- viewing_party/party.py | 35 ++++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..d4488eedb 100644 --- a/tests/test_wave_05.py +++ b/tests/test_wave_05.py @@ -1,8 +1,9 @@ +from ast import Assert import pytest 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 +18,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 +39,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 = { @@ -52,13 +53,17 @@ def test_new_genre_rec_from_empty_friends(): } ] } + #Act + rec_from_empty_friends=get_new_rec_by_genre(sonyas_data) - raise Exception("Test needs to be completed.") + # Assert + assert rec_from_empty_friends == [] + # 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() @@ -72,7 +77,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 +99,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 68f7e7df0..5829a704b 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -66,9 +66,9 @@ def get_most_watched_genre(user_data): else: frequent_genre_counter[genre]=1 max_genre = max(frequent_genre_counter.values()) - for key in frequent_genre_counter: - if frequent_genre_counter[key]== max_genre: - return key + for genre in frequent_genre_counter: + if frequent_genre_counter[genre]== max_genre: + return genre # ----------------------------------------- @@ -110,9 +110,11 @@ def get_friends_unique_watched(user_data): for movie in friend["watched"]: if movie not in user_data["watched"] and movie not in friend_movies: friend_movies.append(movie) + print(f"MOVIE{movie}") return friend_movies + """ user_data= watched input return user_data which is a dict @@ -154,14 +156,21 @@ def get_available_recs(user_data): #input= #output= # ------------- WAVE 5 -------------------- -# def get_new_rec_by_genre(user_data): -# rec_movies=[] -# #genre= -# # get most frequent movie["genre"] - -# if movie not in user_data["watched"] and movie in rec_movies and genre the same as user frequent -# return rec_movies - -# def get_rec_from_favorites(user_data): - +def get_new_rec_by_genre(user_data): + friends_movies= get_friends_unique_watched(user_data) + my_fave_genre=get_most_watched_genre(user_data) + recommendations=[] + for movie in friends_movies: + if movie.get("genre") == my_fave_genre: + recommendations.append(movie) + return recommendations + +def get_rec_from_favorites(user_data): + my_watched=get_unique_watched(user_data) + my_faves=user_data.get("favorites") + intersection=[] + for watched in my_watched: + if watched in my_faves: + intersection.append(watched) + return intersection # -----------------------------------------