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

Fix: Remove notes from bottom of sitemap.xml

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-08-13 13:05:23 +01:00
parent e5eee00beb
commit b1d34d951a
46 changed files with 891 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
static/MySQL/00000_combined.sql
View File

@@ -35,6 +35,8 @@ BEGIN
DECLARE v_id_type_error_bad_data INT;
DECLARE v_id_type_error_no_permission INT;
DECLARE v_is_super_user BIT;
DECLARE v_priority_access_level_none INT;
DECLARE v_priority_access_level_view INT;
DECLARE v_time_start TIMESTAMP(6);
DECLARE exit handler for SQLEXCEPTION
@@ -91,7 +93,9 @@ BEGIN
SET v_id_type_error_no_permission := (SELECT ERROR_TYPE.id_type FROM demo.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 demo.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_VIEW' 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);
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_priority_access_level_view := (SELECT ACCESS_LEVEL.priority FROM demo.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.id_access_level = v_id_access_level_view);
CALL demo.p_core_validate_guid ( a_guid );
SET a_id_user := IFNULL(a_id_user, 0);
@@ -154,6 +158,7 @@ BEGIN
, can_view BIT
, can_edit BIT
, can_admin BIT
, active BIT
, does_meet_id_filters BIT
, does_meet_non_id_filters BIT
@@ -161,6 +166,8 @@ BEGIN
CREATE TEMPORARY TABLE tmp_Dog_Calc_Dog (
id_dog INT NOT NULL
, exists_valid_link BIT NOT NULL
, id_user INT
, does_meet_id_filters BIT NOT NULL
, does_meet_non_id_filters BIT NOT NULL
);
@@ -273,8 +280,8 @@ BEGIN
IF a_debug = 1 THEN
SELECT
a_guid -- guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_get_all_user -- get_all_user
, a_get_inactive_user -- get_inactive_user
, a_ids_user -- ids_user
, '' -- a_auth0_ids_user
, a_names_user -- a_names_user
@@ -286,14 +293,14 @@ BEGIN
, v_id_permission_dog_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, a_debug -- a_debug
, 0 -- a_debug
;
END IF;
CALL demo.p_dog_calc_user_access(
a_guid-- guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_get_all_user -- get_all_user
, a_get_inactive_user -- get_inactive_user
, a_ids_user -- ids_user
, '' -- a_auth0_ids_user
, a_names_user -- a_names_user
@@ -305,7 +312,7 @@ BEGIN
, v_id_permission_dog_view -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, a_debug -- a_debug
, 0 -- a_debug
);
INSERT INTO tmp_Calc_User_Access_Calc_Dog (
@@ -319,6 +326,7 @@ BEGIN
, can_view
, can_edit
, can_admin
, active
, does_meet_id_filters
, does_meet_non_id_filters
)
@@ -333,11 +341,11 @@ BEGIN
, CALC_USER_T.can_view
, CALC_USER_T.can_edit
, CALC_USER_T.can_admin
, CALC_USER_T.active
, CALC_USER_T.does_meet_id_filters
, CALC_USER_T.does_meet_non_id_filters
FROM demo.DOG_Calc_User_Access_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = a_guid
LIMIT 1
;
IF a_debug = 1 THEN
@@ -473,6 +481,8 @@ BEGIN
ELSE
INSERT INTO tmp_Dog_Calc_Dog (
id_dog
, exists_valid_link
, id_user
, does_meet_id_filters
, does_meet_non_id_filters
)
@@ -507,9 +517,55 @@ BEGIN
FROM Dog_Name_Filter DOG_NAME_FILTER
) DOG_COMBINED
GROUP BY DOG_COMBINED.id_dog
)
, Dog_Access AS (
SELECT
DOG.id_dog
, CASE WHEN
v_is_super_user = 1
OR (
t_USER.id_user IS NOT NULL
AND IFNULL(ACCESS_LEVEL.priority, v_priority_access_level_none) <= v_priority_access_level_view
)
THEN 1 ELSE 0 END AS exists_valid_link
, ROW_NUMBER() OVER (
PARTITION BY DOG.id_dog
ORDER BY
CASE WHEN
v_is_super_user = 1
OR (
t_USER.id_user IS NOT NULL
AND IFNULL(ACCESS_LEVEL.priority, v_priority_access_level_none) <= v_priority_access_level_view
)
THEN 1 ELSE 0 END DESC
, t_USER.does_meet_id_filters DESC
, t_USER.does_meet_non_id_filters DESC
) AS index_link_in_dog
, t_USER.id_user
FROM demo.DOG_Dog DOG
LEFT JOIN demo.DOG_Dog_User_Link DOG_USER_LINK
ON DOG.id_dog = DOG_USER_LINK.id_dog
AND (
(
a_get_inactive_dog = 1
AND a_get_inactive_user = 1
)
OR DOG_USER_LINK.active = 1
)
LEFT JOIN tmp_Calc_User_Access_Calc_Dog t_USER
ON DOG_USER_LINK.id_user = t_USER.id_user
AND (
a_get_inactive_user = 1
OR t_USER.active = 1
)
LEFT JOIN demo.DOG_Access_Level ACCESS_LEVEL
ON DOG_USER_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
)
SELECT
DOG.id_dog
, IFNULL(DOG_ACCESS.exists_valid_link, 0) AS exists_valid_link
, DOG_ACCESS.id_user
, CASE WHEN
v_has_filter_dog_id = 0
OR IFNULL(DOG_FILTERS.does_meet_id_filter, 0) = 1
@@ -522,8 +578,9 @@ BEGIN
THEN 1 ELSE 0 END AS does_meet_non_id_filters
FROM demo.DOG_Dog DOG
LEFT JOIN Dog_Filters DOG_FILTERS ON DOG.id_dog = DOG_FILTERS.id_dog
LEFT JOIN demo.DOG_Dog_User_Link DOG_USER_LINK ON DOG.id_dog = DOG_USER_LINK.id_dog
LEFT JOIN tmp_Calc_User_Access_Calc_Dog t_USER ON DOG_USER_LINK.id_user = t_USER.id_user
LEFT JOIN Dog_Access DOG_ACCESS
ON DOG.id_dog = DOG_ACCESS.id_dog
AND DOG_ACCESS.index_link_in_dog = 1
WHERE
(
a_get_all_dog = 1
@@ -536,10 +593,7 @@ BEGIN
AND DOG_FILTERS.does_meet_name_filter = 1
)
)
AND (
v_is_super_user = 1
OR t_USER.id_user IS NOT NULL
)
AND IFNULL(DOG_ACCESS.exists_valid_link, 0) = 1
AND (
a_get_inactive_dog = 1
OR DOG.active = 1
@@ -558,34 +612,100 @@ BEGIN
-- Filter records
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Dog 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
/*
WITH
Dog_Access AS (
SELECT
DOG.id_dog
, CASE WHEN
v_is_super_user = 1
OR (
t_USER.id_user IS NOT NULL
AND IFNULL(ACCESS_LEVEL.priority, v_priority_access_level_none) <= v_priority_access_level_view
)
THEN 1 ELSE 0 END AS can_user_access_dog
, ROW_NUMBER() OVER (
PARTITION BY DOG.id_dog
ORDER BY CASE WHEN
v_is_super_user = 1
OR (
t_USER.id_user IS NOT NULL
AND IFNULL(ACCESS_LEVEL.priority, v_priority_access_level_none) <= v_priority_access_level_view
)
THEN 1 ELSE 0 END DESC
) AS index_link_in_dog
, t_USER.does_meet_id_filters AS does_user_meet_id_filters
, t_USER.does_meet_non_id_filters AS does_user_meet_non_id_filters
FROM demo.DOG_Dog DOG
LEFT JOIN demo.DOG_Dog_User_Link DOG_USER_LINK
ON DOG.id_dog = DOG_USER_LINK.id_dog
AND (
(
a_get_inactive_dog = 1
AND a_get_inactive_user = 1
)
OR DOG_USER_LINK.active = 1
)
LEFT JOIN tmp_Calc_User_Access_Calc_Dog t_USER
ON DOG_USER_LINK.id_user = t_USER.id_user
AND (
a_get_inactive_user = 1
OR t_USER.active = 1
)
LEFT JOIN demo.DOG_Access_Level ACCESS_LEVEL
ON DOG_USER_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
)
*/
DELETE t_DOG
FROM tmp_Dog_Calc_Dog t_DOG
LEFT JOIN demo.DOG_Dog_User_Link DOG_USER_LINK ON t_DOG.id_dog = DOG_USER_LINK.id_dog
LEFT JOIN tmp_Calc_User_Access_Calc_Dog t_USER ON DOG_USER_LINK.id_user = t_USER.id_user
/*
LEFT JOIN Dog_Access DOG_ACCESS
ON t_DOG.id_dog = DOG_ACCESS.id_dog
AND DOG_ACCESS.index_link_in_dog = 1
*/
-- LEFT JOIN demo.DOG_Dog_User_Link DOG_USER_LINK ON t_DOG.id_dog = DOG_USER_LINK.id_dog
LEFT JOIN tmp_Calc_User_Access_Calc_Dog t_USER ON t_DOG.id_user = t_USER.id_user
WHERE
(
a_require_all_id_search_filters_met = 1
AND (
t_DOG.does_meet_id_filters = 0
OR IFNULL(t_USER.does_meet_id_filters, 0) = 0
OR (
t_DOG.exists_valid_link = 0
-- AND IFNULL(DOG_ACCESS.does_user_meet_id_filters, 0) = 0
AND IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
)
)
OR (
a_require_all_non_id_search_filters_met = 1
AND (
t_DOG.does_meet_non_id_filters = 0
OR IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
OR (
t_DOG.exists_valid_link = 0
-- AND IFNULL(DOG_ACCESS.does_user_meet_non_id_filters, 0) = 0
AND IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
)
)
OR (
a_require_any_id_search_filters_met = 1
a_require_any_id_search_filters_met = 1
AND t_DOG.does_meet_id_filters = 0
AND IFNULL(t_USER.does_meet_id_filters, 0) = 0
AND (
t_DOG.exists_valid_link = 0
-- AND IFNULL(DOG_ACCESS.does_user_meet_id_filters, 0) = 0
AND IFNULL(t_USER.does_meet_id_filters, 0) = 0
)
)
OR (
a_require_any_non_id_search_filters_met = 1
a_require_any_non_id_search_filters_met = 1
AND t_DOG.does_meet_non_id_filters = 0
AND IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
AND (
t_DOG.exists_valid_link = 0
-- AND IFNULL(DOG_ACCESS.does_user_meet_non_id_filters, 0) = 0
AND IFNULL(t_USER.does_meet_non_id_filters, 0) = 0
)
)
;
END IF;
@@ -667,6 +787,9 @@ END //
DELIMITER ;
/*
CALL demo.p_dog_calc_dog (
'slips ' -- a_guid
, 1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user
@@ -688,6 +811,25 @@ CALL demo.p_dog_calc_dog (
);
CALL demo.p_dog_calc_dog (
'slips ' -- a_guid
, 1 -- 'auth0|6582b95c895d09a70ba10fef', -- a_id_user
, 1 -- a_get_all_dog
, 0 -- a_get_inactive_dog
, '' -- a_ids_dog
, 'pat' -- a_names_dog
, 1 -- a_get_all_user
, 0 -- a_get_inactive_user
, '' -- a_ids_user
, 'pat' -- a_names_user
, 'pat' -- 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
, 1 -- a_require_any_non_id_search_filters_met
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT *
FROM demo.DOG_Dog_Temp
@@ -698,3 +840,4 @@ CALL demo.p_dog_clear_calc_dog (
, 1 -- debug
);
*/