diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py index 6be6994a5..877d20117 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,7 @@ 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 +31,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 +43,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,7 +55,7 @@ def test_create_no_rating_movie(): # Assert assert new_movie is None -@pytest.mark.skip() + def test_adds_movie_to_user_watched(): # Arrange movie = { @@ -79,7 +76,6 @@ 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() def test_adds_movie_to_user_watchlist(): # Arrange movie = { @@ -100,7 +96,6 @@ 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() def test_moves_movie_from_watchlist_to_empty_watched(): # Arrange janes_data = { @@ -118,13 +113,9 @@ def test_moves_movie_from_watchlist_to_empty_watched(): # Assert assert len(updated_data["watchlist"]) == 0 assert len(updated_data["watched"]) == 1 + assert type(updated_data["watched"][0]) == dict + assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 - raise Exception("Test needs to be completed.") - # ******************************************************************************************* - # ****** Add assertions here to test that the correct movie was added to "watched" ********** - # ******************************************************************************************* - -@pytest.mark.skip() def test_moves_movie_from_watchlist_to_watched(): # Arrange movie_to_watch = HORROR_1 @@ -142,13 +133,14 @@ 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.") + assert movie_to_watch not in updated_data["watchlist"] + assert movie_to_watch in updated_data["watched"] + + #raise Exception("Test needs to be completed.") # ******************************************************************************************* # ****** Add assertions here to test that the correct movie was added to "watched" ********** # ******************************************************************************************* -@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..36b504008 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..96be1c8aa 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,24 +43,29 @@ 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() + amandas_data["friends"][0]["watched"].append(INTRIGUE_3) + unique_movies = get_unique_watched(amandas_data) # Act friends_unique_movies = get_friends_unique_watched(amandas_data) # Assert assert len(friends_unique_movies) == 3 + assert FANTASY_4 in friends_unique_movies + assert HORROR_1 in friends_unique_movies + assert INTRIGUE_3 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/tests/test_wave_04.py b/tests/test_wave_04.py index 499669077..79ab18ff7 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/tests/test_wave_05.py b/tests/test_wave_05.py index 85ebb8b18..87a1d21d3 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,12 +53,16 @@ def test_new_genre_rec_from_empty_friends(): ] } - raise Exception("Test needs to be completed.") + recomendations = get_new_rec_by_genre(sonyas_data) + + assert len (recomendations) == 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() @@ -72,7 +76,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 +98,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 6d34a6b5f..e7dde9009 100644 --- a/viewing_party/party.py +++ b/viewing_party/party.py @@ -1,23 +1,174 @@ # ------------- WAVE 1 -------------------- def create_movie(title, genre, rating): - pass + if not title or not genre or not rating: + return None + + movie = dict() + movie["title"] = title + movie["genre"] = genre + movie["rating"] = rating + return movie + +def add_to_watched(user_data, movie): + if not user_data or not movie: + return user_data + + user_data["watched"].append(movie) + + return user_data + +def add_to_watchlist(user_data, movie) : + if not user_data or not movie: + return user_data + + user_data["watchlist"].append(movie) + + return user_data + +def movie_title_in_list(movies,title): + if not movies or not title: + return None + + for movie in movies: + if movie["title"] == title: + return movie + + return None + + +#Moves movie from watchlist to watched for the given user +def watch_movie(user_data,title): + if not user_data or not title: + return user_data + + movie = movie_title_in_list(user_data["watchlist"],title) + if movie: + user_data["watched"].append(movie) + user_data["watchlist"].remove(movie) + + return user_data + # ----------------------------------------- # ------------- WAVE 2 -------------------- # ----------------------------------------- +def get_watched_avg_rating(user_data) : + avg = 0 + if not user_data: + return avg + + watched = len (user_data["watched"]) + if watched == 0: + return avg + + for movie in user_data["watched"]: + avg += movie["rating"] + + return avg/watched + +def get_most_watched_genre(user_data): + fav_genre = None + max_watched = 0 + if not user_data: + return fav_genre + + genres = dict() + for movie in user_data["watched"]: + genre = movie["genre"] + if genre not in genres.keys(): + genres[genre]=1 + else: + genres[genre]+=1 + if genres[genre]>max_watched: + max_watched = genres[genre] + fav_genre = genre + return fav_genre + # ----------------------------------------- # ------------- WAVE 3 -------------------- # ----------------------------------------- - +def get_not_watched_by_friends(watched, friends): + if watched is None or friends is None: + return None + + if friends==[]: + return watched + + #created friends joined watched list + friends_watched = list() + for friend in friends: + for movie in friend["watched"]: + if movie not in friends_watched: + friends_watched.append(movie) + + user_unique = list() + for movie in watched: + if movie not in friends_watched: + user_unique.append(movie) + + return user_unique + + +def get_unique_watched(user_data): + if not user_data: + return None + + return get_not_watched_by_friends(user_data["watched"],user_data["friends"]) + + +def get_friends_unique_watched(user_data) : + if not user_data: + return None + + friends_unique = list() + + friends = user_data["friends"] + for friend in friends: + for movie in friend["watched"]: + if movie not in user_data["watched"] and movie not in friends_unique: + friends_unique.append(movie) + + return friends_unique + # ----------------------------------------- # ------------- WAVE 4 -------------------- # ----------------------------------------- +def get_available_recs(user_data) : + if not user_data: + return None + + recomendations = list() + friends_watched = get_friends_unique_watched(user_data) + + for movie in friends_watched: + if movie["host"] in user_data["subscriptions"] and movie not in recomendations: + recomendations.append(movie) + return recomendations # ----------------------------------------- # ------------- WAVE 5 -------------------- # ----------------------------------------- +def get_new_rec_by_genre(user_data): + if not user_data: + return None + + recomendations = list() + friends_watched = get_friends_unique_watched(user_data) + favorite_genre = get_most_watched_genre(user_data) + + for movie in friends_watched: + if movie["genre"] == favorite_genre and movie not in recomendations: + recomendations.append(movie) + + return recomendations + +def get_rec_from_favorites(user_data): + if not user_data: + return None + + return get_not_watched_by_friends(user_data["favorites"],user_data["friends"])