admin/dog_training
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: Founding Partner login with autocreation of User, User Role Link, Company, User Company Link as necessary and autologin with new user - for approved Founding Partners only, otherwise redirected to login page.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-08-21 18:37:31 +01:00
parent 07543994bf
commit 12f5fc994f
29 changed files with 1843 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

655
static/MySQL/00000_combined.sql
View File

@@ -1,31 +1,24 @@
USE demo;
DROP PROCEDURE IF EXISTS p_dog_save_new_founding_partner;
DROP PROCEDURE IF EXISTS demo.p_dog_save_company;
DELIMITER //
CREATE PROCEDURE p_dog_save_new_founding_partner (
IN a_comment VARCHAR(500)
, IN a_guid BINARY(36)
, IN a_id_user_auth0 VARCHAR(256)
, IN a_email_user VARCHAR(256)
, IN a_debug BIT
CREATE PROCEDURE demo.p_dog_save_company (
IN a_comment VARCHAR(500),
IN a_guid BINARY(36),
IN a_id_user INT,
IN a_debug BIT
)
BEGIN
DECLARE v_can_admin BIT;
DECLARE v_can_create BIT;
DECLARE v_code_type_error_bad_data VARCHAR(100);
DECLARE v_id_access_level_edit INT;
DECLARE v_id_access_level_view INT;
DECLARE v_id_change_set INT;
DECLARE v_id_permission_product INT;
DECLARE v_id_permission_user_edit INT;
DECLARE v_id_role_manager INT;
DECLARE v_is_super_user BIT;
DECLARE v_id_permission_company_edit INT;
DECLARE v_id_type_error_bad_data INT;
DECLARE v_can_edit_user BIT;
DECLARE v_priority_access_level_admin INT;
DECLARE v_priority_access_level_none INT;
DECLARE v_priority_access_level_user INT;
DECLARE v_time_start TIMESTAMP(6);
DECLARE exit handler for SQLEXCEPTION
@@ -39,178 +32,560 @@ BEGIN
ROLLBACK;
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT
id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT
, code VARCHAR(250) NOT NULL
, code VARCHAR(250)
, msg TEXT NOT NULL
);
INSERT INTO tmp_Msg_Error (
id_type
, code
id_type
, code
, msg
)
SELECT
MET.id_type
MET.id_type
, @errno
, @text
FROM demo.CORE_Msg_Error_Type MET
WHERE MET.code = 'MYSQL_ERROR'
;
SELECT *
FROM tmp_Msg_Error;
SELECT
t_ERROR.id_error
, t_ERROR.id_type
, t_ERROR.code
, ERROR_TYPE.name
, ERROR_TYPE.description
, ERROR_TYPE.is_breaking_error
, ERROR_TYPE.background_colour
, ERROR_TYPE.text_colour
, t_ERROR.msg
FROM tmp_Msg_Error t_ERROR
INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
;
DROP TABLE IF EXISTS tmp_Msg_Error;
END;
SET SESSION group_concat_max_len=15000;
SET v_time_start := CURRENT_TIMESTAMP(6);
SET v_code_type_error_bad_data := 'BAD_DATA';
SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM demo.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
SET v_id_permission_company_edit := (SELECT PERMISSION.id_permission FROM demo.DOG_Permission PERMISSION WHERE PERMISSION.code = 'COMPANY_EDIT' LIMIT 1);
SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM demo.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
SET v_id_permission_user_edit := (SELECT GROUP_CONCAT(PERMISSION.id_permission SEPARATOR ',') FROM demo.DOG_Permission PERMISSION WHERE PERMISSION.code = 'USER_CREATE' LIMIT 1);
SET v_priority_access_level_admin := (SELECT ACCESS_LEVEL.priority FROM demo.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'ADMIN' LIMIT 1);
SET v_priority_access_level_none := (SELECT ACCESS_LEVEL.priority FROM demo.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'NONE' LIMIT 1);
SET v_id_role_manager := (SELECT ROLES.id_role FROM demo.DOG_Role ROLES WHERE ROLES.code = 'COMPANY_MANAGER' LIMIT 1);
SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM demo.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
CALL demo.p_core_validate_guid ( a_guid );
DROP TABLE IF EXISTS tmp_Msg_Error;
DROP TABLE IF EXISTS tmp_User_Save_User;
DROP TABLE IF EXISTS tmp_Company_Copy;
DROP TABLE IF EXISTS tmp_Company;
CREATE TABLE tmp_User_Save_User (
id_user INT NOT NULL
, id_role INT
, id_user_auth0 VARCHAR(250)
, firstname VARCHAR(250)
, surname VARCHAR(250)
, email VARCHAR(254)
, is_email_verified BIT DEFAULT 0
, is_super_user BIT DEFAULT 0
, active BIT DEFAULT 1
, name_error VARCHAR(1000)
CREATE TEMPORARY TABLE tmp_Company (
id_temp INT
, id_company INT
, name VARCHAR(1000)
, website TEXT
, active BIT
, is_new BIT
, name_error VARCHAR(250)
);
CREATE TABLE tmp_Msg_Error (
display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
id_type INT NOT NULL,
code VARCHAR(250) NOT NULL,
msg TEXT NOT NULL
CREATE TEMPORARY TABLE tmp_Company_Copy (
id_temp INT
, id_company INT
, name VARCHAR(1000)
, website TEXT
, active BIT
, is_new BIT
, name_error VARCHAR(250)
);
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT
, code VARCHAR(250)
, msg TEXT NOT NULL
);
IF NOT EXISTS (SELECT * FROM demo.PH_Apply_Founding_Partner_Form AFPF WHERE AFPF.email = a_email_user) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
MET.id_type
, MET.code
, 'Founding Partner not found.'
FROM demo.CORE_Msg_Error_Type MET
WHERE MET.id_type = v_id_type_error_bad_data
;
-- Get data from Temp table
INSERT INTO tmp_Company (
id_temp
, id_company
, name
, website
, active
, is_new
)
SELECT
COMPANY_T.id_temp
, COALESCE(COMPANY.id_company, COMPANY_T.id_company) AS id_company
, COALESCE(
COMPANY_T.name
, COMPANY.name
) AS name
, COALESCE(
COMPANY_T.website
, COMPANY.website
) AS website
, COALESCE(COMPANY_T.active, 1) AS active
, CASE WHEN IFNULL(COMPANY_T.id_company, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM demo.DOG_Company_Temp COMPANY_T
LEFT JOIN demo.DOG_Company COMPANY
ON COMPANY_T.id_company = COMPANY.id_company
OR (
COMPANY_T.website = COMPANY.website
AND COMPANY_T.name = COMPANY.name
)
WHERE COMPANY_T.guid = a_guid
;
IF a_debug = 1 THEN
SELECT 'Company_Temp records';
SELECT * FROM tmp_Company;
SELECT COUNT(*) FROM tmp_Company;
END IF;
-- Get data from Temp table
INSERT INTO tmp_User_Save_User (
id_user
, id_user_auth0
, id_role
, email
, firstname
, surname
-- Error names
UPDATE tmp_Company t_COMPANY
SET t_COMPANY.name_error = COALESCE(t_COMPANY.website, t_COMPANY.name, t_COMPANY.id_company, '(No Company)')
;
IF a_debug = 1 THEN
SELECT 'After set name_error';
SELECT * FROM tmp_Company;
SELECT COUNT(*) FROM tmp_Company;
END IF;
-- Validation
-- Missing mandatory fields
-- website
IF EXISTS ( SELECT * FROM tmp_Company t_COMPANY WHERE t_COMPANY.website IS NULL ) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('The following Company(s) do not have a valid Website: ', GROUP_CONCAT(t_COMPANY.name_error SEPARATOR ', ')) AS msg
FROM tmp_Company t_COMPANY
WHERE t_COMPANY.website IS NULL
;
END IF;
-- name
IF EXISTS ( SELECT * FROM tmp_Company t_COMPANY WHERE t_COMPANY.name IS NULL ) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('The following Company(s) do not have a valid Name: ', GROUP_CONCAT(t_COMPANY.name_error SEPARATOR ', ')) AS msg
FROM tmp_Company t_COMPANY
WHERE t_COMPANY.name IS NULL
;
END IF;
-- Duplicates
INSERT INTO tmp_Company_Copy (
id_temp
, id_company
, website
, name
, active
, is_new
, name_error
)
VALUES (
-1 -- AS id_user
, a_id_user_auth0
, v_id_role_manager
, a_email_user
, (SELECT LEFT(AFPF.name_contact, LOCATE(' ', AFPF.name_contact) - 1) FROM demo.PH_Apply_Founding_Partner_Form AFPF WHERE AFPF.email = a_email_user) -- AS firstname
, (SELECT SUBSTRING(AFPF.name_contact, LOCATE(' ', AFPF.name_contact) + 1) FROM demo.PH_Apply_Founding_Partner_Form AFPF WHERE AFPF.email = a_email_user) -- AS surname
, COALESCE(a_email_user, a_id_user_auth0) -- AS name_error
);
)
SELECT
t_COMPANY.id_temp
, t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.active
, t_COMPANY.is_new
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
;
IF a_debug = 1 THEN
SELECT COUNT(*) AS Count_Temp_Company FROM tmp_Company;
SELECT COUNT(*) AS Count_Temp_Company_Copy FROM tmp_Company_Copy;
WITH
Combined_Company AS (
SELECT
COMPANY.id_company
, COMPANY.website
, COMPANY.name
, COALESCE(t_COMPANY_COPY.website, t_COMPANY_COPY.name, t_COMPANY_COPY.id_company, '(No Company)') AS name_error
FROM demo.DOG_Company COMPANY
LEFT JOIN tmp_Company_Copy t_COMPANY_COPY
ON COMPANY.website = t_COMPANY_COPY.website
OR COMPANY.name = t_COMPANY_COPY.name
WHERE t_COMPANY_COPY.is_new = 1
UNION
SELECT
t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
)
, Duplicate_Company_Row_Numbers AS (
SELECT
COMBINED_COMPANY.id_company
, COMBINED_COMPANY.website
, COMBINED_COMPANY.name
, COMBINED_COMPANY.name_error
, ROW_NUMBER() OVER (PARTITION BY COMBINED_COMPANY.website ORDER BY COMBINED_COMPANY.name_error ASC) AS index_company_as_duplicate
FROM Combined_Company COMBINED_COMPANY
)
SELECT *
FROM Duplicate_Company_Row_Numbers;
END IF;
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN
START TRANSACTION;
INSERT INTO demo.DOG_User (
id_user_auth0
, firstname
, surname
, email
, is_email_verified
, is_super_user
, active
IF EXISTS (
WITH
Combined_Company AS (
SELECT
COMPANY.id_company
, COMPANY.website
, COMPANY.name
, COALESCE(t_COMPANY_COPY.website, t_COMPANY_COPY.name, t_COMPANY_COPY.id_company, '(No Company)') AS name_error
FROM demo.DOG_Company COMPANY
LEFT JOIN tmp_Company_Copy t_COMPANY_COPY
ON COMPANY.website = t_COMPANY_COPY.website
OR COMPANY.name = t_COMPANY_COPY.name
WHERE t_COMPANY_COPY.is_new = 1
UNION
SELECT
t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
)
SELECT
t_USER.id_user_auth0
, t_USER.firstname
, t_USER.surname
, t_USER.email
, t_USER.is_email_verified
, t_USER.is_super_user
, t_USER.active
FROM tmp_User_Save_User t_USER
;
, Duplicate_Company_Row_Numbers AS (
SELECT
COMBINED_COMPANY.id_company
, COMBINED_COMPANY.website
, COMBINED_COMPANY.name
, COMBINED_COMPANY.name_error
, ROW_NUMBER() OVER (PARTITION BY COMBINED_COMPANY.website ORDER BY COMBINED_COMPANY.name_error ASC) AS index_company_as_duplicate
FROM Combined_Company COMBINED_COMPANY
)
SELECT *
FROM Duplicate_Company_Row_Numbers DUPLICATE_COMPANY
WHERE DUPLICATE_COMPANY.index_company_as_duplicate > 1
GROUP BY DUPLICATE_COMPANY.website
) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
WITH
Combined_Company AS (
SELECT
COMPANY.id_company
, COMPANY.website
, COMPANY.name
, COALESCE(t_COMPANY_COPY.website, t_COMPANY_COPY.name, t_COMPANY_COPY.id_company, '(No Company)') AS name_error
FROM demo.DOG_Company COMPANY
LEFT JOIN tmp_Company_Copy t_COMPANY_COPY
ON COMPANY.website = t_COMPANY_COPY.website
OR COMPANY.name = t_COMPANY_COPY.name
WHERE t_COMPANY_COPY.is_new = 1
UNION
SELECT
t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
)
, Duplicate_Company_Row_Numbers AS (
SELECT
COMBINED_COMPANY.id_company
, COMBINED_COMPANY.website
, COMBINED_COMPANY.name
, COMBINED_COMPANY.name_error
, ROW_NUMBER() OVER (PARTITION BY COMBINED_COMPANY.website ORDER BY COMBINED_COMPANY.name_error ASC) AS index_company_as_duplicate
FROM Combined_Company COMBINED_COMPANY
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('Attempt to create duplicate or overwrite existing Command Categories on: ', GROUP_CONCAT(DUPLICATE_COMPANY.name_error SEPARATOR ', ')) AS msg
FROM Duplicate_Company_Row_Numbers DUPLICATE_COMPANY
WHERE DUPLICATE_COMPANY.index_company_as_duplicate > 1
GROUP BY DUPLICATE_COMPANY.website
;
END IF;
-- Permissions
-- Can Create
CALL demo.p_dog_calc_user_access(
a_guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_id_user -- ids_user
, '' -- a_auth0_ids_user
, '' -- a_names_user
, '' -- a_emails_user
, 1 -- a_require_all_id_search_filters_met
, 1 -- a_require_any_id_search_filters_met
, 0 -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_company_edit -- ids_permission
, v_id_access_level_edit -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT
IFNULL(CU_T.has_access, 0)
INTO
v_can_create
FROM demo.DOG_Calc_User_Access_Temp CU_T
WHERE CU_T.GUID = a_guid
LIMIT 1
;
CALL demo.p_dog_clear_calc_user_access(
a_guid
, 0 -- a_debug
);
IF v_can_create = 0 THEN
DELETE t_ME
FROM tmp_Msg_Error t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
;
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to edit Commands.'
)
;
END IF;
UPDATE tmp_User_Save_User t_USER
INNER JOIN demo.DOG_User USER ON t_USER.id_user_auth0 = USER.id_user_auth0
SET t_USER.id_user = USER.id_user
;
INSERT INTO demo.DOG_User_Role_Link (
id_role
, id_user
, active
, id_user_created_by
, created_on
IF EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
IF a_debug = 1 THEN
SELECT * from tmp_Company;
END IF;
DELETE FROM tmp_Company;
END IF;
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
START TRANSACTION;
INSERT INTO demo.DOG_Dog_Change_Set (
comment
, id_user_updated_last_by
, updated_last_on
)
SELECT
t_USER.id_role
, t_USER.id_user
, 1 -- active
, t_USER.id_user AS created_by
, v_time_start AS created_on
FROM tmp_User_Save_User t_USER
;
VALUES (
a_comment
, a_id_user
, v_time_start
)
;
SET v_id_change_set := LAST_INSERT_ID();
UPDATE demo.DOG_Company COMPANY
INNER JOIN tmp_Company t_COMPANY
ON COMPANY.id_company = t_COMPANY.id_company
AND t_COMPANY.is_new = 0
SET
COMPANY.website = t_COMPANY.website
, COMPANY.name = t_COMPANY.name
, COMPANY.active = t_COMPANY.active
, COMPANY.id_change_set = v_id_change_set
;
IF EXISTS (
SELECT *
FROM tmp_Company t_COMPANY
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
LIMIT 1
) THEN
INSERT INTO demo.DOG_Company (
id_temp
, website
, name
, active
, id_user_created_by
, created_on
)
SELECT
t_COMPANY.id_temp AS id_temp
, t_COMPANY.website AS website
, t_COMPANY.name AS name
, t_COMPANY.active AS active
, a_id_user AS created_by
, v_time_start AS created_on
FROM tmp_Company t_COMPANY
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
;
UPDATE tmp_Company t_COMPANY
INNER JOIN demo.DOG_Company COMPANY ON t_COMPANY.id_temp = COMPANY.id_temp
SET t_COMPANY.id_company = COMPANY.id_company
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
;
INSERT INTO demo.DOG_Company_User_Link (
id_company
, id_user
, id_access_level
, active
, id_user_created_by
, created_on
)
SELECT
t_COMPANY.id_company
, a_id_user
, v_id_access_level_view
, 1 -- active
, a_id_user AS created_by
, v_time_start AS created_on
FROM tmp_Company t_COMPANY
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
;
END IF;
COMMIT;
END IF;
# Errors
SELECT *
FROM tmp_Msg_Error t_ME
INNER JOIN demo.CORE_Msg_Error_Type MET ON t_ME.id_type = MET.id_type
START TRANSACTION;
DELETE FROM demo.DOG_Company_Temp
WHERE GUID = a_guid
;
COMMIT;
-- Errors
SELECT
t_ERROR.id_error
, t_ERROR.id_type
, t_ERROR.code
, ERROR_TYPE.name
, ERROR_TYPE.description
, ERROR_TYPE.is_breaking_error
, ERROR_TYPE.background_colour
, ERROR_TYPE.text_colour
, t_ERROR.msg
FROM tmp_Msg_Error t_ERROR
INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
;
IF a_debug = 1 THEN
SELECT * from tmp_User_Save_User;
SELECT * FROM tmp_Company;
END IF;
DROP TABLE IF EXISTS tmp_Msg_Error;
DROP TABLE IF EXISTS tmp_User_Save_User;
DROP TEMPORARY TABLE tmp_Company_Copy;
DROP TEMPORARY TABLE tmp_Company;
DROP TEMPORARY TABLE tmp_Msg_Error;
IF a_debug = 1 THEN
CALL demo.p_debug_timing_reporting ( v_time_start );
CALL demo.p_core_debug_timing_reporting ( v_time_start );
END IF;
END //
DELIMITER ;
SELECT *
FROM demo.PH_Apply_Founding_Partner_Form;
SELECT *
FROM demo.DOG_User;
/*
CALL demo.p_dog_save_new_founding_partner (
'Test' -- a_comment
, 'lipsandchipsanddipslipsandchipsanddi' -- a_guid
, 'nipples' -- id_user-auth0
, 'edwardmanic.ms@gmail.com' -- email -- 'teddy@demoltd.co.uk'
, 0 -- debug
'ripplesipplenippletippledipplekipple'
DELETE FROM demo.DOG_Company_Audit WHERE id_company > 740;
DELETE FROM demo.DOG_Company WHERE id_company > 740;
* /
delete
from demo.DOG_Company_Temp
;
select
*
-- COUNT(*)
-- delete
from demo.DOG_Company_Temp
;
select COUNT(*)
from demo.DOG_Company_Temp
;
select
*
-- COUNT(*)
-- delete
from demo.DOG_Company
;
select COUNT(*)
from demo.DOG_Company
;
INSERT INTO demo.DOG_Company_Temp (
id_company
, website
, name
, active
, guid
)
VALUES (
-1 -- id_company
, 'ACTIVITIES' -- website
, 'A Sport Is Fun' -- name
, 1 -- active
, 'ripplesipplenippletippledipplekipple'
);
SELECT *
FROM demo.DOG_User;
CALL demo.p_dog_save_company (
'nipples'
, 'ripplesipplenippletippledipplekipple'
, 1
, 1
);
select
*
-- COUNT(*)
-- delete
from demo.DOG_Company_Temp
;
select COUNT(*)
from demo.DOG_Company_Temp
;
select
*
-- COUNT(*)
-- delete
from demo.DOG_Company
;
select COUNT(*)
from demo.DOG_Company
;
*/

4
static/MySQL/10505a_tbl_DOG_Company.sql
View File

@@ -10,8 +10,8 @@ WHERE
CREATE TABLE IF NOT EXISTS fetchmetrics.DOG_Company (
id_company INT NOT NULL AUTO_INCREMENT PRIMARY KEY
, name VARCHAR(250) NOT NULL
, website VARCHAR(1000)
, name VARCHAR(1000) NOT NULL
, website TEXT
, active BIT NOT NULL DEFAULT 1
, created_on DATETIME
, id_user_created_by INT

5
static/MySQL/10505c_tbl_DOG_Company_Temp.sql
View File

@@ -17,7 +17,6 @@ CREATE TABLE IF NOT EXISTS fetchmetrics.DOG_Company_Temp (
, website VARCHAR(1000)
, active BIT
, guid BINARY(36)
, does_meet_id_filters BIT NOT NULL
, does_meet_non_id_filters BIT NOT NULL
, does_meet_id_filters BIT
, does_meet_non_id_filters BIT
);

1
static/MySQL/11620_tbl_PH_Apply_Founding_Partner_Form.sql
View File

@@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS fetchmetrics.PH_Apply_Founding_Partner_Form (
, id_commitment_frequency INT NOT NULL
-- , most_valuable_features TEXT NOT NULL
, notes TEXT
, is_approved BIT NOT NULL DEFAULT 0
, active BIT NOT NULL DEFAULT 1
, created_on DATETIME
, id_user_created_by INT

591
static/MySQL/70506_p_dog_save_company.sql Normal file
View File

@@ -0,0 +1,591 @@
USE fetchmetrics;
DROP PROCEDURE IF EXISTS fetchmetrics.p_dog_save_company;
DELIMITER //
CREATE PROCEDURE fetchmetrics.p_dog_save_company (
IN a_comment VARCHAR(500),
IN a_guid BINARY(36),
IN a_id_user INT,
IN a_debug BIT
)
BEGIN
DECLARE v_can_admin BIT;
DECLARE v_can_create BIT;
DECLARE v_code_type_error_bad_data VARCHAR(100);
DECLARE v_id_access_level_edit INT;
DECLARE v_id_access_level_view INT;
DECLARE v_id_change_set INT;
DECLARE v_id_permission_company_edit INT;
DECLARE v_id_type_error_bad_data INT;
DECLARE v_time_start TIMESTAMP(6);
DECLARE exit handler for SQLEXCEPTION
BEGIN
GET DIAGNOSTICS CONDITION 1
@sqlstate = RETURNED_SQLSTATE
, @errno = MYSQL_ERRNO
, @text = MESSAGE_TEXT
;
ROLLBACK;
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT
, code VARCHAR(250)
, msg TEXT NOT NULL
);
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
MET.id_type
, @errno
, @text
FROM fetchmetrics.CORE_Msg_Error_Type MET
WHERE MET.code = 'MYSQL_ERROR'
;
SELECT
t_ERROR.id_error
, t_ERROR.id_type
, t_ERROR.code
, ERROR_TYPE.name
, ERROR_TYPE.description
, ERROR_TYPE.is_breaking_error
, ERROR_TYPE.background_colour
, ERROR_TYPE.text_colour
, t_ERROR.msg
FROM tmp_Msg_Error t_ERROR
INNER JOIN fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
;
DROP TABLE IF EXISTS tmp_Msg_Error;
END;
SET SESSION group_concat_max_len=15000;
SET v_time_start := CURRENT_TIMESTAMP(6);
SET v_code_type_error_bad_data := 'BAD_DATA';
SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
SET v_id_permission_company_edit := (SELECT PERMISSION.id_permission FROM fetchmetrics.DOG_Permission PERMISSION WHERE PERMISSION.code = 'COMPANY_EDIT' LIMIT 1);
SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM fetchmetrics.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
SET v_id_access_level_view := (SELECT ACCESS_LEVEL.id_access_level FROM fetchmetrics.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'VIEW' LIMIT 1);
CALL fetchmetrics.p_core_validate_guid ( a_guid );
DROP TABLE IF EXISTS tmp_Company_Copy;
DROP TABLE IF EXISTS tmp_Company;
CREATE TEMPORARY TABLE tmp_Company (
id_temp INT
, id_company INT
, name VARCHAR(1000)
, website TEXT
, active BIT
, is_new BIT
, name_error VARCHAR(250)
);
CREATE TEMPORARY TABLE tmp_Company_Copy (
id_temp INT
, id_company INT
, name VARCHAR(1000)
, website TEXT
, active BIT
, is_new BIT
, name_error VARCHAR(250)
);
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT
, code VARCHAR(250)
, msg TEXT NOT NULL
);
-- Get data from Temp table
INSERT INTO tmp_Company (
id_temp
, id_company
, name
, website
, active
, is_new
)
SELECT
COMPANY_T.id_temp
, COALESCE(COMPANY.id_company, COMPANY_T.id_company) AS id_company
, COALESCE(
COMPANY_T.name
, COMPANY.name
) AS name
, COALESCE(
COMPANY_T.website
, COMPANY.website
) AS website
, COALESCE(COMPANY_T.active, 1) AS active
, CASE WHEN IFNULL(COMPANY_T.id_company, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM fetchmetrics.DOG_Company_Temp COMPANY_T
LEFT JOIN fetchmetrics.DOG_Company COMPANY
ON COMPANY_T.id_company = COMPANY.id_company
OR (
COMPANY_T.website = COMPANY.website
AND COMPANY_T.name = COMPANY.name
)
WHERE COMPANY_T.guid = a_guid
;
IF a_debug = 1 THEN
SELECT 'Company_Temp records';
SELECT * FROM tmp_Company;
SELECT COUNT(*) FROM tmp_Company;
END IF;
-- Error names
UPDATE tmp_Company t_COMPANY
SET t_COMPANY.name_error = COALESCE(t_COMPANY.website, t_COMPANY.name, t_COMPANY.id_company, '(No Company)')
;
IF a_debug = 1 THEN
SELECT 'After set name_error';
SELECT * FROM tmp_Company;
SELECT COUNT(*) FROM tmp_Company;
END IF;
-- Validation
-- Missing mandatory fields
-- website
IF EXISTS ( SELECT * FROM tmp_Company t_COMPANY WHERE t_COMPANY.website IS NULL ) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('The following Company(s) do not have a valid Website: ', GROUP_CONCAT(t_COMPANY.name_error SEPARATOR ', ')) AS msg
FROM tmp_Company t_COMPANY
WHERE t_COMPANY.website IS NULL
;
END IF;
-- name
IF EXISTS ( SELECT * FROM tmp_Company t_COMPANY WHERE t_COMPANY.name IS NULL ) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('The following Company(s) do not have a valid Name: ', GROUP_CONCAT(t_COMPANY.name_error SEPARATOR ', ')) AS msg
FROM tmp_Company t_COMPANY
WHERE t_COMPANY.name IS NULL
;
END IF;
-- Duplicates
INSERT INTO tmp_Company_Copy (
id_temp
, id_company
, website
, name
, active
, is_new
, name_error
)
SELECT
t_COMPANY.id_temp
, t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.active
, t_COMPANY.is_new
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
;
IF a_debug = 1 THEN
SELECT COUNT(*) AS Count_Temp_Company FROM tmp_Company;
SELECT COUNT(*) AS Count_Temp_Company_Copy FROM tmp_Company_Copy;
WITH
Combined_Company AS (
SELECT
COMPANY.id_company
, COMPANY.website
, COMPANY.name
, COALESCE(t_COMPANY_COPY.website, t_COMPANY_COPY.name, t_COMPANY_COPY.id_company, '(No Company)') AS name_error
FROM fetchmetrics.DOG_Company COMPANY
LEFT JOIN tmp_Company_Copy t_COMPANY_COPY
ON COMPANY.website = t_COMPANY_COPY.website
OR COMPANY.name = t_COMPANY_COPY.name
WHERE t_COMPANY_COPY.is_new = 1
UNION
SELECT
t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
)
, Duplicate_Company_Row_Numbers AS (
SELECT
COMBINED_COMPANY.id_company
, COMBINED_COMPANY.website
, COMBINED_COMPANY.name
, COMBINED_COMPANY.name_error
, ROW_NUMBER() OVER (PARTITION BY COMBINED_COMPANY.website ORDER BY COMBINED_COMPANY.name_error ASC) AS index_company_as_duplicate
FROM Combined_Company COMBINED_COMPANY
)
SELECT *
FROM Duplicate_Company_Row_Numbers;
END IF;
IF EXISTS (
WITH
Combined_Company AS (
SELECT
COMPANY.id_company
, COMPANY.website
, COMPANY.name
, COALESCE(t_COMPANY_COPY.website, t_COMPANY_COPY.name, t_COMPANY_COPY.id_company, '(No Company)') AS name_error
FROM fetchmetrics.DOG_Company COMPANY
LEFT JOIN tmp_Company_Copy t_COMPANY_COPY
ON COMPANY.website = t_COMPANY_COPY.website
OR COMPANY.name = t_COMPANY_COPY.name
WHERE t_COMPANY_COPY.is_new = 1
UNION
SELECT
t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
)
, Duplicate_Company_Row_Numbers AS (
SELECT
COMBINED_COMPANY.id_company
, COMBINED_COMPANY.website
, COMBINED_COMPANY.name
, COMBINED_COMPANY.name_error
, ROW_NUMBER() OVER (PARTITION BY COMBINED_COMPANY.website ORDER BY COMBINED_COMPANY.name_error ASC) AS index_company_as_duplicate
FROM Combined_Company COMBINED_COMPANY
)
SELECT *
FROM Duplicate_Company_Row_Numbers DUPLICATE_COMPANY
WHERE DUPLICATE_COMPANY.index_company_as_duplicate > 1
GROUP BY DUPLICATE_COMPANY.website
) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
WITH
Combined_Company AS (
SELECT
COMPANY.id_company
, COMPANY.website
, COMPANY.name
, COALESCE(t_COMPANY_COPY.website, t_COMPANY_COPY.name, t_COMPANY_COPY.id_company, '(No Company)') AS name_error
FROM fetchmetrics.DOG_Company COMPANY
LEFT JOIN tmp_Company_Copy t_COMPANY_COPY
ON COMPANY.website = t_COMPANY_COPY.website
OR COMPANY.name = t_COMPANY_COPY.name
WHERE t_COMPANY_COPY.is_new = 1
UNION
SELECT
t_COMPANY.id_company
, t_COMPANY.website
, t_COMPANY.name
, t_COMPANY.name_error
FROM tmp_Company t_COMPANY
)
, Duplicate_Company_Row_Numbers AS (
SELECT
COMBINED_COMPANY.id_company
, COMBINED_COMPANY.website
, COMBINED_COMPANY.name
, COMBINED_COMPANY.name_error
, ROW_NUMBER() OVER (PARTITION BY COMBINED_COMPANY.website ORDER BY COMBINED_COMPANY.name_error ASC) AS index_company_as_duplicate
FROM Combined_Company COMBINED_COMPANY
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('Attempt to create duplicate or overwrite existing Command Categories on: ', GROUP_CONCAT(DUPLICATE_COMPANY.name_error SEPARATOR ', ')) AS msg
FROM Duplicate_Company_Row_Numbers DUPLICATE_COMPANY
WHERE DUPLICATE_COMPANY.index_company_as_duplicate > 1
GROUP BY DUPLICATE_COMPANY.website
;
END IF;
-- Permissions
-- Can Create
CALL fetchmetrics.p_dog_calc_user_access(
a_guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_id_user -- ids_user
, '' -- a_auth0_ids_user
, '' -- a_names_user
, '' -- a_emails_user
, 1 -- a_require_all_id_search_filters_met
, 1 -- a_require_any_id_search_filters_met
, 0 -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_company_edit -- ids_permission
, v_id_access_level_edit -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT
IFNULL(CU_T.has_access, 0)
INTO
v_can_create
FROM fetchmetrics.DOG_Calc_User_Access_Temp CU_T
WHERE CU_T.GUID = a_guid
LIMIT 1
;
CALL fetchmetrics.p_dog_clear_calc_user_access(
a_guid
, 0 -- a_debug
);
IF v_can_create = 0 THEN
DELETE t_ME
FROM tmp_Msg_Error t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
;
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to edit Commands.'
)
;
END IF;
IF EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
IF a_debug = 1 THEN
SELECT * from tmp_Company;
END IF;
DELETE FROM tmp_Company;
END IF;
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error t_ERROR INNER JOIN fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
START TRANSACTION;
INSERT INTO fetchmetrics.DOG_Dog_Change_Set (
comment
, id_user_updated_last_by
, updated_last_on
)
VALUES (
a_comment
, a_id_user
, v_time_start
)
;
SET v_id_change_set := LAST_INSERT_ID();
UPDATE fetchmetrics.DOG_Company COMPANY
INNER JOIN tmp_Company t_COMPANY
ON COMPANY.id_company = t_COMPANY.id_company
AND t_COMPANY.is_new = 0
SET
COMPANY.website = t_COMPANY.website
, COMPANY.name = t_COMPANY.name
, COMPANY.active = t_COMPANY.active
, COMPANY.id_change_set = v_id_change_set
;
IF EXISTS (
SELECT *
FROM tmp_Company t_COMPANY
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
LIMIT 1
) THEN
INSERT INTO fetchmetrics.DOG_Company (
id_temp
, website
, name
, active
, id_user_created_by
, created_on
)
SELECT
t_COMPANY.id_temp AS id_temp
, t_COMPANY.website AS website
, t_COMPANY.name AS name
, t_COMPANY.active AS active
, a_id_user AS created_by
, v_time_start AS created_on
FROM tmp_Company t_COMPANY
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
;
UPDATE tmp_Company t_COMPANY
INNER JOIN fetchmetrics.DOG_Company COMPANY ON t_COMPANY.id_temp = COMPANY.id_temp
SET t_COMPANY.id_company = COMPANY.id_company
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
;
INSERT INTO fetchmetrics.DOG_Company_User_Link (
id_company
, id_user
, id_access_level
, active
, id_user_created_by
, created_on
)
SELECT
t_COMPANY.id_company
, a_id_user
, v_id_access_level_view
, 1 -- active
, a_id_user AS created_by
, v_time_start AS created_on
FROM tmp_Company t_COMPANY
WHERE
t_COMPANY.is_new = 1
AND t_COMPANY.active = 1
;
END IF;
COMMIT;
END IF;
START TRANSACTION;
DELETE FROM fetchmetrics.DOG_Company_Temp
WHERE GUID = a_guid
;
COMMIT;
-- Errors
SELECT
t_ERROR.id_error
, t_ERROR.id_type
, t_ERROR.code
, ERROR_TYPE.name
, ERROR_TYPE.description
, ERROR_TYPE.is_breaking_error
, ERROR_TYPE.background_colour
, ERROR_TYPE.text_colour
, t_ERROR.msg
FROM tmp_Msg_Error t_ERROR
INNER JOIN fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
;
IF a_debug = 1 THEN
SELECT * FROM tmp_Company;
END IF;
DROP TEMPORARY TABLE tmp_Company_Copy;
DROP TEMPORARY TABLE tmp_Company;
DROP TEMPORARY TABLE tmp_Msg_Error;
IF a_debug = 1 THEN
CALL fetchmetrics.p_core_debug_timing_reporting ( v_time_start );
END IF;
END //
DELIMITER ;
/*
'ripplesipplenippletippledipplekipple'
DELETE FROM fetchmetrics.DOG_Company_Audit WHERE id_company > 740;
DELETE FROM fetchmetrics.DOG_Company WHERE id_company > 740;
* /
delete
from fetchmetrics.DOG_Company_Temp
;
select
*
-- COUNT(*)
-- delete
from fetchmetrics.DOG_Company_Temp
;
select COUNT(*)
from fetchmetrics.DOG_Company_Temp
;
select
*
-- COUNT(*)
-- delete
from fetchmetrics.DOG_Company
;
select COUNT(*)
from fetchmetrics.DOG_Company
;
INSERT INTO fetchmetrics.DOG_Company_Temp (
id_company
, website
, name
, active
, guid
)
VALUES (
-1 -- id_company
, 'ACTIVITIES' -- website
, 'A Sport Is Fun' -- name
, 1 -- active
, 'ripplesipplenippletippledipplekipple'
);
CALL fetchmetrics.p_dog_save_company (
'nipples'
, 'ripplesipplenippletippledipplekipple'
, 1
, 1
);
select
*
-- COUNT(*)
-- delete
from fetchmetrics.DOG_Company_Temp
;
select COUNT(*)
from fetchmetrics.DOG_Company_Temp
;
select
*
-- COUNT(*)
-- delete
from fetchmetrics.DOG_Company
;
select COUNT(*)
from fetchmetrics.DOG_Company
;
*/

179
static/MySQL/70518_p_dog_save_new_founding_partner.sql
View File

@@ -73,17 +73,20 @@ BEGIN
CALL fetchmetrics.p_core_validate_guid ( a_guid );
DROP TABLE IF EXISTS tmp_Msg_Error;
DROP TABLE IF EXISTS tmp_User_Save_User;
DROP TABLE IF EXISTS tmp_User_Save_Founding_Partner;
CREATE TABLE tmp_User_Save_User (
CREATE TABLE tmp_User_Save_Founding_Partner (
id_user INT NOT NULL
, id_role INT
, id_company INT
, id_user_auth0 VARCHAR(250)
, firstname VARCHAR(250)
, surname VARCHAR(250)
, email VARCHAR(254)
, is_email_verified BIT DEFAULT 0
, is_super_user BIT DEFAULT 0
, name_company VARCHAR(1000)
, website_company TEXT
, active BIT DEFAULT 1
, name_error VARCHAR(1000)
);
@@ -95,6 +98,21 @@ BEGIN
msg TEXT NOT NULL
);
IF EXISTS (SELECT * FROM fetchmetrics.DOG_User USER WHERE USER.id_user_auth0 = a_id_user_auth0) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
MET.id_type
, MET.code
, 'Founding Partner User already exists.'
FROM fetchmetrics.CORE_Msg_Error_Type MET
WHERE MET.id_type = v_id_type_error_bad_data
;
END IF;
IF NOT EXISTS (SELECT * FROM fetchmetrics.PH_Apply_Founding_Partner_Form AFPF WHERE AFPF.email = a_email_user) THEN
INSERT INTO tmp_Msg_Error (
id_type
@@ -109,27 +127,55 @@ BEGIN
WHERE MET.id_type = v_id_type_error_bad_data
;
END IF;
IF EXISTS (
SELECT *
FROM fetchmetrics.PH_Apply_Founding_Partner_Form AFPF
WHERE
AFPF.email = a_email_user
AND AFPF.is_approved = 0
) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
MET.id_type
, MET.code
, 'Founding Partner not approved.'
FROM fetchmetrics.CORE_Msg_Error_Type MET
WHERE MET.id_type = v_id_type_error_bad_data
;
END IF;
-- Get data from Temp table
INSERT INTO tmp_User_Save_User (
INSERT INTO tmp_User_Save_Founding_Partner (
id_user
, id_user_auth0
, id_role
, email
, firstname
, surname
, name_company
, website_company
, name_error
)
VALUES (
-1 -- AS id_user
, a_id_user_auth0
, v_id_role_manager
, a_email_user
, (SELECT LEFT(AFPF.name_contact, LOCATE(' ', AFPF.name_contact) - 1) FROM fetchmetrics.PH_Apply_Founding_Partner_Form AFPF WHERE AFPF.email = a_email_user) -- AS firstname
, (SELECT SUBSTRING(AFPF.name_contact, LOCATE(' ', AFPF.name_contact) + 1) FROM fetchmetrics.PH_Apply_Founding_Partner_Form AFPF WHERE AFPF.email = a_email_user) -- AS surname
, COALESCE(a_email_user, a_id_user_auth0) -- AS name_error
);
SELECT
-1 AS id_user
, a_id_user_auth0 AS id_user_auth0
, v_id_role_manager AS id_role
, a_email_user AS email
, LEFT(AFPF.name_contact, LOCATE(' ', AFPF.name_contact) - 1) AS firstname
, SUBSTRING(AFPF.name_contact, LOCATE(' ', AFPF.name_contact) + 1) AS surname
, AFPF.name_company
, AFPF.website AS website_company
, COALESCE(a_email_user, a_id_user_auth0) AS name_error
FROM fetchmetrics.PH_Apply_Founding_Partner_Form AFPF
WHERE
AFPF.email = a_email_user
AND AFPF.is_approved = 1
;
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN
START TRANSACTION;
@@ -151,10 +197,10 @@ BEGIN
, t_USER.is_email_verified
, t_USER.is_super_user
, t_USER.active
FROM tmp_User_Save_User t_USER
FROM tmp_User_Save_Founding_Partner t_USER
;
UPDATE tmp_User_Save_User t_USER
UPDATE tmp_User_Save_Founding_Partner t_USER
INNER JOIN fetchmetrics.DOG_User USER ON t_USER.id_user_auth0 = USER.id_user_auth0
SET t_USER.id_user = USER.id_user
;
@@ -172,7 +218,66 @@ BEGIN
, 1 -- active
, t_USER.id_user AS created_by
, v_time_start AS created_on
FROM tmp_User_Save_User t_USER
FROM tmp_User_Save_Founding_Partner t_USER
;
IF NOT EXISTS (
SELECT COMPANY.id_company
FROM fetchmetrics.DOG_Company COMPANY
INNER JOIN tmp_User_Save_Founding_Partner t_USER
ON COMPANY.name = t_USER.name_company
AND COMPANY.website = t_USER.website_company
ORDER BY COMPANY.id_company DESC
LIMIT 1
) THEN
INSERT INTO fetchmetrics.DOG_Company (
name
, website
, active
, id_user_created_by
, created_on
)
SELECT
t_USER.name_company
, t_USER.website_company
, 1 -- active
, t_USER.id_user AS created_by
, v_time_start AS created_on
FROM tmp_User_Save_Founding_Partner t_USER
;
END IF;
UPDATE tmp_User_Save_Founding_Partner t_USER
-- INNER JOIN fetchmetrics.DOG_Company COMPANY ON t_USER.id_user_auth0 = COMPANY.id_user_auth0
SET t_USER.id_company = (
SELECT COMPANY.id_company
FROM fetchmetrics.DOG_Company COMPANY
WHERE
COMPANY.name = t_USER.name_company
AND COMPANY.website = t_USER.website_company
/*
INNER JOIN tmp_User_Save_Founding_Partner t_USER
ON COMPANY.name = t_USER.name_company
*/
ORDER BY COMPANY.id_company DESC
LIMIT 1
)
;
INSERT INTO fetchmetrics.DOG_User_Company_Link (
id_user
, id_company
, active
, id_user_created_by
, created_on
)
SELECT
t_USER.id_user
, t_USER.id_company
, 1 -- active
, t_USER.id_user
, v_time_start -- created_on
FROM tmp_User_Save_Founding_Partner t_USER
;
COMMIT;
@@ -185,11 +290,11 @@ BEGIN
;
IF a_debug = 1 THEN
SELECT * from tmp_User_Save_User;
SELECT * from tmp_User_Save_Founding_Partner;
END IF;
DROP TABLE IF EXISTS tmp_Msg_Error;
DROP TABLE IF EXISTS tmp_User_Save_User;
DROP TABLE IF EXISTS tmp_User_Save_Founding_Partner;
IF a_debug = 1 THEN
CALL fetchmetrics.p_debug_timing_reporting ( v_time_start );
@@ -214,3 +319,41 @@ CALL fetchmetrics.p_dog_save_new_founding_partner (
SELECT *
FROM fetchmetrics.DOG_User;
SELECT *
FROM fetchmetrics.DOG_Company;
SELECT *
FROM fetchmetrics.DOG_User_Company_Link;
SELECT *
FROM fetchmetrics.DOG_User_Role_Link;
/*
DELETE UCL
FROM fetchmetrics.DOG_User_Company_Link UCL
WHERE UCL.id_user > 7
;
DELETE URL
FROM fetchmetrics.DOG_User_Role_Link URL
WHERE URL.id_user > 7
;
DELETE C
FROM fetchmetrics.DOG_Company C
WHERE C.id_user_created_by > 7
;
DELETE U
FROM fetchmetrics.DOG_User U
WHERE U.id_user > 7
;
SELECT *
FROM fetchmetrics.DOG_User;
SELECT *
FROM fetchmetrics.DOG_Company;
SELECT *
FROM fetchmetrics.DOG_User_Company_Link;
SELECT *
FROM fetchmetrics.DOG_User_Role_Link;
*/

14
static/MySQL/91620_approve_founding_partner.sql Normal file
View File

@@ -0,0 +1,14 @@
INSERT INTO fetchmetrics.PH_Contact_Form_Change_Set ( comment )
VALUES ( 'Approve founding partner ___' );
UPDATE fetchmetrics.PH_Apply_Founding_Partner_Form AFPF
SET
AFPF.is_approved = 1
, AFPF.id_change_set = (SELECT CFCS.id_change_set FROM fetchmetrics.PH_Contact_Form_Change_Set CFCS ORDER BY CFCS.id_change_set DESC LIMIT 1)
WHERE AFPF.id_apply_founding_partner_form = NULL
;
SELECT *
FROM fetchmetrics.PH_Apply_Founding_Partner_Form
;

1
static/css/components/button.css
View File

@@ -23,6 +23,7 @@
.button-primary:hover {
background: var(--colour-secondary);
color: var(--colour-accent);
}
.button-light {

8
static/css/components/overlay.css
View File

@@ -89,7 +89,8 @@
font-size: 15px;
/* height: 18px; */
cursor: pointer;
padding: 4.5px 0;
padding: 0;
height: fit-content;
}
#overlayHamburger .container:hover {
color: var(--colour-page-background);
@@ -103,10 +104,7 @@
}
#overlayHamburger .container a {
width: 100%;
/*
margin-top: 4.5px;
margin-bottom: 4.5px;
*/
padding: 4.5px 0;
color: var(--colour-text);
text-decoration: none;
line-height: initial;

8
static/css/pages/user/company.css
View File

@@ -3,6 +3,10 @@
display: none;
}
.container.authorisedUser.dirty {
background-color: white;
}
.container.save.button-cancel {
position: fixed;
top: 1vh;
@@ -18,6 +22,10 @@
padding: 1vh 1vw;
}
.container-input:has(.dirty) {
background-color: var(--colour-accent);
}
.container-input textarea {
width: 300px;
}

9
static/dist/css/main.bundle.css vendored
View File

@@ -249,6 +249,7 @@ input.dirty, textarea.dirty, select.dirty {
.button-primary:hover {
background: var(--colour-secondary);
color: var(--colour-accent);
}
.button-light {
@@ -410,7 +411,8 @@ h5 {
font-size: 15px;
/* height: 18px; */
cursor: pointer;
padding: 4.5px 0;
padding: 0;
height: fit-content;
}
#overlayHamburger .container:hover {
color: var(--colour-page-background);
@@ -424,10 +426,7 @@ h5 {
}
#overlayHamburger .container a {
width: 100%;
/*
margin-top: 4.5px;
margin-bottom: 4.5px;
*/
padding: 4.5px 0;
color: var(--colour-text);
text-decoration: none;
line-height: initial;

2
static/dist/css/main.bundle.css.map vendored
View File

File diff suppressed because one or more lines are too long

8
static/dist/css/user_company.bundle.css vendored
View File

@@ -70,6 +70,10 @@
display: none;
}
.container.authorisedUser.dirty {
background-color: white;
}
.container.save.button-cancel {
position: fixed;
top: 1vh;
@@ -85,6 +89,10 @@
padding: 1vh 1vw;
}
.container-input:has(.dirty) {
background-color: var(--colour-accent);
}
.container-input textarea {
width: 300px;
}

2
static/dist/css/user_company.bundle.css.map vendored
View File

@@ -1 +1 @@
{"version":3,"file":"css/user_company.bundle.css","mappings":";;AAEA;IACI,gBAAgB;IAChB,oBAAoB;IACpB,cAAc;AAClB;;;AAGA,iBAAiB;AACjB;IACI,sBAAsB;AAC1B;;AAEA,eAAe;AACf;IACI,gBAAgB;IAChB,cAAc;IACd,SAAS;IACT,SAAS;IACT,qBAAqB;IACrB,2BAA2B;IAC3B,aAAa;IACb,sBAAsB;IACtB,uBAAuB;IACvB,gBAAgB;IAChB,kBAAkB;IAClB,kBAAkB;IAClB,WAAW;IACX,yBAAyB;AAC7B;;;AAGA,WAAW;AACX;IACI,gBAAgB;IAChB,kBAAkB;IAClB,SAAS;IACT,eAAe;IACf,gBAAgB;IAChB,sCAAsC;IACtC,kBAAkB;IAClB,SAAS;IACT,WAAW;AACf;;AAEA;IACI;QACI,eAAe;QACf,mBAAmB;QACnB,eAAe;QACf,WAAW;QACX,eAAe;IACnB;IACA;QACI,eAAe;IACnB;IACA;QACI,cAAc;IAClB;AACJ;;AAEA;IACI,UAAU;IACV,SAAS;AACb,C;;;AChEA;IACI,aAAa;AACjB;;AAEA;IACI,eAAe;IACf,QAAQ;IACR,UAAU;IACV,UAAU;AACd;;AAEA;IACI,cAAc;AAClB;AACA;IACI,gBAAgB;IAChB,gBAAgB;AACpB;;AAEA;IACI,YAAY;AAChB,C","sources":["webpack://app/./static/css/sections/dog.css","webpack://app/./static/css/pages/user/company.css"],"sourcesContent":["\n\n.container-input > input {\n padding: 0vh 1vh;\n border-radius: 0.5vh;\n max-width: 7vh;\n}\n\n\n/* Right column */\n.rightcolumn {\n min-width: fit-content;\n}\n\n/* Main Table */\n#pageBody {\n max-height: 88vh;\n padding: 0 5vw;\n margin: 0;\n border: 0;\n align-content: center;\n justify-content: flex-start;\n display: flex;\n flex-direction: column;\n align-items: flex-start;\n overflow-y: auto;\n overflow-x: hidden;\n position: absolute;\n width: 90vw;\n color: var(--colour-text);\n}\n\n\n/* Footer */\n.footer {\n padding: 1vh 1vw;\n text-align: center;\n margin: 0;\n max-height: 5vh;\n overflow-y: auto;\n background-color: var(--colour-accent);\n position: absolute;\n bottom: 0;\n width: 98vw;\n}\n\n@media screen and (max-width: 400px) {\n .footer {\n max-height: 8vh;\n padding: 0.75vh 2vw;\n font-size: 10px; \n width: 96vw;\n max-width: 96vw;\n }\n .footer > h4 {\n font-size: 10px;\n }\n .footer > h5 {\n font-size: 9px;\n }\n}\n\n.footer > h4, h5 {\n padding: 0;\n margin: 0;\n}","\n#formFilters {\n display: none;\n}\n\n.container.save.button-cancel {\n position: fixed;\n top: 1vh;\n right: 5vh;\n z-index: 2;\n}\n\n.container-input {\n margin: 0 auto;\n}\n.container-input input {\n max-width: 250px;\n padding: 1vh 1vw;\n}\n\n.container-input textarea {\n width: 300px;\n}"],"names":[],"sourceRoot":""}
{"version":3,"file":"css/user_company.bundle.css","mappings":";;AAEA;IACI,gBAAgB;IAChB,oBAAoB;IACpB,cAAc;AAClB;;;AAGA,iBAAiB;AACjB;IACI,sBAAsB;AAC1B;;AAEA,eAAe;AACf;IACI,gBAAgB;IAChB,cAAc;IACd,SAAS;IACT,SAAS;IACT,qBAAqB;IACrB,2BAA2B;IAC3B,aAAa;IACb,sBAAsB;IACtB,uBAAuB;IACvB,gBAAgB;IAChB,kBAAkB;IAClB,kBAAkB;IAClB,WAAW;IACX,yBAAyB;AAC7B;;;AAGA,WAAW;AACX;IACI,gBAAgB;IAChB,kBAAkB;IAClB,SAAS;IACT,eAAe;IACf,gBAAgB;IAChB,sCAAsC;IACtC,kBAAkB;IAClB,SAAS;IACT,WAAW;AACf;;AAEA;IACI;QACI,eAAe;QACf,mBAAmB;QACnB,eAAe;QACf,WAAW;QACX,eAAe;IACnB;IACA;QACI,eAAe;IACnB;IACA;QACI,cAAc;IAClB;AACJ;;AAEA;IACI,UAAU;IACV,SAAS;AACb,C;;;AChEA;IACI,aAAa;AACjB;;AAEA;IACI,uBAAuB;AAC3B;;AAEA;IACI,eAAe;IACf,QAAQ;IACR,UAAU;IACV,UAAU;AACd;;AAEA;IACI,cAAc;AAClB;AACA;IACI,gBAAgB;IAChB,gBAAgB;AACpB;;AAEA;IACI,sCAAsC;AAC1C;;AAEA;IACI,YAAY;AAChB,C","sources":["webpack://app/./static/css/sections/dog.css","webpack://app/./static/css/pages/user/company.css"],"sourcesContent":["\n\n.container-input > input {\n padding: 0vh 1vh;\n border-radius: 0.5vh;\n max-width: 7vh;\n}\n\n\n/* Right column */\n.rightcolumn {\n min-width: fit-content;\n}\n\n/* Main Table */\n#pageBody {\n max-height: 88vh;\n padding: 0 5vw;\n margin: 0;\n border: 0;\n align-content: center;\n justify-content: flex-start;\n display: flex;\n flex-direction: column;\n align-items: flex-start;\n overflow-y: auto;\n overflow-x: hidden;\n position: absolute;\n width: 90vw;\n color: var(--colour-text);\n}\n\n\n/* Footer */\n.footer {\n padding: 1vh 1vw;\n text-align: center;\n margin: 0;\n max-height: 5vh;\n overflow-y: auto;\n background-color: var(--colour-accent);\n position: absolute;\n bottom: 0;\n width: 98vw;\n}\n\n@media screen and (max-width: 400px) {\n .footer {\n max-height: 8vh;\n padding: 0.75vh 2vw;\n font-size: 10px; \n width: 96vw;\n max-width: 96vw;\n }\n .footer > h4 {\n font-size: 10px;\n }\n .footer > h5 {\n font-size: 9px;\n }\n}\n\n.footer > h4, h5 {\n padding: 0;\n margin: 0;\n}","\n#formFilters {\n display: none;\n}\n\n.container.authorisedUser.dirty {\n background-color: white;\n}\n\n.container.save.button-cancel {\n position: fixed;\n top: 1vh;\n right: 5vh;\n z-index: 2;\n}\n\n.container-input {\n margin: 0 auto;\n}\n.container-input input {\n max-width: 250px;\n padding: 1vh 1vw;\n}\n\n.container-input:has(.dirty) {\n background-color: var(--colour-accent);\n}\n\n.container-input textarea {\n width: 300px;\n}"],"names":[],"sourceRoot":""}

111
static/dist/js/main.bundle.js vendored
View File

@@ -723,7 +723,7 @@ var API = /*#__PURE__*/function () {
dataRequest[flagCompany] = companies;
dataRequest[flagComment] = comment;
_context4.next = 6;
return API.request(hashSaveDogCompany, 'POST', dataRequest);
return API.request(hashSaveUserCompany, 'POST', dataRequest);
case 6:
return _context4.abrupt("return", _context4.sent);
case 7:
@@ -8993,25 +8993,126 @@ function company_defineProperty(e, r, t) { return (r = company_toPropertyKey(r))
function company_toPropertyKey(t) { var i = company_toPrimitive(t, "string"); return "symbol" == company_typeof(i) ? i : i + ""; }
function company_toPrimitive(t, r) { if ("object" != company_typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != company_typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
var PageUserCompany = /*#__PURE__*/function (_BasePage) {
var company_rowBlankDistraction;
var company_rowBlankAssessmentCommandModalityLink;
var PageUserCompany = /*#__PURE__*/function (_TableBasePage) {
function PageUserCompany(router) {
var _this;
company_classCallCheck(this, PageUserCompany);
return company_callSuper(this, PageUserCompany, [router]);
_this = company_callSuper(this, PageUserCompany, [router]);
company_defineProperty(_this, "callSaveTableContent", API.saveCompanies);
_this.dogMixin = new DogTableMixinPage(_this);
return _this;
}
company_inherits(PageUserCompany, _BasePage);
company_inherits(PageUserCompany, _TableBasePage);
return company_createClass(PageUserCompany, [{
key: "initialize",
value: function initialize() {
this.sharedInitialize();
}
}, {
key: "hookupFilters",
value: function hookupFilters() {}
}, {
key: "loadRowTable",
value: function loadRowTable(rowJson) {
if (rowJson == null) return;
if (_verbose) {
utils_Utils.consoleLogIfNotProductionEnvironment("applying data row: ", rowJson);
}
}
}, {
key: "getTableRecords",
value: function getTableRecords() {
var dirtyOnly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
dirtyOnly = true;
var container = document.querySelector('.' + flagContainer + '.' + flagUser);
var nameInput = document.getElementById(flagName);
var websiteInput = document.getElementById(flagWebsite);
var companies = [];
if (!dirtyOnly || container.classList.contains(flagDirty)) companies.push(company_defineProperty(company_defineProperty(company_defineProperty(company_defineProperty({}, attrIdCompany, container.getAttribute(attrIdCompany)), flagName, DOM.getElementAttributeValueCurrent(nameInput)), flagWebsite, DOM.getElementAttributeValueCurrent(websiteInput)), flagActive, true));
return companies;
}
}, {
key: "initialiseRowNew",
value: function initialiseRowNew(tbody, row) {}
}, {
key: "postInitialiseRowNewCallback",
value: function postInitialiseRowNewCallback(tbody) {}
}, {
key: "callFilterTableContent",
value: function callFilterTableContent() {
company_superPropGet(PageUserCompany, "callFilterTableContent", this, 3)([]);
}
}, {
key: "hookupTableMain",
value: function hookupTableMain() {
company_superPropGet(PageUserCompany, "hookupTableMain", this, 3)([]);
this.hookupNameInput();
this.hookupWebsiteInput();
}
}, {
key: "hookupNameInput",
value: function hookupNameInput() {
var _this2 = this;
var selector = '#' + flagName;
Events.initialiseEventHandler(selector, flagInitialised, function (nameInput) {
nameInput.addEventListener("change", function (event) {
nameInput = event.target;
var container = document.querySelector('.' + flagContainer + '.' + flagUser);
var wasDirtyContainer = container.classList.contains(flagDirty);
var wasDirtyElement = nameInput.classList.contains(flagDirty);
var isDirtyElement = DOM.updateAndCheckIsElementDirty(nameInput);
if (isDirtyElement == wasDirtyElement) return;
var isDirtyContainer = DOM.hasDirtyChildrenContainer(container); // wasDirtyContainer || isDirtyElement;
if (isDirtyContainer) {
container.classList.add(flagDirty);
} else {
container.classList.remove(flagDirty);
}
_this2.updateAndToggleShowButtonsSaveCancel();
});
});
}
}, {
key: "hookupWebsiteInput",
value: function hookupWebsiteInput() {
var _this3 = this;
var selector = '#' + flagWebsite;
Events.initialiseEventHandler(selector, flagInitialised, function (websiteInput) {
websiteInput.addEventListener("change", function (event) {
websiteInput = event.target;
var container = document.querySelector('.' + flagContainer + '.' + flagUser);
var wasDirtyContainer = container.classList.contains(flagDirty);
var wasDirtyElement = websiteInput.classList.contains(flagDirty);
var isDirtyElement = DOM.updateAndCheckIsElementDirty(websiteInput);
if (isDirtyElement == wasDirtyElement) return;
var isDirtyContainer = DOM.hasDirtyChildrenContainer(container); // wasDirtyContainer || isDirtyElement;
if (isDirtyContainer) {
container.classList.add(flagDirty);
} else {
container.classList.remove(flagDirty);
}
_this3.updateAndToggleShowButtonsSaveCancel();
});
});
}
}, {
key: "leave",
value: function leave() {
company_superPropGet(PageUserCompany, "leave", this, 3)([]);
}
}]);
}(BasePage);
}(TableBasePage);
company_defineProperty(PageUserCompany, "hash", hashPageUserCompany);
company_defineProperty(PageUserCompany, "attrIdRowObject", attrIdCompany);
;// ./static/js/router.js
function router_typeof(o) { "@babel/helpers - typeof"; return router_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, router_typeof(o); }

2
static/dist/js/main.bundle.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
static/js/api.js
View File

@@ -85,7 +85,7 @@ export default class API {
dataRequest[flagFormFilters] = DOM.convertForm2JSON(formFilters);
dataRequest[flagCompany] = companies;
dataRequest[flagComment] = comment;
return await API.request(hashSaveDogCompany, 'POST', dataRequest);
return await API.request(hashSaveUserCompany, 'POST', dataRequest);
}

94
static/js/pages/user/company.js
View File

@@ -1,18 +1,108 @@
import BasePage from "../base.js";
import API from "../../api.js";
import BusinessObjects from "../../lib/business_objects/business_objects.js";
import DOM from "../../dom.js";
import Events from "../../lib/events.js";
import TableBasePage from "../base_table.js";
import Utils from "../../lib/utils.js";
import Validation from "../../lib/validation.js";
import DogTableMixinPage from "../dog/mixin_table.js";
export default class PageUserCompany extends BasePage {
var _rowBlankDistraction;
var _rowBlankAssessmentCommandModalityLink;
export default class PageUserCompany extends TableBasePage {
static hash = hashPageUserCompany;
static attrIdRowObject = attrIdCompany;
callSaveTableContent = API.saveCompanies;
constructor(router) {
super(router);
this.dogMixin = new DogTableMixinPage(this);
}
initialize() {
this.sharedInitialize();
}
hookupFilters() {
}
loadRowTable(rowJson) {
if (rowJson == null) return;
if (_verbose) { Utils.consoleLogIfNotProductionEnvironment("applying data row: ", rowJson); }
}
getTableRecords(dirtyOnly = false) {
dirtyOnly = true;
let container = document.querySelector('.' + flagContainer + '.' + flagUser);
let nameInput = document.getElementById(flagName);
let websiteInput = document.getElementById(flagWebsite);
let companies = [];
if (!dirtyOnly || container.classList.contains(flagDirty)) companies.push({
[attrIdCompany]: container.getAttribute(attrIdCompany)
, [flagName]: DOM.getElementAttributeValueCurrent(nameInput)
, [flagWebsite]: DOM.getElementAttributeValueCurrent(websiteInput)
, [flagActive]: true
});
return companies;
}
initialiseRowNew(tbody, row) {
}
postInitialiseRowNewCallback(tbody) {
}
callFilterTableContent() {
super.callFilterTableContent();
}
hookupTableMain() {
super.hookupTableMain();
this.hookupNameInput();
this.hookupWebsiteInput();
}
hookupNameInput() {
let selector = '#' + flagName;
Events.initialiseEventHandler(selector, flagInitialised, (nameInput) => {
nameInput.addEventListener("change", (event) => {
nameInput = event.target;
let container = document.querySelector('.' + flagContainer + '.' + flagUser);
let wasDirtyContainer = container.classList.contains(flagDirty);
let wasDirtyElement = nameInput.classList.contains(flagDirty);
let isDirtyElement = DOM.updateAndCheckIsElementDirty(nameInput);
if (isDirtyElement == wasDirtyElement) return;
let isDirtyContainer = DOM.hasDirtyChildrenContainer(container); // wasDirtyContainer || isDirtyElement;
if (isDirtyContainer) {
container.classList.add(flagDirty);
}
else {
container.classList.remove(flagDirty);
}
this.updateAndToggleShowButtonsSaveCancel();
});
});
}
hookupWebsiteInput() {
let selector = '#' + flagWebsite;
Events.initialiseEventHandler(selector, flagInitialised, (websiteInput) => {
websiteInput.addEventListener("change", (event) => {
websiteInput = event.target;
let container = document.querySelector('.' + flagContainer + '.' + flagUser);
let wasDirtyContainer = container.classList.contains(flagDirty);
let wasDirtyElement = websiteInput.classList.contains(flagDirty);
let isDirtyElement = DOM.updateAndCheckIsElementDirty(websiteInput);
if (isDirtyElement == wasDirtyElement) return;
let isDirtyContainer = DOM.hasDirtyChildrenContainer(container); // wasDirtyContainer || isDirtyElement;
if (isDirtyContainer) {
container.classList.add(flagDirty);
}
else {
container.classList.remove(flagDirty);
}
this.updateAndToggleShowButtonsSaveCancel();
});
});
}
leave() {
super.leave();
}
}