From: Chris Sharp <csharp@georgialibraries.org>
Date: Thu, 2 Feb 2017 18:07:44 +0000 (-0500)
Subject: LP#1661346 - Add User Setting Type View reporter source
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b21b116c6bc84d8471e8b971cf9b404fd23e9cf3;p=evergreen%2Fpines.git

LP#1661346 - Add User Setting Type View reporter source

With our newly-implemented action_trigger.event_definitions
running, it is now desirable to have easier access to the SMS
settings selected by users. This is best accomplished with a
new view that will be linked from the actor.usr object.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 2a9a654cc4..e8f0bd77da 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3320,6 +3320,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field reporter:label="All Hold Requests" name="hold_requests" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="All Permissions" name="permissions" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="All User Settings" name="settings" oils_persist:virtual="true" reporter:datatype="link"/>
+            <field reporter:label="User Contact Settings" name="usr_contact_settings" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Standing Penalties" name="standing_penalties" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Statistical Category Entries" name="stat_cat_entries" oils_persist:virtual="true" reporter:datatype="link"/>
 			<field reporter:label="Survey Responses" name="survey_responses" oils_persist:virtual="true" reporter:datatype="link"/>
@@ -3409,6 +3410,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="fund_alloc_pcts" reltype="has_many" key="allocator" map="" class="acqfap"/>
 			<link field="reservations" reltype="has_many" key="usr" map="" class="bresv"/>
 			<link field="usr_activity" reltype="has_many" key="usr" map="" class="auact"/>
+			<link field="usr_contact_settings" reltype="has_many" key="usr_id" class="rustv"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
 			<actions>
@@ -10915,6 +10917,19 @@ SELECT  usr,
 		</permacrud>
 	</class>
 
+    <class id="rustv" controller="open-ils.reporter-store" oils_obj:fieldmapper="reporter::user_setting_type_view" oils_persist:tablename="reporter.user_setting_type_view" reporter:label="User Setting Type View">
+		<fields oils_persist:primary="usr_id">
+			<field reporter:label="User ID" name="usr_id" reporter:datatype="link"/>
+			<field reporter:label="Default Phone Number" name="default_phone" reporter:datatype="text"/>
+			<field reporter:label="Default SMS/Text Carrier" name="default_sms_carrier" reporter:datatype="text"/>
+			<field reporter:label="Default SMS/Text Number" name="default_sms_notify" reporter:datatype="text"/>
+			<field reporter:label="Default Hold Pickup Location" name="default_pickup_location" reporter:datatype="text"/>
+		</fields>
+		<links>
+			<link field="usr_id" reltype="has_a" key="id" map="" class="au"/>
+		</links>
+	</class>
+
 
 	<!-- ********************************************************************************************************************* -->
 	<!-- What follows is a set of example extensions that are useful for PINES.  Comment out or remove if you don't want them. -->
diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql
index 985ca6fb47..bce58ba482 100644
--- a/Open-ILS/src/sql/Pg/reporter-schema.sql
+++ b/Open-ILS/src/sql/Pg/reporter-schema.sql
@@ -379,5 +379,31 @@ CREATE OR REPLACE VIEW reporter.currently_running AS
    JOIN actor.card c ON c.id = u.card
   WHERE s.start_time IS NOT NULL AND s.complete_time IS NULL;
 
+CREATE OR REPLACE VIEW reporter.user_setting_type_view AS
+ SELECT  usr.id as usr_id,
+        (SELECT value
+         FROM actor.usr_setting
+         WHERE name = 'opac.default_phone'
+         AND usr = usr.id) AS default_phone,
+        (SELECT name
+         FROM config.sms_carrier
+         WHERE id::text IN (
+            SELECT value
+            FROM actor.usr_setting
+            WHERE name = 'opac.default_sms_carrier'
+            AND usr = usr.id)) AS default_sms_carrier,
+        (SELECT value
+         FROM actor.usr_setting
+         WHERE name = 'opac.default_sms_notify'
+         AND usr = usr.id) AS default_sms_notify,
+        (SELECT shortname
+         FROM actor.org_unit
+         WHERE id::text IN (
+            SELECT value
+            FROM actor.usr_setting
+            WHERE name = 'opac.default_pickup_location'
+            AND usr = usr.id)) AS default_pickup_location
+   FROM actor.usr usr;
+
 COMMIT;
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql
new file mode 100644
index 0000000000..c84662b054
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql
@@ -0,0 +1,29 @@
+BEGIN;
+
+CREATE OR REPLACE VIEW reporter.user_setting_type_view AS 
+SELECT  usr.id as usr_id,
+        (SELECT value 
+         FROM actor.usr_setting
+         WHERE name = 'opac.default_phone'
+         AND usr = usr.id) AS default_phone,
+        (SELECT name
+         FROM config.sms_carrier
+         WHERE id::text IN (
+            SELECT value
+            FROM actor.usr_setting
+            WHERE name = 'opac.default_sms_carrier'
+            AND usr = usr.id)) AS default_sms_carrier,
+        (SELECT value
+         FROM actor.usr_setting
+         WHERE name = 'opac.default_sms_notify'
+         AND usr = usr.id) AS default_sms_notify,
+        (SELECT shortname
+         FROM actor.org_unit
+         WHERE id::text IN (
+            SELECT value
+            FROM actor.usr_setting
+            WHERE name = 'opac.default_pickup_location'
+            AND usr = usr.id)) AS default_pickup_location
+FROM actor.usr usr; 
+
+COMMIT;