forked from AdaGold/viewing-party
-
Notifications
You must be signed in to change notification settings - Fork 81
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Kunzite - Celina B and Diana S #67
Open
celina-barron
wants to merge
21
commits into
Ada-C19:main
Choose a base branch
from
celina-barron:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
54284c9
passing first 8 tests in wave 1
celina-barron 5b99182
implementation of wave 1
d3897 e896ace
wrote waive 1 #9 and #10 testa, Diana's implementation passing all bu…
celina-barron 7fded33
All tests in wave 1 passing
celina-barron 80f06ad
created boneyard file, where good code goes to die. Moved extranious …
celina-barron d7a499f
wave 2 implementation, untested
celina-barron 33af5bc
Wave 03 implementation
d3897 529e0b1
Merge branch 'main' of https://github.com/celina-barron/viewing-party
d3897 e808eec
Wave 04 implementation
d3897 3e118ed
put tests back in waive 1, wave 2 passing 1, 2, and 5
celina-barron 5d875d0
Merge branch 'main' of https://github.com/celina-barron/viewing-party
celina-barron f0080ef
Wave 03 implementation
d3897 16f0696
got wave 2 passing
celina-barron 1adb182
Merge branch 'main' of https://github.com/celina-barron/viewing-party
celina-barron ad9e6ad
One function for wave 5
d3897 678668b
Merge branch 'main' of https://github.com/celina-barron/viewing-party
d3897 2b03f82
spacing
celina-barron b389acb
spacing
celina-barron 1abfef7
trying to fix the merge
celina-barron 8560466
fixed merge conflict
celina-barron 96160f2
last 3 tests of wave 5 passed
celina-barron File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
# ----------------------------------------- | ||
# ------------- WAVE 1 -------------------- | ||
# ----------------------------------------- | ||
|
||
# working code Celina wrote in order to figure out how to get the tests to work | ||
def remove_from_watchlist(user_data, movie): | ||
if movie in user_data["watchlist"]: | ||
user_data["watchlist"].remove(movie) | ||
return user_data | ||
|
||
def remove_from_watched(user_data, movie): | ||
if movie in user_data["watched"]: | ||
user_data["watched"].remove(movie) | ||
return user_data | ||
|
||
def watch_movie(user_data, title): | ||
# example used_data structure | ||
# user_data = { | ||
# "watchlist" : [{"title" : "Ferngully", "genre": "kids", "rating": 10}], | ||
# "watched" : [{"title" : "Avatar", "genre": "white savior", "rating": 1}, | ||
# {"title" : "The Blind Side", "genre": "white savior", "rating": 8}] | ||
# } | ||
# so as to not modify the OG user_data as per the instructions | ||
modified_user_data = user_data | ||
for movie in modified_user_data["watchlist"]: | ||
if title == movie["title"]: | ||
add_to_watched(modified_user_data, movie) | ||
remove_from_watchlist(modified_user_data, movie) | ||
return modified_user_data | ||
return user_data | ||
|
||
# A mix of the two? | ||
def watch_movie(user_data, title): | ||
modified_user_data = user_data | ||
for movie in modified_user_data["watchlist"]: | ||
if title == movie["title"]: | ||
modified_user_data["watchlist"].remove(movie) | ||
modified_user_data["watched"].append(movie) | ||
return modified_user_data | ||
return user_data | ||
|
||
|
||
# ----------------------------------------- | ||
# ------------- WAVE 2 -------------------- | ||
# ----------------------------------------- | ||
|
||
# not functioning | ||
def get_most_watched_genre(user_data): | ||
most_watched_genre_dict = {} | ||
times_watched_genre = 0 | ||
most_watched_genre = None | ||
for movie in user_data["watched"]: | ||
if movie["genre"] not in most_watched_genre_dict: | ||
most_watched_genre_dict[movie["genre"]] = 1 | ||
else: | ||
most_watched_genre_dict[movie["genre"]] += 1 | ||
for genre in most_watched_genre_dict: | ||
if most_watched_genre_dict["genre"] < times_watched_genre: | ||
continue | ||
elif most_watched_genre_dict["genre"] > times_watched_genre: | ||
most_watched_genre_dict["genre"] = times_watched_genre | ||
most_watched_genre = genre | ||
return most_watched_genre | ||
|
||
# ----------------------------------------- | ||
# ------------- WAVE 3 -------------------- | ||
# ----------------------------------------- | ||
|
||
|
||
# ----------------------------------------- | ||
# ------------- WAVE 4 -------------------- | ||
# ----------------------------------------- | ||
|
||
# ----------------------------------------- | ||
# ------------- WAVE 5 -------------------- | ||
# ----------------------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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_non_empty_user_watched(): | ||
# Arrange | ||
movie = { | ||
|
@@ -99,7 +99,7 @@ def test_adds_movie_to_non_empty_user_watched(): | |
assert movie in updated_data["watched"] | ||
assert FANTASY_2 in updated_data["watched"] | ||
|
||
@pytest.mark.skip() | ||
# @pytest.mark.skip() | ||
def test_adds_movie_to_user_watchlist(): | ||
# Arrange | ||
movie = { | ||
|
@@ -120,7 +120,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_adds_movie_to_non_empty_user_watchlist(): | ||
# Arrange | ||
movie = { | ||
|
@@ -140,7 +140,7 @@ def test_adds_movie_to_non_empty_user_watchlist(): | |
assert movie in updated_data["watchlist"] | ||
assert FANTASY_2 in updated_data["watchlist"] | ||
|
||
@pytest.mark.skip() | ||
# @pytest.mark.skip() | ||
def test_moves_movie_from_watchlist_to_empty_watched(): | ||
# Arrange | ||
janes_data = { | ||
|
@@ -159,12 +159,13 @@ 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.") | ||
# ******************************************************************************************* | ||
# ****** Add assertions here to test that the correct movie was added to "watched" ********** | ||
# ******************************************************************************************* | ||
|
||
@pytest.mark.skip() | ||
assert updated_data["watched"][0]["title"] == MOVIE_TITLE_1 | ||
|
||
# @pytest.mark.skip() | ||
def test_moves_movie_from_watchlist_to_watched(): | ||
# Arrange | ||
movie_to_watch = HORROR_1 | ||
|
@@ -183,12 +184,14 @@ 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.") | ||
# ******************************************************************************************* | ||
# ****** Add assertions here to test that the correct movie was added to "watched" ********** | ||
# ******************************************************************************************* | ||
|
||
@pytest.mark.skip() | ||
assert movie_to_watch not in updated_data["watchlist"] | ||
assert movie_to_watch in updated_data["watched"] | ||
Comment on lines
+191
to
+192
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
|
||
# @pytest.mark.skip() | ||
def test_does_nothing_if_movie_not_in_watchlist(): | ||
# Arrange | ||
movie_to_watch = HORROR_1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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() | ||
|
@@ -55,12 +55,15 @@ 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.") | ||
# ************************************************************************************************* | ||
# ****** Add assertions here to test that the correct movies are in friends_unique_movies ********** | ||
# ************************************************************************************************** | ||
assert INTRIGUE_3 in friends_unique_movies | ||
assert HORROR_1 in friends_unique_movies | ||
assert FANTASY_4 in friends_unique_movies | ||
Comment on lines
+62
to
+64
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
|
||
@pytest.mark.skip() | ||
# @pytest.mark.skip() | ||
def test_friends_not_unique_movies(): | ||
# Arrange | ||
amandas_data = { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍