From 9fe0857ad063073a1ff9701fa9afc506ea3a2636 Mon Sep 17 00:00:00 2001
From: Jan Kvetina <jan.kvetina@gmail.com>
Date: Wed, 5 Jan 2022 20:05:58 +0100
Subject: [PATCH] Moved fn to app package

---
 packages/app.spec.sql         | 10 ++++++++++
 packages/app.sql              | 20 ++++++++++++++++++++
 packages/app_actions.spec.sql | 10 ----------
 packages/app_actions.sql      | 22 +---------------------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/app.spec.sql b/packages/app.spec.sql
index 26ec0de..ee43280 100644
--- a/packages/app.spec.sql
+++ b/packages/app.spec.sql
@@ -304,6 +304,16 @@ CREATE OR REPLACE PACKAGE app AS
 
 
 
+    --
+    -- Get role name
+    --
+    FUNCTION get_role_name (
+        in_role_id              roles.role_id%TYPE
+    )
+    RETURN roles.role_name%TYPE;
+
+
+
 
 
 
diff --git a/packages/app.sql b/packages/app.sql
index 67cd319..bd6e170 100644
--- a/packages/app.sql
+++ b/packages/app.sql
@@ -607,6 +607,26 @@ CREATE OR REPLACE PACKAGE BODY app AS
 
 
 
+    FUNCTION get_role_name (
+        in_role_id              roles.role_id%TYPE
+    )
+    RETURN roles.role_name%TYPE
+    AS
+        out_name                roles.role_name%TYPE;
+    BEGIN
+        SELECT NVL(r.role_name, r.role_id) INTO out_name
+        FROM roles r
+        WHERE r.app_id          = app.get_app_id()
+            AND r.role_id       = in_role_id;
+        --
+        RETURN out_name;
+    EXCEPTION
+    WHEN NO_DATA_FOUND THEN
+        RETURN in_role_id;
+    END;
+
+
+
     FUNCTION get_page_id
     RETURN navigation.page_id%TYPE
     AS
diff --git a/packages/app_actions.spec.sql b/packages/app_actions.spec.sql
index 86dfeef..50caac5 100644
--- a/packages/app_actions.spec.sql
+++ b/packages/app_actions.spec.sql
@@ -61,16 +61,6 @@ CREATE OR REPLACE PACKAGE app_actions AS
 
 
 
-    --
-    --
-    --
-    FUNCTION get_role_name (
-        in_role_id              roles.role_id%TYPE
-    )
-    RETURN roles.role_name%TYPE;
-
-
-
     --
     --
     --
diff --git a/packages/app_actions.sql b/packages/app_actions.sql
index 2c8c24c..ff5bea2 100644
--- a/packages/app_actions.sql
+++ b/packages/app_actions.sql
@@ -109,26 +109,6 @@ CREATE OR REPLACE PACKAGE BODY app_actions AS
 
 
 
-    FUNCTION get_role_name (
-        in_role_id              roles.role_id%TYPE
-    )
-    RETURN roles.role_name%TYPE
-    AS
-        out_name                roles.role_name%TYPE;
-    BEGIN
-        SELECT NVL(r.role_name, r.role_id) INTO out_name
-        FROM roles r
-        WHERE r.app_id          = app.get_app_id()
-            AND r.role_id       = in_role_id;
-        --
-        RETURN out_name;
-    EXCEPTION
-    WHEN NO_DATA_FOUND THEN
-        RETURN in_role_id;
-    END;
-
-
-
     PROCEDURE prep_user_roles_pivot (
         in_page_id              apex_application_pages.page_id%TYPE
     ) AS
@@ -174,7 +154,7 @@ CREATE OR REPLACE PACKAGE BODY app_actions AS
             BEGIN
                 APEX_UTIL.SET_SESSION_STATE (
                     p_name      => 'P' || in_page_id || '_C' || LPAD(i, 3, 0),
-                    p_value     => get_role_name(RTRIM(v_desc(i).col_name, '_')),
+                    p_value     => app.get_role_name(RTRIM(v_desc(i).col_name, '_')),
                     p_commit    => FALSE
                 );
             EXCEPTION