From 15f120108fe69c7bd005370925ae7d5664f4acc8 Mon Sep 17 00:00:00 2001
From: Dave Horton <daveh@beachdognet.com>
Date: Fri, 6 Dec 2019 10:50:57 -0500
Subject: [PATCH] db changes: added indexes

---
 README.md           |  2 +-
 db/jambones-sql.sql |  8 ++++++
 db/jambones.sqs     | 64 +++++++++++++++++++++++++++++++--------------
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 3cd8377..97d6e5d 100644
--- a/README.md
+++ b/README.md
@@ -33,4 +33,4 @@ npm test
 ```
 
 #### Testing a deployed server
-There is a swagger endpoint at `http://<your-ip>:3000/swagger` that can be used to exercise the APIs. Bearer authentication is required, so you will need an auth token (refer to [create-admin-token.sql](db/create-admin-token.sql) to see how to generate one).
\ No newline at end of file
+There is a swagger endpoint at `http://<your-ip>:3000/swagger` that can be used to exercise the APIs. Bearer authentication is required, so you will need an auth token (refer to [create-admin-token.sql](db/create-admin-token.sql) to see how to generate one).s
\ No newline at end of file
diff --git a/db/jambones-sql.sql b/db/jambones-sql.sql
index 318935b..b26405b 100644
--- a/db/jambones-sql.sql
+++ b/db/jambones-sql.sql
@@ -180,8 +180,11 @@ CREATE TABLE IF NOT EXISTS `phone_numbers`
 PRIMARY KEY (`phone_number_sid`)
 ) ENGINE=InnoDB COMMENT='A phone number that has been assigned to an account';
 
+CREATE UNIQUE INDEX `applications_idx_name` ON `applications` (`account_sid`,`name`);
+
 CREATE INDEX `applications_application_sid_idx` ON `applications` (`application_sid`);
 CREATE INDEX `applications_name_idx` ON `applications` (`name`);
+CREATE INDEX `applications_account_sid_idx` ON `applications` (`account_sid`);
 ALTER TABLE `applications` ADD FOREIGN KEY account_sid_idxfk (`account_sid`) REFERENCES `accounts` (`account_sid`);
 
 CREATE INDEX `call_routes_call_route_sid_idx` ON `call_routes` (`call_route_sid`);
@@ -216,18 +219,23 @@ ALTER TABLE `calls` ADD FOREIGN KEY outbound_user_sid_idxfk (`outbound_user_sid`
 CREATE INDEX `service_providers_service_provider_sid_idx` ON `service_providers` (`service_provider_sid`);
 CREATE INDEX `service_providers_name_idx` ON `service_providers` (`name`);
 CREATE INDEX `api_keys_api_key_sid_idx` ON `api_keys` (`api_key_sid`);
+CREATE INDEX `api_keys_account_sid_idx` ON `api_keys` (`account_sid`);
 ALTER TABLE `api_keys` ADD FOREIGN KEY account_sid_idxfk_2 (`account_sid`) REFERENCES `accounts` (`account_sid`);
 
+CREATE INDEX `api_keys_service_provider_sid_idx` ON `api_keys` (`service_provider_sid`);
 ALTER TABLE `api_keys` ADD FOREIGN KEY service_provider_sid_idxfk (`service_provider_sid`) REFERENCES `service_providers` (`service_provider_sid`);
 
 ALTER TABLE `subscriptions` ADD FOREIGN KEY registration_sid_idxfk (`registration_sid`) REFERENCES `registrations` (`registration_sid`);
 
 CREATE INDEX `accounts_account_sid_idx` ON `accounts` (`account_sid`);
 CREATE INDEX `accounts_name_idx` ON `accounts` (`name`);
+CREATE INDEX `accounts_service_provider_sid_idx` ON `accounts` (`service_provider_sid`);
 ALTER TABLE `accounts` ADD FOREIGN KEY service_provider_sid_idxfk_1 (`service_provider_sid`) REFERENCES `service_providers` (`service_provider_sid`);
 
 CREATE INDEX `voip_carriers_voip_carrier_sid_idx` ON `voip_carriers` (`voip_carrier_sid`);
+CREATE INDEX `voip_carriers_name_idx` ON `voip_carriers` (`name`);
 CREATE INDEX `phone_numbers_phone_number_sid_idx` ON `phone_numbers` (`phone_number_sid`);
+CREATE INDEX `phone_numbers_voip_carrier_sid_idx` ON `phone_numbers` (`voip_carrier_sid`);
 ALTER TABLE `phone_numbers` ADD FOREIGN KEY voip_carrier_sid_idxfk (`voip_carrier_sid`) REFERENCES `voip_carriers` (`voip_carrier_sid`);
 
 ALTER TABLE `phone_numbers` ADD FOREIGN KEY account_sid_idxfk_3 (`account_sid`) REFERENCES `accounts` (`account_sid`);
diff --git a/db/jambones.sqs b/db/jambones.sqs
index ac5aa84..ec7ec06 100644
--- a/db/jambones.sqs
+++ b/db/jambones.sqs
@@ -48,7 +48,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[7B5CFAB8-1489-4FCC-AA0F-8F5159C2A4E6]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[14]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[13]]></labelWindowIndex>
         <objectComment><![CDATA[An active sip registration]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[09D20234-503B-42B4-B34D-BDE7FC2FFA6E]]></uid>
@@ -93,7 +93,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[4D191E4E-BAC3-4131-A06F-66CF45127D92]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[13]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[12]]></labelWindowIndex>
         <objectComment><![CDATA[A set of behaviors to be applied to parked calls]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[2FBA947F-0976-491E-B9DE-7812B44A663A]]></uid>
@@ -127,6 +127,7 @@
             <name><![CDATA[name]]></name>
             <type><![CDATA[VARCHAR(255)]]></type>
             <autoIncrement><![CDATA[0]]></autoIncrement>
+            <indexed><![CDATA[1]]></indexed>
             <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[41945C7A-F511-4902-AA12-79F3C7024A8E]]></uid>
             <unique><![CDATA[1]]></unique>
@@ -136,7 +137,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[27E702F3-73ED-43F4-8B40-3C170AA17445]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[2]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[1]]></labelWindowIndex>
         <objectComment><![CDATA[An external organization that can provide sip trunking and DIDs]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[3D3136A7-AFC0-4A70-AEC3-68577955CA2E]]></uid>
@@ -182,6 +183,7 @@
             <destinationCardinality>2</destinationCardinality>
             <referencesFieldUID><![CDATA[1342FAFA-C15C-429B-809B-C6C55F9FA5B6]]></referencesFieldUID>
             <referencesTableUID><![CDATA[985D6997-B1A7-4AB3-80F4-4D59B45480C8]]></referencesTableUID>
+            <indexed><![CDATA[1]]></indexed>
             <notNull><![CDATA[0]]></notNull>
             <uid><![CDATA[430FF789-8E76-4274-B73B-BE25A240B64E]]></uid>
             <unsigned><![CDATA[0]]></unsigned>
@@ -197,9 +199,10 @@
             <destinationCardinality>2</destinationCardinality>
             <referencesFieldUID><![CDATA[58E1702C-6A95-4B17-8C08-8A3810EA16A1]]></referencesFieldUID>
             <referencesTableUID><![CDATA[F294B51E-F867-47CA-BC1F-F70BDF8170FF]]></referencesTableUID>
+            <indexed><![CDATA[1]]></indexed>
             <uid><![CDATA[3F553F20-AA47-471E-A650-0B4CEC9DCB0A]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[12]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[11]]></labelWindowIndex>
         <objectComment><![CDATA[An authorization token that is used to access the REST api]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[3EDF89A0-FD38-4DF9-BB65-E0FCD0A678BE]]></uid>
@@ -263,7 +266,7 @@
             <uid><![CDATA[9B4208B5-9E3B-4B76-B7F7-4E5D36B99BF2]]></uid>
             <unsigned><![CDATA[0]]></unsigned>
         </SQLField>
-        <labelWindowIndex><![CDATA[11]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[10]]></labelWindowIndex>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[78584D93-2CD7-4495-9C5E-893C7B869133]]></uid>
     </SQLTable>
@@ -328,7 +331,7 @@
             <type><![CDATA[INTEGER]]></type>
             <uid><![CDATA[96823D87-D5BE-4D15-BC31-BE44485DC303]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[10]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[9]]></labelWindowIndex>
         <objectComment><![CDATA[A relationship between a call and a queue that it is waiting in]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[8FA89482-40F1-46E5-8652-03CE22395A7B]]></uid>
@@ -382,6 +385,7 @@
             <referencesFieldUID><![CDATA[58E1702C-6A95-4B17-8C08-8A3810EA16A1]]></referencesFieldUID>
             <referencesTableUID><![CDATA[F294B51E-F867-47CA-BC1F-F70BDF8170FF]]></referencesTableUID>
             <forcedUnique><![CDATA[0]]></forcedUnique>
+            <indexed><![CDATA[1]]></indexed>
             <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[4A8C5F2C-DACE-4C7E-916A-66485BE06884]]></uid>
             <unsigned><![CDATA[0]]></unsigned>
@@ -391,7 +395,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[B81FD130-FAE7-4758-A6B7-B9B1F52F68B7]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[9]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[8]]></labelWindowIndex>
         <objectComment><![CDATA[A single end-user of the platform]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[985D6997-B1A7-4AB3-80F4-4D59B45480C8]]></uid>
@@ -448,7 +452,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[318884AC-2CC4-4975-9973-606D2E9206BD]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[8]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[7]]></labelWindowIndex>
         <objectComment><![CDATA[An active sip subscription]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[997ED97A-3E4E-4CDC-8F48-9C0FE9F913B2]]></uid>
@@ -682,7 +686,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[47EBED41-CCBE-42F6-9615-78D44720ADED]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[7]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[6]]></labelWindowIndex>
         <objectComment><![CDATA[A phone call]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[A58DEB6C-A5C6-441A-8659-5BC27A53FB00]]></uid>
@@ -730,6 +734,7 @@
             <destinationCardinality>1</destinationCardinality>
             <referencesFieldUID><![CDATA[E34851EF-3C5F-4118-8425-F88EE16E38AA]]></referencesFieldUID>
             <referencesTableUID><![CDATA[3D3136A7-AFC0-4A70-AEC3-68577955CA2E]]></referencesTableUID>
+            <indexed><![CDATA[1]]></indexed>
             <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[58A047B9-C1C9-4697-9FE8-08E3BFF91660]]></uid>
         </SQLField>
@@ -763,7 +768,7 @@
             <uid><![CDATA[962CB80A-54CB-4C6A-9591-9BFC644CF80F]]></uid>
             <unsigned><![CDATA[0]]></unsigned>
         </SQLField>
-        <labelWindowIndex><![CDATA[6]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[5]]></labelWindowIndex>
         <objectComment><![CDATA[A phone number that has been assigned to an account]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[BA650DDC-AC7B-4DFE-A5E5-828C75607807]]></uid>
@@ -821,7 +826,7 @@
             <uid><![CDATA[E07F5855-50C6-4D6E-92EC-724E299B2CF5]]></uid>
             <unsigned><![CDATA[0]]></unsigned>
         </SQLField>
-        <labelWindowIndex><![CDATA[5]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[4]]></labelWindowIndex>
         <objectComment><![CDATA[A relationship between a call and a conference that it is connected to]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[C415EB08-CA27-42B5-AE94-2681B6B6DC93]]></uid>
@@ -866,7 +871,7 @@
             <type><![CDATA[VARCHAR(255)]]></type>
             <uid><![CDATA[3FB439EC-7146-4A77-8204-AC4B38BE4825]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[4]]></labelWindowIndex>
+        <labelWindowIndex><![CDATA[3]]></labelWindowIndex>
         <objectComment><![CDATA[An audio conference]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[DAED2AAE-A146-4F09-809A-CC453E2CDFE9]]></uid>
@@ -881,8 +886,8 @@
             <y>351.00</y>
         </location>
         <size>
-            <width>278.00</width>
-            <height>120.00</height>
+            <width>345.00</width>
+            <height>140.00</height>
         </size>
         <zorder>0</zorder>
         <SQLField>
@@ -913,6 +918,7 @@
             <destinationCardinality>1</destinationCardinality>
             <referencesFieldUID><![CDATA[1342FAFA-C15C-429B-809B-C6C55F9FA5B6]]></referencesFieldUID>
             <referencesTableUID><![CDATA[985D6997-B1A7-4AB3-80F4-4D59B45480C8]]></referencesTableUID>
+            <indexed><![CDATA[1]]></indexed>
             <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[8799F9EA-2C44-4C7D-8AEE-27179D09EBED]]></uid>
             <unsigned><![CDATA[0]]></unsigned>
@@ -929,7 +935,25 @@
             <notNull><![CDATA[1]]></notNull>
             <uid><![CDATA[B22DE754-1A59-45BB-9650-F0B12F07393D]]></uid>
         </SQLField>
-        <labelWindowIndex><![CDATA[3]]></labelWindowIndex>
+        <SQLIndex>
+            <name><![CDATA[applications_idx_name]]></name>
+            <fieldName><![CDATA[account_sid]]></fieldName>
+            <fieldName><![CDATA[name]]></fieldName>
+            <SQLIndexEntry>
+                <name><![CDATA[account_sid]]></name>
+                <prefixSize><![CDATA[]]></prefixSize>
+                <fieldUid><![CDATA[8799F9EA-2C44-4C7D-8AEE-27179D09EBED]]></fieldUid>
+            </SQLIndexEntry>
+            <SQLIndexEntry>
+                <name><![CDATA[name]]></name>
+                <prefixSize><![CDATA[]]></prefixSize>
+                <fieldUid><![CDATA[E0EDB7B1-B7F7-4F56-B94F-6B81BB87C514]]></fieldUid>
+            </SQLIndexEntry>
+            <indexNamePrefix><![CDATA[applications]]></indexNamePrefix>
+            <indexType><![CDATA[UNIQUE]]></indexType>
+            <uid><![CDATA[3FDDDF3B-375D-4DE4-B759-514438845F7D]]></uid>
+        </SQLIndex>
+        <labelWindowIndex><![CDATA[2]]></labelWindowIndex>
         <objectComment><![CDATA[A defined set of behaviors to be applied to phone calls within an account]]></objectComment>
         <ui.treeExpanded><![CDATA[1]]></ui.treeExpanded>
         <uid><![CDATA[E97EE4F0-7ED7-4E8C-862E-D98192D6EAE0]]></uid>
@@ -991,17 +1015,17 @@
         <overviewPanelHidden><![CDATA[0]]></overviewPanelHidden>
         <pageBoundariesVisible><![CDATA[0]]></pageBoundariesVisible>
         <PageGridVisible><![CDATA[0]]></PageGridVisible>
-        <RightSidebarWidth><![CDATA[1403.000000]]></RightSidebarWidth>
+        <RightSidebarWidth><![CDATA[1756.000000]]></RightSidebarWidth>
         <sidebarIndex><![CDATA[2]]></sidebarIndex>
         <snapToGrid><![CDATA[0]]></snapToGrid>
         <SourceSidebarWidth><![CDATA[0.000000]]></SourceSidebarWidth>
         <SQLEditorFileFormatVersion><![CDATA[4]]></SQLEditorFileFormatVersion>
         <uid><![CDATA[58C99A00-06C9-478C-A667-C63842E088F3]]></uid>
-        <windowHeight><![CDATA[1027.000000]]></windowHeight>
-        <windowLocationX><![CDATA[0.000000]]></windowLocationX>
-        <windowLocationY><![CDATA[0.000000]]></windowLocationY>
+        <windowHeight><![CDATA[1417.000000]]></windowHeight>
+        <windowLocationX><![CDATA[2985.000000]]></windowLocationX>
+        <windowLocationY><![CDATA[-0.000000]]></windowLocationY>
         <windowScrollOrigin><![CDATA[{0, 0}]]></windowScrollOrigin>
-        <windowWidth><![CDATA[1680.000000]]></windowWidth>
+        <windowWidth><![CDATA[2033.000000]]></windowWidth>
     </SQLDocumentInfo>
     <AllowsIndexRenamingOnInsert><![CDATA[1]]></AllowsIndexRenamingOnInsert>
     <defaultLabelExpanded><![CDATA[1]]></defaultLabelExpanded>