Alf & Reid - Spruce #56
Open
Conversation
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
…y local computer, to overcome bug in test_update_customer
…ctionary rather than a nested dicitonary, now passing final wave 1 customer test
… guard clause rather than a try except to determine whether customer_id is a valid type
…he rental model to remove the rental id
…, video, rental) files
…eleted old comments
…items (a pagination attribute) to the for loop
…te resolves the error message we were getting earlier
…t that we can eventually use in our docstrings
…ate a specific response when ithere is missing data in the request body
audreyandoy
reviewed
Dec 27, 2021
Comment on lines
+12
to
+23
| if "postal_code" not in request_body.keys(): | ||
| response = { | ||
| "details": "Request body must include postal_code." | ||
| } | ||
| elif "name" not in request_body.keys(): | ||
| response = { | ||
| "details": "Request body must include name." | ||
| } | ||
| elif "phone" not in request_body.keys(): | ||
| response = { | ||
| "details": "Request body must include phone." | ||
| } |
There was a problem hiding this comment.
keys are the default iterator for dictionaries so we can actually omit the keys() method and this conditional will work the same way.
Suggested change
| if "postal_code" not in request_body.keys(): | |
| response = { | |
| "details": "Request body must include postal_code." | |
| } | |
| elif "name" not in request_body.keys(): | |
| response = { | |
| "details": "Request body must include name." | |
| } | |
| elif "phone" not in request_body.keys(): | |
| response = { | |
| "details": "Request body must include phone." | |
| } | |
| if "postal_code" not in request_body: | |
| response = { | |
| "details": "Request body must include postal_code." | |
| } | |
| elif "name" not in request_body: | |
| response = { | |
| "details": "Request body must include name." | |
| } | |
| elif "phone" not in request_body: | |
| response = { | |
| "details": "Request body must include phone." | |
| } |
Comment on lines
+34
to
+46
| if customer_query == "name": | ||
| customers = Customer.query.order_by(Customer.name.asc()).paginate(page=page, per_page=num_per_page, error_out=False) | ||
| #when error out is false, page and per_page default to 1 and 20 respectively | ||
| #so we can paginate, and if no p and n parameters are passed in that's no problem because the defaults are passed in | ||
| else: | ||
| customers = Customer.query.order_by(Customer.customer_id.asc()).paginate(page=page, per_page=num_per_page, error_out=False) | ||
|
|
||
| response = [customer.to_dict() for customer in customers.items] | ||
| #because no matter what 'customers' is paginated (either with the parameters passed in or the default parameters) | ||
| #when we loop we can use pagination objects .items attribute to loop over the individual items themselves | ||
| #we use .items with no () because 'items' is an attribute of the pagination CLASS, not a method or a function | ||
|
|
||
| return jsonify(response), 200 |
| customers_bp = Blueprint("customers", __name__, url_prefix="/customers") | ||
|
|
||
| #HELPER FUNCTION | ||
| def find_specific_key_error(request_body): |
| return jsonify(response), 400 | ||
|
|
||
|
|
||
| @customers_bp.route("/<customer_id>", methods=["DELETE"]) |
| return jsonify(response), 200 | ||
|
|
||
|
|
||
| @customers_bp.route("/<customer_id>/rentals", methods=["GET"]) |
Comment on lines
+32
to
+43
| if "title" not in request_body.keys(): | ||
| response = { | ||
| "details" : "Request body must include title." | ||
| } | ||
| elif "release_date" not in request_body.keys(): | ||
| response = { | ||
| "details" : "Request body must include release_date." | ||
| } | ||
| elif "total_inventory" not in request_body.keys(): | ||
| response = { | ||
| "details" : "Request body must include total_inventory." | ||
| } |
There was a problem hiding this comment.
keys are the default iterator for dictionaries so we can actually omit the keys() method and this conditional will work the same way.
|
|
||
| return jsonify(response), 400 | ||
|
|
||
| @videos_bp.route("/<video_id>", methods=["GET"]) |
Comment on lines
+65
to
+77
| if not video: | ||
| return jsonify({"message" : f"Video {video_id} was not found"}), 404 | ||
|
|
||
| else: | ||
| db.session.delete(video) | ||
| db.session.commit() | ||
| return jsonify( | ||
| { | ||
| "id": video.video_id, #this worked but video_id didnt?? | ||
| 'details': (f'Video {video.video_id} successfully deleted') | ||
| } | ||
|
|
||
| ), 200 |
There was a problem hiding this comment.
The else clause isn't necessary here, especially if we're following the guard clause pattern. We can think of if statements as if and only if this expression is true then execute this code, otherwise move on to the rest of the function body.
Suggested change
| if not video: | |
| return jsonify({"message" : f"Video {video_id} was not found"}), 404 | |
| else: | |
| db.session.delete(video) | |
| db.session.commit() | |
| return jsonify( | |
| { | |
| "id": video.video_id, #this worked but video_id didnt?? | |
| 'details': (f'Video {video.video_id} successfully deleted') | |
| } | |
| ), 200 | |
| if not video: | |
| return jsonify({"message" : f"Video {video_id} was not found"}), 404 | |
| db.session.delete(video) | |
| db.session.commit() | |
| return jsonify( | |
| { | |
| "id": video.video_id, #this worked but video_id didnt?? | |
| 'details': (f'Video {video.video_id} successfully deleted') | |
| } | |
| ), 200 |
Comment on lines
+90
to
+97
| else: | ||
|
|
||
| video.title = request_body["title"] | ||
| video.release_date = request_body["release_date"] | ||
| video.total_inventory = request_body["total_inventory"] | ||
|
|
||
| db.session.commit() | ||
|
|
There was a problem hiding this comment.
See comment about else clauses above.
| except KeyError: | ||
| return jsonify(None), 400 | ||
|
|
||
| @videos_bp.route("/<video_id>/rentals", methods=["GET"]) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.