Fix: Remove notes from bottom of sitemap.xml

This commit is contained in:
2025-08-13 13:05:23 +01:00
parent e5eee00beb
commit b1d34d951a
46 changed files with 891 additions and 260 deletions

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 fetchmetrics.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_no_permission 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);
SET v_priority_access_level_none := (SELECT ACCESS_LEVEL.priority FROM fetchmetrics.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'NONE' LIMIT 1);
SET v_priority_access_level_view := (SELECT ACCESS_LEVEL.priority FROM fetchmetrics.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.id_access_level = v_id_access_level_view);
CALL fetchmetrics.p_core_validate_guid ( a_guid );
@@ -131,7 +135,10 @@ BEGIN
SELECT
v_id_type_error_bad_data
, v_id_type_error_no_permission
, v_id_access_level_view
, v_id_permission_command_view
, v_priority_access_level_none
, v_priority_access_level_view
, v_time_start
;
END IF;
@@ -155,6 +162,7 @@ BEGIN
, can_view BIT
, can_edit BIT
, can_admin BIT
, active BIT
, does_meet_id_filters BIT
, does_meet_non_id_filters BIT
@@ -242,15 +250,20 @@ BEGIN
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;
SELECT
v_can_view
, v_is_super_user
;
END IF;
IF (v_can_view = 0) THEN
@@ -281,8 +294,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
@@ -294,14 +307,14 @@ BEGIN
, v_id_permission_command_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 fetchmetrics.p_dog_calc_user_access(
a_guid -- a_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
@@ -313,10 +326,10 @@ BEGIN
, v_id_permission_command_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_Command (
INSERT INTO tmp_Calc_User_Access_Calc_Location (
id_user
, id_role
, id_permission_required
@@ -327,6 +340,7 @@ BEGIN
, can_view
, can_edit
, can_admin
, active
, does_meet_id_filters
, does_meet_non_id_filters
)
@@ -341,15 +355,15 @@ 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 fetchmetrics.DOG_Calc_User_Access_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = v_guid
LIMIT 1
WHERE CALC_USER_T.GUID = a_guid
;
IF a_debug = 1 THEN
SELECT * FROM tmp_Calc_User_Access_Calc_Command;
SELECT * FROM tmp_Calc_User_Access_Calc_Location;
END IF;
CALL fetchmetrics.p_dog_clear_calc_user_access (
@@ -474,16 +488,34 @@ BEGIN
LOCATIONS.id_location
, CASE WHEN
v_has_filter_location_id = 0
OR LOCATIONS_FILTERS.does_meet_id_filter = 1
OR IFNULL(LOCATIONS_FILTERS.does_meet_id_filter, 0) = 1
THEN 1 ELSE 0 END AS does_meet_id_filters
, CASE WHEN
(
v_has_filter_location_name = 0
)
OR LOCATIONS_FILTERS.does_meet_name_filter = 1
OR IFNULL(LOCATIONS_FILTERS.does_meet_name_filter, 0) = 1
THEN 1 ELSE 0 END AS does_meet_non_id_filters
FROM fetchmetrics.DOG_Location LOCATIONS
LEFT JOIN Location_Filters LOCATIONS_FILTERS ON LOCATIONS.id_location = LOCATIONS_FILTERS.id_location
LEFT JOIN fetchmetrics.DOG_Location_User_Link LOCATION_USER_LINK
ON LOCATIONS.id_location = LOCATION_USER_LINK.id_location
AND (
(
a_get_inactive_location = 1
AND a_get_inactive_user = 1
)
OR LOCATION_USER_LINK.active = 1
)
LEFT JOIN tmp_Calc_User_Access_Calc_Location t_USER
ON LOCATION_USER_LINK.id_user = t_USER.id_user
AND (
a_get_inactive_user = 1
OR t_USER.active = 1
)
LEFT JOIN fetchmetrics.DOG_Access_Level ACCESS_LEVEL
ON LOCATION_USER_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
WHERE
(
a_get_all_location = 1
@@ -496,6 +528,13 @@ BEGIN
AND LOCATIONS_FILTERS.does_meet_name_filter = 1
)
)
AND (
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
)
)
AND (
a_get_inactive_location = 1
OR LOCATIONS.active = 1
@@ -557,6 +596,24 @@ BEGIN
THEN 1 ELSE 0 END AS does_meet_non_id_filters
FROM fetchmetrics.DOG_Location LOCATIONS
LEFT JOIN Location_Filters LOCATIONS_FILTERS ON LOCATIONS.id_location = LOCATIONS_FILTERS.id_location
LEFT JOIN fetchmetrics.DOG_Location_User_Link LOCATION_USER_LINK
ON LOCATIONS.id_location = LOCATION_USER_LINK.id_location
AND (
(
a_get_inactive_location = 1
AND a_get_inactive_user = 1
)
OR LOCATION_USER_LINK.active = 1
)
LEFT JOIN tmp_Calc_User_Access_Calc_Location t_USER
ON LOCATION_USER_LINK.id_user = t_USER.id_user
AND (
a_get_inactive_user = 1
OR t_USER.active = 1
)
LEFT JOIN fetchmetrics.DOG_Access_Level ACCESS_LEVEL
ON LOCATION_USER_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
WHERE
(
a_get_all_location = 1
@@ -569,6 +626,13 @@ BEGIN
AND LOCATIONS_FILTERS.does_meet_name_filter = 1
)
)
AND (
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
)
)
AND (
a_get_inactive_location = 1
OR LOCATIONS.active = 1
@@ -587,28 +651,88 @@ BEGIN
-- Filter records
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Calc_Location 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
WITH
Location_Access AS (
SELECT
LOCATIONS.id_location
, 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_location
, ROW_NUMBER() OVER (
PARTITION BY LOCATIONS.id_location
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_location
, 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 fetchmetrics.DOG_Location LOCATIONS
LEFT JOIN fetchmetrics.DOG_Location_User_Link LOCATION_USER_LINK
ON LOCATIONS.id_location = LOCATION_USER_LINK.id_location
AND (
(
a_get_inactive_location = 1
AND a_get_inactive_user = 1
)
OR LOCATION_USER_LINK.active = 1
)
LEFT JOIN tmp_Calc_User_Access_Calc_Location t_USER
ON LOCATION_USER_LINK.id_user = t_USER.id_user
AND (
a_get_inactive_user = 1
OR t_USER.active = 1
)
LEFT JOIN fetchmetrics.DOG_Access_Level ACCESS_LEVEL
ON LOCATION_USER_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
)
DELETE t_LOCATIONS
FROM tmp_Location_Calc_Location t_LOCATIONS
LEFT JOIN Location_Access LOCATION_ACCESS ON t_LOCATIONS.id_location = LOCATION_ACCESS.id_location
WHERE
(
a_require_all_id_search_filters_met = 1
AND (
t_LOCATIONS.does_meet_id_filters = 0
OR (
IFNULL(LOCATION_ACCESS.can_user_access_location, 0) = 0
AND IFNULL(LOCATION_ACCESS.does_user_meet_non_id_filters, 0) = 0
)
)
)
OR (
a_require_all_non_id_search_filters_met = 1
AND (
t_LOCATIONS.does_meet_non_id_filters = 0
OR (
IFNULL(LOCATION_ACCESS.can_user_access_location, 0) = 0
AND IFNULL(LOCATION_ACCESS.does_user_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_LOCATIONS.does_meet_id_filters = 0
AND (
IFNULL(LOCATION_ACCESS.can_user_access_location, 0) = 0
AND IFNULL(LOCATION_ACCESS.does_user_meet_non_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_LOCATIONS.does_meet_non_id_filters = 0
AND (
IFNULL(LOCATION_ACCESS.can_user_access_location, 0) = 0
AND IFNULL(LOCATION_ACCESS.does_user_meet_non_id_filters, 0) = 0
)
)
;
END IF;
@@ -742,6 +866,11 @@ CALL fetchmetrics.p_dog_calc_location (
, 0 -- a_get_inactive_location
, '' -- a_ids_location
, '' -- a_names_location
, 1 -- a_get_all_user
, 0 -- a_get_inactive_user
, '' -- a_ids_user
, '' -- a_names_user
, '' -- a_emails_user
, 0 -- a_require_all_id_search_filters_met
, 0 -- a_require_any_id_search_filters_met
, 0 -- a_require_all_non_id_search_filters_met
@@ -757,6 +886,11 @@ CALL fetchmetrics.p_dog_calc_location (
, 0 -- a_get_inactive_location
, '' -- a_ids_location
, 'pat,point' -- a_names_location
, 1 -- a_get_all_user
, 0 -- a_get_inactive_user
, '' -- a_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