Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: Incorrect PhoneNumberCapabilities type #1025

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Incorrect PhoneNumberCapabilities type #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b194de5
fix: phone number capabilities type
Exotica0122 Jun 17, 2024
286141b
fix: nullable fax type
Exotica0122 Jun 17, 2024
657cb28
Merge branch 'main' into fix-phone-number-capabilities-type
Exotica0122 Jun 18, 2024
ac81456
chore: format with prettier
Exotica0122 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions spec/unit/rest/incomingPhoneNumber.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ var client;
var holodeck;

describe("IncomingPhoneNumber", function () {
const incomingPhoneNumbers = [{ capabilities: {} }];

/* Before Hooks */
beforeEach(function () {
holodeck = new Holodeck();
Expand All @@ -20,7 +22,7 @@ describe("IncomingPhoneNumber", function () {
end: 0,
first_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=50&Page=0",
incoming_phone_numbers: [{}],
incoming_phone_numbers: incomingPhoneNumbers,
next_page_uri: null,
page: 0,
page_size: 50,
Expand All @@ -38,7 +40,7 @@ describe("IncomingPhoneNumber", function () {
end: 0,
first_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=1&Page=0",
incoming_phone_numbers: [{}],
incoming_phone_numbers: incomingPhoneNumbers,
next_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=1&Page=1",
page: 0,
Expand All @@ -59,7 +61,7 @@ describe("IncomingPhoneNumber", function () {
end: 0,
first_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=1&Page=0",
incoming_phone_numbers: [{}],
incoming_phone_numbers: incomingPhoneNumbers,
next_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=1&Page=1",
page: 0,
Expand All @@ -80,7 +82,7 @@ describe("IncomingPhoneNumber", function () {
end: 0,
first_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=1&Page=0",
incoming_phone_numbers: [{}],
incoming_phone_numbers: incomingPhoneNumbers,
next_page_uri:
"/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/IncomingPhoneNumbers.json?FriendlyName=friendly_name&Beta=true&PhoneNumber=%2B19876543210&PageSize=1&Page=1",
page: 0,
Expand Down
7 changes: 7 additions & 0 deletions src/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ export type PhoneNumberCapabilities = {
fax: boolean;
};

export type PhoneNumberCapabilitiesResource = {
MMS: boolean;
SMS: boolean;
voice: boolean;
fax?: boolean;
};

export type Sid = string;

export interface ListEachOptions<TInstance> {
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/local.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -397,7 +400,7 @@ interface LocalResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class LocalInstance {
Expand All @@ -419,7 +422,12 @@ export class LocalInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/machineToMachine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -408,7 +411,7 @@ interface MachineToMachineResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class MachineToMachineInstance {
Expand All @@ -430,7 +433,12 @@ export class MachineToMachineInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/mobile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -398,7 +401,7 @@ interface MobileResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class MobileInstance {
Expand All @@ -420,7 +423,12 @@ export class MobileInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/national.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -399,7 +402,7 @@ interface NationalResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class NationalInstance {
Expand All @@ -421,7 +424,12 @@ export class NationalInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/sharedCost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -399,7 +402,7 @@ interface SharedCostResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class SharedCostInstance {
Expand All @@ -421,7 +424,12 @@ export class SharedCostInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/tollFree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -399,7 +402,7 @@ interface TollFreeResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class TollFreeInstance {
Expand All @@ -421,7 +424,12 @@ export class TollFreeInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/availablePhoneNumberCountry/voip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

/**
* Options to pass to each
Expand Down Expand Up @@ -397,7 +400,7 @@ interface VoipResource {
iso_country: string;
address_requirements: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
}

export class VoipInstance {
Expand All @@ -419,7 +422,12 @@ export class VoipInstance {
this.isoCountry = payload.iso_country;
this.addressRequirements = payload.address_requirements;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
}

/**
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/incomingPhoneNumber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ import { AssignedAddOnListInstance } from "./incomingPhoneNumber/assignedAddOn";
import { LocalListInstance } from "./incomingPhoneNumber/local";
import { MobileListInstance } from "./incomingPhoneNumber/mobile";
import { TollFreeListInstance } from "./incomingPhoneNumber/tollFree";
import { PhoneNumberCapabilities } from "../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../interfaces";

export type IncomingPhoneNumberAddressRequirement =
| "none"
Expand Down Expand Up @@ -461,7 +464,7 @@ interface IncomingPhoneNumberResource {
address_requirements: IncomingPhoneNumberAddressRequirement;
api_version: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
date_created: Date;
date_updated: Date;
friendly_name: string;
Expand Down Expand Up @@ -507,7 +510,12 @@ export class IncomingPhoneNumberInstance {
this.addressRequirements = payload.address_requirements;
this.apiVersion = payload.api_version;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
this.dateCreated = deserialize.rfc2822DateTime(payload.date_created);
this.dateUpdated = deserialize.rfc2822DateTime(payload.date_updated);
this.friendlyName = payload.friendly_name;
Expand Down
14 changes: 11 additions & 3 deletions src/rest/api/v2010/account/incomingPhoneNumber/local.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ import V2010 from "../../../V2010";
const deserialize = require("../../../../../base/deserialize");
const serialize = require("../../../../../base/serialize");
import { isValidPathParam } from "../../../../../base/utility";
import { PhoneNumberCapabilities } from "../../../../../interfaces";
import {
PhoneNumberCapabilities,
PhoneNumberCapabilitiesResource,
} from "../../../../../interfaces";

export type LocalAddressRequirement = "none" | "any" | "local" | "foreign";

Expand Down Expand Up @@ -434,7 +437,7 @@ interface LocalResource {
address_requirements: LocalAddressRequirement;
api_version: string;
beta: boolean;
capabilities: PhoneNumberCapabilities;
capabilities: PhoneNumberCapabilitiesResource;
date_created: Date;
date_updated: Date;
friendly_name: string;
Expand Down Expand Up @@ -476,7 +479,12 @@ export class LocalInstance {
this.addressRequirements = payload.address_requirements;
this.apiVersion = payload.api_version;
this.beta = payload.beta;
this.capabilities = payload.capabilities;
this.capabilities = {
voice: payload.capabilities.voice,
sms: payload.capabilities.SMS,
mms: payload.capabilities.MMS,
fax: payload.capabilities.fax ?? false,
};
this.dateCreated = deserialize.rfc2822DateTime(payload.date_created);
this.dateUpdated = deserialize.rfc2822DateTime(payload.date_updated);
this.friendlyName = payload.friendly_name;
Expand Down
Loading