[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 0da647e53fd367acbf9fc4b1288878c73e365723

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_1 has been updated
       via  0da647e53fd367acbf9fc4b1288878c73e365723 (commit)
       via  0fa743800e80f0554e90043905e55ef302094f95 (commit)
      from  d363f31c73be21566ab43f16f4a1f82eb9a3fcaa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0da647e53fd367acbf9fc4b1288878c73e365723
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Mar 5 12:21:00 2019 -0500

    LP1818153 Stamping DB upgrade - WS user activity
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 45e1c8111d..d7c897e470 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1142', :eg_version); -- csharp/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1154', :eg_version); -- berick/mmorgan
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql b/Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql
similarity index 92%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql
rename to Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql
index 69e21e6712..7e286bd044 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1154', :eg_version);
 
 INSERT INTO config.usr_activity_type 
     (id, ewhat, ehow, egroup, enabled, transient, label)

commit 0fa743800e80f0554e90043905e55ef302094f95
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Feb 28 17:20:31 2019 -0500

    LP1818153 Log user activity for websocket login/verify
    
    Adds support for logging additional user activity types:
    
     * websocket v1 login (apache2-websockets)
     * websocket v2 login (websocketd)
     * websocket v1 verify
     * websocket v2 verify
     * generic login (any ingress)
     * generic verify (any ingress)
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 7f7687d734..a3d2412de2 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -18325,3 +18325,26 @@ WHERE tag = '555'
 AND control_set = 1
 AND ahf.heading_purpose = 'related'
 AND ahf.heading_type = 'genre_form_term';
+
+INSERT INTO config.usr_activity_type 
+    (id, ewhat, ehow, egroup, enabled, transient, label)
+VALUES (
+    25, 'login', 'ws-translator-v1', 'authen', TRUE, TRUE,
+    oils_i18n_gettext(25, 'Login via Websocket V1', 'cuat', 'label')
+), (
+    26, 'login', 'ws-translator-v2', 'authen', TRUE, TRUE,
+    oils_i18n_gettext(26, 'Login via Websocket V2', 'cuat', 'label')
+), (
+    27, 'verify', 'ws-translator-v1', 'authz', TRUE, TRUE,
+    oils_i18n_gettext(27, 'Verification via Websocket v1', 'cuat', 'label')
+), (
+    28, 'verify', 'ws-translator-v2', 'authz', TRUE, TRUE,
+    oils_i18n_gettext(28, 'Verifiation via Websocket V2', 'cuat', 'label')
+), (
+    29, 'login', NULL, 'authen', TRUE, TRUE,
+    oils_i18n_gettext(29, 'Generic Login', 'cuat', 'label')
+), (
+    30, 'verify', NULL, 'authz', TRUE, TRUE,
+    oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
+);
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql
new file mode 100644
index 0000000000..69e21e6712
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql
@@ -0,0 +1,28 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.usr_activity_type 
+    (id, ewhat, ehow, egroup, enabled, transient, label)
+VALUES (
+    25, 'login', 'ws-translator-v1', 'authen', TRUE, TRUE,
+    oils_i18n_gettext(25, 'Login via Websocket V1', 'cuat', 'label')
+), (
+    26, 'login', 'ws-translator-v2', 'authen', TRUE, TRUE,
+    oils_i18n_gettext(26, 'Login via Websocket V2', 'cuat', 'label')
+), (
+    27, 'verify', 'ws-translator-v1', 'authz', TRUE, TRUE,
+    oils_i18n_gettext(27, 'Verification via Websocket v1', 'cuat', 'label')
+), (
+    28, 'verify', 'ws-translator-v2', 'authz', TRUE, TRUE,
+    oils_i18n_gettext(28, 'Verifiation via Websocket V2', 'cuat', 'label')
+), (
+    29, 'login', NULL, 'authen', TRUE, TRUE,
+    oils_i18n_gettext(29, 'Generic Login', 'cuat', 'label')
+), (
+    30, 'verify', NULL, 'authz', TRUE, TRUE,
+    oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
+);
+
+
+COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |  2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       | 23 ++++++++++++++++++
 .../upgrade/1154.data.websocket-activity-types.sql | 28 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql


hooks/post-receive
-- 
Evergreen ILS