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

Fix(Content): Remove name from false testimonial.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-08-12 07:55:51 +01:00
parent 4294f3dc76
commit e5eee00beb
12 changed files with 1194 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

321
static/MySQL/71104_p_dog_calc_command.sql
View File

@@ -17,6 +17,11 @@ CREATE PROCEDURE fetchmetrics.p_dog_calc_command (
, IN a_names_command TEXT
, IN a_hand_signal_default_descriptions_command TEXT
, IN a_notes_command TEXT
, IN a_get_all_user BIT
, IN a_get_inactive_user BIT
, IN a_ids_user TEXT
, IN a_names_user TEXT
, IN a_emails_user TEXT
, IN a_require_all_id_search_filters_met BIT
, IN a_require_any_id_search_filters_met BIT
, IN a_require_all_non_id_search_filters_met BIT
@@ -36,9 +41,10 @@ BEGIN
DECLARE v_has_filter_command_notes BIT;
DECLARE v_id_access_level_view INT;
DECLARE v_id_minimum INT;
DECLARE v_id_permission_dog_view INT;
DECLARE v_id_permission_command_view INT;
DECLARE v_id_type_error_bad_data INT;
DECLARE v_id_type_error_no_permission INT;
DECLARE v_is_super_user BIT;
DECLARE v_time_start TIMESTAMP(6);
DECLARE exit handler for SQLEXCEPTION
@@ -93,7 +99,7 @@ BEGIN
SET v_code_type_error_no_permission := 'NO_PERMISSION';
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_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission LIMIT 1);
SET v_id_permission_dog_view := (SELECT PERMISSION.id_permission FROM fetchmetrics.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' LIMIT 1);
SET v_id_permission_command_view := (SELECT PERMISSION.id_permission FROM fetchmetrics.DOG_Permission PERMISSION WHERE PERMISSION.code = 'COMMAND_VIEW' 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);
@@ -131,6 +137,11 @@ BEGIN
, a_names_command
, a_hand_signal_default_descriptions_command
, a_notes_command
, a_get_all_user
, a_get_inactive_user
, a_ids_user
, a_names_user
, a_emails_user
, a_require_all_id_search_filters_met
, a_require_any_id_search_filters_met
, a_require_all_non_id_search_filters_met
@@ -154,6 +165,24 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Command;
DROP TEMPORARY TABLE IF EXISTS tmp_Command_Calc_Command;
DROP TEMPORARY TABLE IF EXISTS tmp_Command_Category_Calc_Command;
DROP TEMPORARY TABLE IF EXISTS tmp_Calc_User_Access_Calc_Command;
CREATE TEMPORARY TABLE tmp_Calc_User_Access_Calc_Command (
id_temp INT PRIMARY KEY AUTO_INCREMENT NOT NULL
, id_user INT
, id_role INT
, id_permission_required INT NOT NULL
, priority_access_level_required INT NOT NULL
, is_super_user BIT
, priority_access_level_user INT
, has_access BIT
, can_view BIT
, can_edit BIT
, can_admin BIT
, does_meet_id_filters BIT
, does_meet_non_id_filters BIT
);
CREATE TEMPORARY TABLE tmp_Command_Category_Calc_Command (
id_command_category INT NOT NULL
@@ -207,6 +236,169 @@ BEGIN
SET v_has_filter_command_hand_signal_default_description = CASE WHEN a_hand_signal_default_descriptions_command <> '' THEN 1 ELSE 0 END;
SET v_has_filter_command_notes = CASE WHEN a_notes_command <> '' THEN 1 ELSE 0 END;
-- Permissions
IF a_debug = 1 THEN
SELECT
a_guid -- 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_command_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
;
END IF;
CALL fetchmetrics.p_dog_calc_user_access(
a_guid -- 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_command_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT
IFNULL(CALC_USER_T.has_access, 0)
, IFNULL(CALC_USER_T.is_super_user, 0)
INTO
v_can_view
, v_is_super_user
FROM fetchmetrics.DOG_Calc_User_Access_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = a_guid
LIMIT 1
;
IF a_debug = 1 THEN
SELECT
v_can_view
, v_is_super_user
;
END IF;
IF (v_can_view = 0) THEN
DELETE t_ME
FROM tmp_Msg_Error_Calc_Command t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
;
INSERT INTO tmp_Msg_Error_Calc_Command (
id_type
, code
, msg
)
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to view Dogs and Commands.'
)
;
END IF;
CALL fetchmetrics.p_dog_clear_calc_user_access(
a_guid
, 0 -- a_debug
);
-- Users
IF a_debug = 1 THEN
SELECT
a_guid -- guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_ids_user -- ids_user
, '' -- a_auth0_ids_user
, a_names_user -- a_names_user
, a_emails_user -- a_emails_user
, a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
, 0 -- a_require_any_id_search_filters_met
, a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_command_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, a_debug -- a_debug
;
END IF;
CALL fetchmetrics.p_dog_calc_user_access(
a_guid -- a_guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_ids_user -- ids_user
, '' -- a_auth0_ids_user
, a_names_user -- a_names_user
, a_emails_user -- a_emails_user
, a_require_all_id_search_filters_met -- a_require_all_id_search_filters_met
, 0 -- a_require_any_id_search_filters_met
, a_require_all_non_id_search_filters_met -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_command_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, a_debug -- a_debug
);
INSERT INTO tmp_Calc_User_Access_Calc_Command (
id_user
, id_role
, id_permission_required
, priority_access_level_required
, is_super_user
, priority_access_level_user
, has_access
, can_view
, can_edit
, can_admin
, does_meet_id_filters
, does_meet_non_id_filters
)
SELECT
CALC_USER_T.id_user
, CALC_USER_T.id_role
, CALC_USER_T.id_permission_required
, CALC_USER_T.priority_access_level_required
, CALC_USER_T.is_super_user
, CALC_USER_T.priority_access_level_user
, CALC_USER_T.has_access
, CALC_USER_T.can_view
, CALC_USER_T.can_edit
, CALC_USER_T.can_admin
, CALC_USER_T.does_meet_id_filters
, CALC_USER_T.does_meet_non_id_filters
FROM fetchmetrics.DOG_Calc_User_Access_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = v_guid
LIMIT 1
;
IF a_debug = 1 THEN
SELECT * FROM tmp_Calc_User_Access_Calc_Command;
END IF;
CALL fetchmetrics.p_dog_clear_calc_user_access (
a_guid
, 0 -- a_debug
);
-- Command Categories
IF v_has_filter_command_category_id = 1 THEN
CALL fetchmetrics.p_core_split(a_guid, a_ids_command_category, ',', a_debug);
@@ -339,6 +531,8 @@ BEGIN
THEN 1 ELSE 0 END AS does_meet_non_id_filters
FROM fetchmetrics.DOG_Command_Category COMMAND_CATEGORY
LEFT JOIN Command_Category_Filters COMMAND_CATEGORY_FILTERS ON COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_FILTERS.id_command_category
LEFT JOIN demo.DOG_Command_Category_User_Link COMMAND_CATEGORY_USER_LINK ON COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_USER_LINK.id_command_category
LEFT JOIN tmp_Calc_User_Access_Calc_Command t_USER ON COMMAND_CATEGORY_USER_LINK.id_user = t_USER.id_user
WHERE
(
a_get_all_command_category = 1
@@ -351,6 +545,10 @@ BEGIN
AND COMMAND_CATEGORY_FILTERS.does_meet_name_filter = 1
)
)
AND (
v_is_super_user = 1
OR t_USER.id_user IS NOT NULL
)
AND (
a_get_inactive_command_category = 1
OR COMMAND_CATEGORY.active = 1
@@ -578,6 +776,8 @@ BEGIN
FROM fetchmetrics.DOG_Command COMMAND
INNER JOIN tmp_Command_Category_Calc_Command t_COMMAND_CATEGORY ON COMMAND.id_command_category = t_COMMAND_CATEGORY.id_command_category
LEFT JOIN Command_Filters COMMAND_FILTERS ON COMMAND.id_command = COMMAND_FILTERS.id_command
LEFT JOIN demo.DOG_Command_Category_User_Link COMMAND_CATEGORY_USER_LINK ON t_COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_USER_LINK.id_command_category
LEFT JOIN tmp_Calc_User_Access_Calc_Command t_USER ON COMMAND_CATEGORY_USER_LINK.id_user = t_USER.id_user
WHERE
(
a_get_all_command = 1
@@ -598,6 +798,10 @@ BEGIN
AND COMMAND_FILTERS.does_meet_notes_filter = 1
)
)
AND (
v_is_super_user = 1
OR t_USER.id_user IS NOT NULL
)
AND (
a_get_inactive_command = 1
OR COMMAND.active = 1
@@ -704,6 +908,8 @@ BEGIN
FROM fetchmetrics.DOG_Command COMMAND
INNER JOIN tmp_Command_Category_Calc_Command t_COMMAND_CATEGORY ON COMMAND.id_command_category = t_COMMAND_CATEGORY.id_command_category
LEFT JOIN Command_Filters COMMAND_FILTERS ON COMMAND.id_command = COMMAND_FILTERS.id_command
LEFT JOIN demo.DOG_Command_Category_User_Link COMMAND_CATEGORY_USER_LINK ON t_COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_USER_LINK.id_command_category
LEFT JOIN tmp_Calc_User_Access_Calc_Command t_USER ON COMMAND_CATEGORY_USER_LINK.id_user = t_USER.id_user
WHERE
(
a_get_all_command = 1
@@ -724,6 +930,10 @@ BEGIN
AND COMMAND_FILTERS.does_meet_notes_filter = 1
)
)
AND (
v_is_super_user = 1
OR t_USER.id_user IS NOT NULL
)
AND (
a_get_inactive_command = 1
OR COMMAND.active = 1
@@ -772,12 +982,15 @@ BEGIN
DELETE t_COMMAND
FROM tmp_Command_Calc_Command t_COMMAND
LEFT JOIN tmp_Command_Category_Calc_Command t_COMMAND_CATEGORY ON t_COMMAND.id_command_category = t_COMMAND_CATEGORY.id_command_category
LEFT JOIN demo.DOG_Command_Category_User_Link COMMAND_CATEGORY_USER_LINK ON t_COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_USER_LINK.id_command_category
LEFT JOIN tmp_Calc_User_Access_Calc_Command t_USER ON DOG_USER_LINK.id_user = t_USER.id_user
WHERE
(
a_require_all_id_search_filters_met = 1
AND (
t_COMMAND.does_meet_id_filters = 0
OR t_COMMAND_CATEGORY.does_meet_id_filters = 0
OR IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
)
OR (
@@ -785,17 +998,20 @@ BEGIN
AND (
t_COMMAND.does_meet_non_id_filters = 0
OR t_COMMAND_CATEGORY.does_meet_non_id_filters = 0
OR IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
)
OR (
a_require_any_id_search_filters_met = 1
AND t_COMMAND.does_meet_id_filters = 0
AND t_COMMAND_CATEGORY.does_meet_id_filters = 0
AND IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
OR (
a_require_any_non_id_search_filters_met = 1
AND t_COMMAND.does_meet_non_id_filters = 0
AND t_COMMAND_CATEGORY.does_meet_non_id_filters = 0
AND IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
;
@@ -812,30 +1028,36 @@ BEGIN
SELECT *
FROM tmp_Command_Category_Calc_Command t_COMMAND_CATEGORY
LEFT JOIN Category_And_Best_Command CATEGORY_BEST ON t_COMMAND_CATEGORY.id_command_category = CATEGORY_BEST.id_command_category
LEFT JOIN demo.DOG_Command_Category_User_Link COMMAND_CATEGORY_USER_LINK ON t_COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_USER_LINK.id_command_category
LEFT JOIN tmp_Calc_User_Access_Calc_Command t_USER ON DOG_USER_LINK.id_user = t_USER.id_user
WHERE
(
a_require_all_id_search_filters_met = 1
AND (
CATEGORY_BEST.does_meet_id_filters = 0
IFNULL(CATEGORY_BEST.does_meet_id_filters, 0) = 0
OR t_COMMAND_CATEGORY.does_meet_id_filters = 0
OR IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
)
OR (
a_require_all_non_id_search_filters_met = 1
AND (
CATEGORY_BEST.does_meet_non_id_filters = 0
IFNULL(CATEGORY_BEST.does_meet_non_id_filters, 0) = 0
OR t_COMMAND_CATEGORY.does_meet_non_id_filters = 0
OR IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
)
OR (
a_require_any_id_search_filters_met = 1
AND CATEGORY_BEST.does_meet_id_filters = 0
AND IFNULL(CATEGORY_BEST.does_meet_id_filters, 0) = 0
AND t_COMMAND_CATEGORY.does_meet_id_filters = 0
AND IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
OR (
a_require_any_non_id_search_filters_met = 1
AND CATEGORY_BEST.does_meet_non_id_filters = 0
AND IFNULL(CATEGORY_BEST.does_meet_non_id_filters, 0) = 0
AND t_COMMAND_CATEGORY.does_meet_non_id_filters = 0
AND IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
;
END IF;
@@ -852,12 +1074,15 @@ BEGIN
DELETE t_COMMAND_CATEGORY
FROM tmp_Command_Category_Calc_Command t_COMMAND_CATEGORY
LEFT JOIN Category_And_Best_Command CATEGORY_BEST ON t_COMMAND_CATEGORY.id_command_category = CATEGORY_BEST.id_command_category
LEFT JOIN demo.DOG_Command_Category_User_Link COMMAND_CATEGORY_USER_LINK ON t_COMMAND_CATEGORY.id_command_category = COMMAND_CATEGORY_USER_LINK.id_command_category
LEFT JOIN tmp_Calc_User_Access_Calc_Command t_USER ON DOG_USER_LINK.id_user = t_USER.id_user
WHERE
(
a_require_all_id_search_filters_met = 1
AND (
IFNULL(CATEGORY_BEST.does_meet_id_filters, 0) = 0
OR t_COMMAND_CATEGORY.does_meet_id_filters = 0
OR IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
)
OR (
@@ -865,103 +1090,30 @@ BEGIN
AND (
IFNULL(CATEGORY_BEST.does_meet_non_id_filters, 0) = 0
OR t_COMMAND_CATEGORY.does_meet_non_id_filters = 0
OR IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
)
OR (
a_require_any_id_search_filters_met = 1
AND IFNULL(CATEGORY_BEST.does_meet_id_filters, 0) = 0
AND t_COMMAND_CATEGORY.does_meet_id_filters = 0
AND IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
OR (
a_require_any_non_id_search_filters_met = 1
AND IFNULL(CATEGORY_BEST.does_meet_non_id_filters, 0) = 0
AND t_COMMAND_CATEGORY.does_meet_non_id_filters = 0
AND IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
;
END IF;
IF a_debug = 1 THEN
SELECT 'After filter Commands and Categories';
SELECT * FROM tmp_Command_Category_Calc_Command;
SELECT * FROM tmp_Command_Calc_Command;
-- SELECT * FROM tmp_Command_Category_Calc_Command;
-- SELECT * FROM tmp_Command_Calc_Command;
END IF;
-- Permissions
IF a_debug = 1 THEN
SELECT
a_guid -- 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_dog_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
;
END IF;
CALL fetchmetrics.p_dog_calc_user_access(
a_guid -- 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_dog_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT
IFNULL(CALC_USER_T.has_access, 0)
INTO
v_can_view
FROM fetchmetrics.DOG_Calc_User_Access_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = a_guid
LIMIT 1
;
IF a_debug = 1 THEN
SELECT v_can_view;
END IF;
IF (v_can_view = 0) THEN
DELETE t_ME
FROM tmp_Msg_Error_Calc_Command t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
;
INSERT INTO tmp_Msg_Error_Calc_Command (
id_type
, code
, msg
)
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to view Dogs and Commands.'
)
;
END IF;
CALL fetchmetrics.p_dog_clear_calc_user_access(
a_guid
, 0 -- a_debug
);
IF a_debug = 1 THEN
SELECT 'Before non-permitted data deletion';
SELECT * FROM tmp_Command_Category_Calc_Command;
@@ -1069,6 +1221,7 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error_Calc_Command;
DROP TEMPORARY TABLE IF EXISTS tmp_Command_Calc_Command;
DROP TEMPORARY TABLE IF EXISTS tmp_Command_Category_Calc_Command;
DROP TEMPORARY TABLE IF EXISTS tmp_Calc_User_Access_Calc_Command;
IF a_debug = 1 THEN
CALL fetchmetrics.p_core_debug_timing_reporting ( v_time_start );