-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into andrew/add-button-fixes
- Loading branch information
Showing
10 changed files
with
108 additions
and
4 deletions.
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
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
32 changes: 32 additions & 0 deletions
32
src/meshapi/migrations/0009_member_additional_phone_numbers_and_more.py
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,32 @@ | ||
# Generated by Django 4.2.10 on 2024-06-01 23:49 | ||
|
||
import django_jsonform.models.fields | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
dependencies = [ | ||
("meshapi", "0008_alter_building_notes_alter_install_notes_and_more"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="member", | ||
name="additional_phone_numbers", | ||
field=django_jsonform.models.fields.ArrayField( | ||
base_field=models.CharField(), | ||
blank=True, | ||
default=list, | ||
help_text="Any additional phone numbers used by this member", | ||
null=True, | ||
size=None, | ||
), | ||
), | ||
migrations.AlterField( | ||
model_name="member", | ||
name="phone_number", | ||
field=models.CharField( | ||
blank=True, default=None, help_text="A primary contact phone number for this member", null=True | ||
), | ||
), | ||
] |
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
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 |
---|---|---|
|
@@ -26,6 +26,7 @@ def setUp(self): | |
stripe_email_address="[email protected]", | ||
additional_email_addresses=["[email protected]"], | ||
phone_number="555-555-6666", | ||
additional_phone_numbers=["123-555-8888"], | ||
) | ||
m2.save() | ||
|
||
|
@@ -105,6 +106,19 @@ def test_member_phone_search(self): | |
self.assertEqual(len(response_objs), 1) | ||
self.assertEqual(response_objs[0]["name"], "Donald Smith") | ||
|
||
def test_member_additional_phone_search(self): | ||
response = self.c.get("/api/v1/members/lookup/?phone_number=8888") | ||
code = 200 | ||
self.assertEqual( | ||
code, | ||
response.status_code, | ||
f"status code incorrect. Should be {code}, but got {response.status_code}", | ||
) | ||
|
||
response_objs = json.loads(response.content)["results"] | ||
self.assertEqual(len(response_objs), 1) | ||
self.assertEqual(response_objs[0]["name"], "Donald Smith") | ||
|
||
def test_member_combined_search(self): | ||
response = self.c.get("/api/v1/members/lookup/?phone_number=555&email_address=smith&name=don") | ||
code = 200 | ||
|
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 |
---|---|---|
|
@@ -52,6 +52,30 @@ def test_member_all_emails_field(self): | |
["[email protected]", "[email protected]", "[email protected]", "[email protected]"], | ||
) | ||
|
||
def test_member_all_phone_numbers_field(self): | ||
test_member = Member( | ||
name="Stacy Fakename", | ||
primary_email_address="[email protected]", | ||
phone_number="+1 123-555-5555", | ||
additional_phone_numbers=["+1 456-555-6666"], | ||
) | ||
test_member.save() | ||
|
||
response = self.c.get(f"/api/v1/members/{test_member.id}/") | ||
code = 200 | ||
self.assertEqual( | ||
code, | ||
response.status_code, | ||
f"status code incorrect. Should be {code}, but got {response.status_code}", | ||
) | ||
|
||
response_obj = json.loads(response.content) | ||
self.assertEqual(response_obj["name"], "Stacy Fakename") | ||
self.assertEqual(response_obj["primary_email_address"], "[email protected]") | ||
self.assertEqual(response_obj["phone_number"], "+1 123-555-5555") | ||
self.assertEqual(response_obj["additional_phone_numbers"], ["+1 456-555-6666"]) | ||
self.assertEqual(response_obj["all_phone_numbers"], ["+1 123-555-5555", "+1 456-555-6666"]) | ||
|
||
def test_broken_member(self): | ||
err_member = { | ||
"id": "Error", | ||
|
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