Enhance profile and pet management features (and add comprehensive test cases) #174
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,10 +4,12 @@ | |
| """ | ||
|
|
||
| from afbcore.views import ( | ||
| BranchViewSet, | ||
| FoodRequestViewSet, | ||
| PetViewSet, | ||
| ProfileViewSet, | ||
| logout_view, | ||
| user_view, | ||
| ) | ||
| from django.conf import settings | ||
| from django.contrib import admin as afbcore_admin | ||
|
|
@@ -28,17 +30,19 @@ | |
| # e.g. /api/v1/requests/abcdef1234/ | ||
| router.register("requests", FoodRequestViewSet, basename="foodrequest") | ||
| router.register("profiles", ProfileViewSet, basename="profile") | ||
| router.register("branches", BranchViewSet, basename="branch") | ||
| router.register("pets", PetViewSet, basename="pet") | ||
|
|
||
| urlpatterns = [ | ||
| path("afbadmin/", afbcore_admin.site.urls, name="admin"), | ||
| path( | ||
| "api/<str:version>/register/", | ||
| user_view.RegisterUserAPIView.as_view(), | ||
| name="registration", | ||
| ), | ||
| path( | ||
| "api/<str:version>/current_user/", | ||
| user_view.CurrentUserAPIView.as_view(), | ||
| name="current_user", | ||
| ), | ||
| path("api/<str:version>/", include(router.urls)), | ||
|
|
@@ -50,7 +54,7 @@ | |
| ), | ||
| path( | ||
| "api/<str:version>/authtoken/logout/", | ||
| logout_view.LogoutView.as_view(), | ||
| name="api_token_logout", | ||
| ), | ||
| path( | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
| Profile, | ||
| User, | ||
| ) | ||
| from .views.admin.branch_admin import BranchAdmin | ||
|
|
||
|
|
||
| class UserAdmin(BaseUserAdmin): | ||
|
|
@@ -33,7 +34,7 @@ class AuthorAdmin(admin.ModelAdmin): | |
| # Register your models here. | ||
| admin.site.register(User, UserAdmin) | ||
| admin.site.register(Profile) | ||
| # admin.site.register(Branch, BranchAdmin) | ||
| admin.site.register(FoodRequest) | ||
| admin.site.register(Delivery) | ||
| admin.site.register(DeliveryRegion) | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,17 +1,47 @@ | ||
| [ | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "f1b1b1b1-1b1b-1b1b-1b1b-1b1b1b1b1b1b", | ||
| "fields": { | ||
| "location_name": "No branch", | ||
| "address_line1": "1234 56th Street", | ||
| "address_line2": null, | ||
| "city": "Calgary", | ||
| "state_or_province": "AB", | ||
| "postal_code": "T2N 1A1", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "No branch", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "7", | ||
| "spay_neuter_requirement": false, | ||
| "pets_per_household_max": 4, | ||
| "delivery_deadline_days": 14, | ||
| "delivery_type": "drop_off", | ||
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 51.0447, | ||
| "longitude": -114.0719, | ||
| "delivery_radius": 10, | ||
| "hidden": false, | ||
| "operational": true | ||
| } | ||
| }, | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "f684ab06-c155-4b30-b046-80a721879b52", | ||
| "fields": { | ||
| "location_name": "Medicine Hat", | ||
| "address_line1": "375 Kipling Street SE", | ||
| "address_line2": null, | ||
| "city": "Medicine Hat", | ||
| "state_or_province": "AB", | ||
| "postal_code": "T1A 1Y9", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "Medicine Hat", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "30", | ||
| "spay_neuter_requirement": false, | ||
|
|
@@ -21,82 +51,162 @@ | |
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 50.0417, | ||
| "longitude": -110.6766, | ||
| "delivery_radius": 20, | ||
| "hidden": true, | ||
| "operational": false | ||
| } | ||
| }, | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "5c3549e0-a728-4510-a64a-69bcd26d52d5", | ||
| "fields": { | ||
| "location_name": "Osoyoos", | ||
| "address_line1": "8702 Main Street", | ||
| "address_line2": null, | ||
| "city": "Osoyoos", | ||
| "state_or_province": "BC", | ||
| "postal_code": "V0H 1V0", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "Osoyoos", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "14", | ||
| "spay_neuter_requirement": false, | ||
| "pets_per_household_max": 4, | ||
| "delivery_deadline_days": 14, | ||
| "delivery_type": "drop_off", | ||
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 49.0323, | ||
| "longitude": -119.4692, | ||
| "delivery_radius": 15, | ||
| "hidden": false, | ||
| "operational": true | ||
| } | ||
| }, | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "383e8f22-b671-4b94-90e0-df864828ab05", | ||
| "fields": { | ||
| "location_name": "Winnipeg NW", | ||
| "address_line1": "1910 Pembina Hwy", | ||
| "address_line2": null, | ||
| "city": "Winnipeg", | ||
| "state_or_province": "MB", | ||
| "postal_code": "R3T 4S5", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "Winnipeg Northwest", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "7", | ||
| "spay_neuter_requirement": false, | ||
| "pets_per_household_max": 4, | ||
| "delivery_deadline_days": 14, | ||
| "delivery_type": "drop_off", | ||
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 49.9530, | ||
| "longitude": -97.2110, | ||
| "delivery_radius": 10, | ||
| "hidden": true, | ||
| "operational": false | ||
| } | ||
| }, | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "8f786370-f10b-11ee-934b-0fdb3c7dc37f", | ||
| "fields": { | ||
| "location_name": "Winnipeg NE", | ||
| "address_line1": "400 North Town Rd", | ||
| "address_line2": null, | ||
| "city": "Winnipeg", | ||
| "state_or_province": "MB", | ||
| "postal_code": "R2V 3C4", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "Winnipeg Northeast", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "7", | ||
| "spay_neuter_requirement": false, | ||
| "pets_per_household_max": 4, | ||
| "delivery_deadline_days": 14, | ||
| "delivery_type": "drop_off", | ||
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 49.9530, | ||
| "longitude": -97.0660, | ||
| "delivery_radius": 10, | ||
| "hidden": true, | ||
| "operational": false | ||
| } | ||
| }, | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "b5f7e8d2-f10b-11ee-934b-0fdb3c7dc37f", | ||
| "fields": { | ||
| "location_name": "Winnipeg SW", | ||
| "address_line1": "1225 St Mary's Rd", | ||
| "address_line2": null, | ||
| "city": "Winnipeg", | ||
| "state_or_province": "MB", | ||
| "postal_code": "R2M 5E5", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "Winnipeg Southwest", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "7", | ||
| "spay_neuter_requirement": false, | ||
| "pets_per_household_max": 4, | ||
| "delivery_deadline_days": 14, | ||
| "delivery_type": "drop_off", | ||
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 49.8370, | ||
| "longitude": -97.2110, | ||
| "delivery_radius": 10, | ||
| "hidden": true, | ||
| "operational": false | ||
| } | ||
| }, | ||
| { | ||
| "model": "afbcore.branch", | ||
| "pk": "d1a9f634-f10b-11ee-934b-0fdb3c7dc37f", | ||
| "fields": { | ||
| "location_name": "Winnipeg SE", | ||
| "address_line1": "1555 Regent Ave W", | ||
| "address_line2": null, | ||
| "city": "Winnipeg", | ||
| "state_or_province": "MB", | ||
| "postal_code": "R2C 4J2", | ||
| "country": "Canada", | ||
| "ext_id": null, | ||
| "display_name": "Winnipeg Southeast", | ||
| "pickup_locations": null, | ||
| "frequency_of_requests": "7", | ||
| "spay_neuter_requirement": false, | ||
| "pets_per_household_max": 4, | ||
| "delivery_deadline_days": 14, | ||
| "delivery_type": "drop_off", | ||
| "delivery_pickup_details": " ", | ||
| "blurb": " ", | ||
| "blurb_image": "", | ||
| "delivery_regions": [], | ||
| "latitude": 49.8370, | ||
| "longitude": -97.0660, | ||
| "delivery_radius": 10, | ||
| "hidden": true, | ||
| "operational": false | ||
| } | ||
| } | ||
| ] | ||
Oops, something went wrong.
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.
Suggestion: For the
TOKEN_EXPIRED_AFTER_WEEKSsetting, consider documenting the reason for changing the token expiration from 2 weeks to 1 week. This helps maintainers understand the security considerations or business requirements driving this change. [enhancement, importance: 7]