Skip to content

Commit 55f3ec9

Browse files
ajrice6713ajrice6713
authored
Merge pull request #89 from Bandwidth/DX-2559
DX-2559 update DLDA `AccountType` to `SubscriberType`
2 parents 74ff7c9 + 4193937 commit 55f3ec9

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

‎src/simpleModels/DldaOrder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DldaTnGroup {
1818

1919
protected $fields = array(
2020
"TelephoneNumbers" => array("type" => "\Iris\Phones"),
21-
"AccountType" => array("type" => "string"),
21+
"SubscriberType" => array("type" => "string"),
2222
"ListingType" => array("type" => "string"),
2323
"ListAddress" => array("type" => "string"),
2424
"ListingName" => array("type" => "\Iris\ListingName"),

‎tests/DldaTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ class DldasTest extends PHPUnit_Framework_TestCase {
1111

1212
public static function setUpBeforeClass() {
1313
$mock = new MockHandler([
14-
new Response(200, [], "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><DldaOrderResponse><DldaOrder><CustomerOrderId>5a88d16d-f8a9-45c5-a5db-137d700c6a22</CustomerOrderId><OrderCreateDate>2014-07-10T12:38:11.833Z</OrderCreateDate><AccountId>14</AccountId><CreatedByUser>jbm</CreatedByUser><OrderId>ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4</OrderId><LastModifiedDate>2014-07-10T12:38:11.833Z</LastModifiedDate><ProcessingStatus>RECEIVED</ProcessingStatus><DldaTnGroups><DldaTnGroup><TelephoneNumbers><TelephoneNumber>2053778335</TelephoneNumber><TelephoneNumber>2053865784</TelephoneNumber></TelephoneNumbers><AccountType>BUSINESS</AccountType><ListingType>LISTED</ListingType><ListingName><FirstName>Joe</FirstName><LastName>Smith</LastName></ListingName><ListAddress>true</ListAddress><Address><HouseNumber>12</HouseNumber><StreetName>ELM</StreetName><City>New York</City><StateCode>NY</StateCode><Zip>10007</Zip><Country>United States</Country><AddressType>Dlda</AddressType></Address></DldaTnGroup></DldaTnGroups></DldaOrder></DldaOrderResponse>"),
14+
new Response(200, [], "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><DldaOrderResponse><DldaOrder><CustomerOrderId>5a88d16d-f8a9-45c5-a5db-137d700c6a22</CustomerOrderId><OrderCreateDate>2014-07-10T12:38:11.833Z</OrderCreateDate><AccountId>14</AccountId><CreatedByUser>jbm</CreatedByUser><OrderId>ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4</OrderId><LastModifiedDate>2014-07-10T12:38:11.833Z</LastModifiedDate><ProcessingStatus>RECEIVED</ProcessingStatus><DldaTnGroups><DldaTnGroup><TelephoneNumbers><TelephoneNumber>2053778335</TelephoneNumber><TelephoneNumber>2053865784</TelephoneNumber></TelephoneNumbers><SubscriberType>BUSINESS</SubscriberType><ListingType>LISTED</ListingType><ListingName><FirstName>Joe</FirstName><LastName>Smith</LastName></ListingName><ListAddress>true</ListAddress><Address><HouseNumber>12</HouseNumber><StreetName>ELM</StreetName><City>New York</City><StateCode>NY</StateCode><Zip>10007</Zip><Country>United States</Country><AddressType>Dlda</AddressType></Address></DldaTnGroup></DldaTnGroups></DldaOrder></DldaOrderResponse>"),
1515
new Response(200, [], "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><ResponseSelectWrapper><ListOrderIdUserIdDate><TotalCount>3</TotalCount><OrderIdUserIdDate><accountId>14</accountId><CountOfTNs>2</CountOfTNs><userId>team_ua</userId><lastModifiedDate>2014-07-07T10:06:43.427Z</lastModifiedDate><OrderType>dlda</OrderType><OrderDate>2014-07-07T10:06:43.427Z</OrderDate><orderId>37a6447c-1a0b-4be9-ba89-3f5cb0aea142</orderId><OrderStatus>FAILED</OrderStatus></OrderIdUserIdDate><OrderIdUserIdDate><accountId>14</accountId><CountOfTNs>2</CountOfTNs><userId>team_ua</userId><lastModifiedDate>2014-07-07T10:05:56.595Z</lastModifiedDate><OrderType>dlda</OrderType><OrderDate>2014-07-07T10:05:56.595Z</OrderDate><orderId>743b0e64-3350-42e4-baa6-406dac7f4a85</orderId><OrderStatus>RECEIVED</OrderStatus></OrderIdUserIdDate><OrderIdUserIdDate><accountId>14</accountId><CountOfTNs>2</CountOfTNs><userId>team_ua</userId><lastModifiedDate>2014-07-07T09:32:17.234Z</lastModifiedDate><OrderType>dlda</OrderType><OrderDate>2014-07-07T09:32:17.234Z</OrderDate><orderId>f71eb4d2-bfef-4384-957f-45cd6321185e</orderId><OrderStatus>RECEIVED</OrderStatus></OrderIdUserIdDate></ListOrderIdUserIdDate></ResponseSelectWrapper>"),
16-
new Response(200, [], "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><DldaOrderResponse><DldaOrder><CustomerOrderId>5a88d16d-f8a9-45c5-a5db-137d700c6a22</CustomerOrderId><OrderCreateDate>2014-07-10T12:38:11.833Z</OrderCreateDate><AccountId>14</AccountId><CreatedByUser>jbm</CreatedByUser><OrderId>ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4</OrderId><LastModifiedDate>2014-07-10T12:38:11.833Z</LastModifiedDate><ProcessingStatus>RECEIVED</ProcessingStatus><DldaTnGroups><DldaTnGroup><TelephoneNumbers><TelephoneNumber>2053778335</TelephoneNumber><TelephoneNumber>2053865784</TelephoneNumber></TelephoneNumbers><AccountType>BUSINESS</AccountType><ListingType>LISTED</ListingType><ListingName><FirstName>Joe</FirstName><LastName>Smith</LastName></ListingName><ListAddress>true</ListAddress><Address><HouseNumber>12</HouseNumber><StreetName>ELM</StreetName><City>New York</City><StateCode>NY</StateCode><Zip>10007</Zip><Country>United States</Country><AddressType>Dlda</AddressType></Address></DldaTnGroup></DldaTnGroups></DldaOrder></DldaOrderResponse>"),
16+
new Response(200, [], "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?><DldaOrderResponse><DldaOrder><CustomerOrderId>5a88d16d-f8a9-45c5-a5db-137d700c6a22</CustomerOrderId><OrderCreateDate>2014-07-10T12:38:11.833Z</OrderCreateDate><AccountId>14</AccountId><CreatedByUser>jbm</CreatedByUser><OrderId>ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4</OrderId><LastModifiedDate>2014-07-10T12:38:11.833Z</LastModifiedDate><ProcessingStatus>RECEIVED</ProcessingStatus><DldaTnGroups><DldaTnGroup><TelephoneNumbers><TelephoneNumber>2053778335</TelephoneNumber><TelephoneNumber>2053865784</TelephoneNumber></TelephoneNumbers><SubscriberType>BUSINESS</SubscriberType><ListingType>LISTED</ListingType><ListingName><FirstName>Joe</FirstName><LastName>Smith</LastName></ListingName><ListAddress>true</ListAddress><Address><HouseNumber>12</HouseNumber><StreetName>ELM</StreetName><City>New York</City><StateCode>NY</StateCode><Zip>10007</Zip><Country>United States</Country><AddressType>Dlda</AddressType></Address></DldaTnGroup></DldaTnGroups></DldaOrder></DldaOrderResponse>"),
1717
new Response(200),
1818
new Response(200, [], "<?xml version=\"1.0\"?> <OrderHistoryWrapper><OrderHistory> <OrderDate>2014-09-04T16:28:11.320Z</OrderDate> <Note>The DL/DA request has been received</Note> <Author>jbm</Author><Status>RECEIVED</Status></OrderHistory> <OrderHistory><OrderDate>2014-09-04T16:28:18.742Z</OrderDate> <Note>The DL/DA request is being processed by our 3rd party supplier </Note><Author>jbm</Author><Status>PROCESSING</Status> </OrderHistory><OrderHistory><OrderDate>2014-09-05T19:00:17.968Z</OrderDate> <Note>The DL/DA request is complete for all TNs</Note> <Author>jbm</Author><Status>COMPLETE</Status></OrderHistory> </OrderHistoryWrapper>"),
1919
]);
@@ -37,7 +37,7 @@ public function testLidbsPost() {
3737
"TelephoneNumbers" => [
3838
"TelephoneNumber" => "4352154856"
3939
],
40-
"AccountType" => "RESIDENTIAL",
40+
"SubscriberType" => "RESIDENTIAL",
4141
"ListingType" => "LISTED",
4242
"ListAddress" => "true",
4343
"ListingName" => [
@@ -75,12 +75,12 @@ public function testLidbsPost() {
7575
];
7676

7777
$dlda = self::$dldas->create($order_data, false);
78-
$json = '{"CustomerOrderId":"123","DldaTnGroups":{"DldaTnGroup":[{"TelephoneNumbers":{"TelephoneNumber":"4352154856"},"AccountType":"RESIDENTIAL","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"FirstName","FirstName2":"FirstName2","LastName":"LastName","Designation":"Designation","TitleOfLineage":"TitleOfLineage","TitleOfAddress":"TitleOfAddress","TitleOfAddress2":"TitleOfAddress2","TitleOfLineageName2":"TitleOfLineageName2","TitleOfAddressName2":"TitleOfAddressName2","TitleOfAddress2Name2":"TitleOfAddress2Name2","PlaceListingAs":"PlaceListingAs"},"Address":{"City":"City","HouseNumber":"915","StreetName":"StreetName","StateCode":"StateCode","Zip":"Zip","Country":"Country","HousePrefix":"HousePrefix","HouseSuffix":"HouseSuffix","PreDirectional":"PreDirectional","StreetSuffix":"StreetSuffix","PostDirectional":"PostDirectional","AddressLine2":"AddressLine2","PlusFour":"PlusFour","AddressType":"AddressType"}}]}}';
78+
$json = '{"CustomerOrderId":"123","DldaTnGroups":{"DldaTnGroup":[{"TelephoneNumbers":{"TelephoneNumber":"4352154856"},"SubscriberType":"RESIDENTIAL","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"FirstName","FirstName2":"FirstName2","LastName":"LastName","Designation":"Designation","TitleOfLineage":"TitleOfLineage","TitleOfAddress":"TitleOfAddress","TitleOfAddress2":"TitleOfAddress2","TitleOfLineageName2":"TitleOfLineageName2","TitleOfAddressName2":"TitleOfAddressName2","TitleOfAddress2Name2":"TitleOfAddress2Name2","PlaceListingAs":"PlaceListingAs"},"Address":{"City":"City","HouseNumber":"915","StreetName":"StreetName","StateCode":"StateCode","Zip":"Zip","Country":"Country","HousePrefix":"HousePrefix","HouseSuffix":"HouseSuffix","PreDirectional":"PreDirectional","StreetSuffix":"StreetSuffix","PostDirectional":"PostDirectional","AddressLine2":"AddressLine2","PlusFour":"PlusFour","AddressType":"AddressType"}}]}}';
7979
$this->assertEquals($json, json_encode($dlda->to_array()));
8080

8181
$dlda = self::$dldas->create($order_data);
8282

83-
$json = '{"CustomerOrderId":"5a88d16d-f8a9-45c5-a5db-137d700c6a22","OrderCreateDate":"2014-07-10T12:38:11.833Z","AccountId":"14","CreatedByUser":"jbm","OrderId":"ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4","LastModifiedDate":"2014-07-10T12:38:11.833Z","ProcessingStatus":"RECEIVED","DldaTnGroups":{"DldaTnGroup":{"TelephoneNumbers":{"TelephoneNumber":["2053778335","2053865784"]},"AccountType":"BUSINESS","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"Joe","LastName":"Smith"},"Address":{"City":"New York","HouseNumber":"12","StreetName":"ELM","StateCode":"NY","Zip":"10007","Country":"United States","AddressType":"Dlda"}}}}';
83+
$json = '{"CustomerOrderId":"5a88d16d-f8a9-45c5-a5db-137d700c6a22","OrderCreateDate":"2014-07-10T12:38:11.833Z","AccountId":"14","CreatedByUser":"jbm","OrderId":"ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4","LastModifiedDate":"2014-07-10T12:38:11.833Z","ProcessingStatus":"RECEIVED","DldaTnGroups":{"DldaTnGroup":{"TelephoneNumbers":{"TelephoneNumber":["2053778335","2053865784"]},"SubscriberType":"BUSINESS","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"Joe","LastName":"Smith"},"Address":{"City":"New York","HouseNumber":"12","StreetName":"ELM","StateCode":"NY","Zip":"10007","Country":"United States","AddressType":"Dlda"}}}}';
8484
$this->assertEquals($json, json_encode($dlda->to_array()));
8585

8686
$this->assertEquals("POST", self::$container[self::$index]['request']->getMethod());
@@ -104,7 +104,7 @@ public function testDldasGet() {
104104
public function testLidbGet() {
105105
$dldas = self::$dldas->dlda("7802373f-4f52-4387-bdd1-c5b74833d6e2");
106106

107-
$json = '{"CustomerOrderId":"5a88d16d-f8a9-45c5-a5db-137d700c6a22","OrderCreateDate":"2014-07-10T12:38:11.833Z","AccountId":"14","CreatedByUser":"jbm","OrderId":"ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4","LastModifiedDate":"2014-07-10T12:38:11.833Z","ProcessingStatus":"RECEIVED","DldaTnGroups":{"DldaTnGroup":{"TelephoneNumbers":{"TelephoneNumber":["2053778335","2053865784"]},"AccountType":"BUSINESS","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"Joe","LastName":"Smith"},"Address":{"City":"New York","HouseNumber":"12","StreetName":"ELM","StateCode":"NY","Zip":"10007","Country":"United States","AddressType":"Dlda"}}}}';
107+
$json = '{"CustomerOrderId":"5a88d16d-f8a9-45c5-a5db-137d700c6a22","OrderCreateDate":"2014-07-10T12:38:11.833Z","AccountId":"14","CreatedByUser":"jbm","OrderId":"ea9e90c2-77a4-4f82-ac47-e1c5bb1311f4","LastModifiedDate":"2014-07-10T12:38:11.833Z","ProcessingStatus":"RECEIVED","DldaTnGroups":{"DldaTnGroup":{"TelephoneNumbers":{"TelephoneNumber":["2053778335","2053865784"]},"SubscriberType":"BUSINESS","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"Joe","LastName":"Smith"},"Address":{"City":"New York","HouseNumber":"12","StreetName":"ELM","StateCode":"NY","Zip":"10007","Country":"United States","AddressType":"Dlda"}}}}';
108108
$this->assertEquals($json, json_encode($dldas->to_array()));
109109

110110
$this->assertEquals("GET", self::$container[self::$index]['request']->getMethod());
@@ -122,7 +122,7 @@ public function testPut() {
122122
"TelephoneNumbers" => [
123123
"TelephoneNumber" => "4352154856"
124124
],
125-
"AccountType" => "RESIDENTIAL",
125+
"SubscriberType" => "RESIDENTIAL",
126126
"ListingType" => "LISTED",
127127
"ListAddress" => "true",
128128
"ListingName" => [
@@ -161,7 +161,7 @@ public function testPut() {
161161

162162
$dlda = self::$dldas->create($order_data, false);
163163

164-
$json = '{"CustomerOrderId":"123","OrderId":"7802373f-4f52-4387-bdd1-c5b74833d6e2","DldaTnGroups":{"DldaTnGroup":[{"TelephoneNumbers":{"TelephoneNumber":"4352154856"},"AccountType":"RESIDENTIAL","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"FirstName","FirstName2":"FirstName2","LastName":"LastName","Designation":"Designation","TitleOfLineage":"TitleOfLineage","TitleOfAddress":"TitleOfAddress","TitleOfAddress2":"TitleOfAddress2","TitleOfLineageName2":"TitleOfLineageName2","TitleOfAddressName2":"TitleOfAddressName2","TitleOfAddress2Name2":"TitleOfAddress2Name2","PlaceListingAs":"PlaceListingAs"},"Address":{"City":"City","HouseNumber":"915","StreetName":"StreetName","StateCode":"StateCode","Zip":"Zip","Country":"Country","HousePrefix":"HousePrefix","HouseSuffix":"HouseSuffix","PreDirectional":"PreDirectional","StreetSuffix":"StreetSuffix","PostDirectional":"PostDirectional","AddressLine2":"AddressLine2","PlusFour":"PlusFour","AddressType":"AddressType"}}]}}';
164+
$json = '{"CustomerOrderId":"123","OrderId":"7802373f-4f52-4387-bdd1-c5b74833d6e2","DldaTnGroups":{"DldaTnGroup":[{"TelephoneNumbers":{"TelephoneNumber":"4352154856"},"SubscriberType":"RESIDENTIAL","ListingType":"LISTED","ListAddress":"true","ListingName":{"FirstName":"FirstName","FirstName2":"FirstName2","LastName":"LastName","Designation":"Designation","TitleOfLineage":"TitleOfLineage","TitleOfAddress":"TitleOfAddress","TitleOfAddress2":"TitleOfAddress2","TitleOfLineageName2":"TitleOfLineageName2","TitleOfAddressName2":"TitleOfAddressName2","TitleOfAddress2Name2":"TitleOfAddress2Name2","PlaceListingAs":"PlaceListingAs"},"Address":{"City":"City","HouseNumber":"915","StreetName":"StreetName","StateCode":"StateCode","Zip":"Zip","Country":"Country","HousePrefix":"HousePrefix","HouseSuffix":"HouseSuffix","PreDirectional":"PreDirectional","StreetSuffix":"StreetSuffix","PostDirectional":"PostDirectional","AddressLine2":"AddressLine2","PlusFour":"PlusFour","AddressType":"AddressType"}}]}}';
165165
$this->assertEquals($json, json_encode($dlda->to_array()));
166166

167167
$dlda->update();

0 commit comments

Comments
 (0)