Check PI functions added to actions to reduce similar queries in all views

diff --git a/portal/actions.py b/portal/actions.py
index 38e70e8..8965a9f 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -24,8 +24,7 @@ import activity.slice
 #from sfa.util.xrn                import Xrn 
 
 
-# Get the list of authorities
-
+# Get the list of pis in a given authority
 def authority_get_pis(request, authority_hrn):
 
     # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
@@ -40,6 +39,45 @@ def authority_get_pis(request, authority_hrn):
     #return result['pi_users']
     return results
 
+#check the user is pi or not in the registry
+def authority_check_pis(request, user_email):
+    try:
+        user_query  = Query().get('local:user').filter_by('email', '==', user_email).select('user_id','email','password','config')
+        user_details = execute_admin_query(request, user_query)
+    
+        # getting the authority_hrn
+        for user_detail in user_details:
+            user_id = user_detail['user_id']
+            if user_detail['config']:
+                config = json.loads(user_detail['config'])
+                authority_hrn = config.get('authority','Unknown Authority')
+ 
+        account_query  = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config')
+        account_details = execute_admin_query(request, account_query)
+    
+        platform_query  = Query().get('local:platform').select('platform_id','platform')
+        platform_details = execute_admin_query(request, platform_query)
+    
+        for account_detail in account_details:
+            for platform_detail in platform_details:
+                if platform_detail['platform_id'] == account_detail['platform_id']:
+                    if 'myslice' in platform_detail['platform']:
+                        account_config = json.loads(account_detail['config'])
+                        user_hrn = account_config.get('user_hrn','N/A')
+
+        pi_status = False
+        pis = authority_get_pis (request, authority_hrn)
+        for pi in pis:
+            pi_list = pi['pi_users']
+
+        if user_hrn in pi_list:
+            pi_status = True
+        return pi_status
+
+    except Exception,e:
+        print "Exception in actions.py in authority_check_pis %s" % e
+        return None
+
 
 def authority_add_pis(request, authority_hrn,user_hrn):
 

diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index 8192033..1be4e82 100644 (file)
--- a/portal/manageuserview.py
+++ b/portal/manageuserview.py
@@ -3,7 +3,7 @@ from unfold.loginrequired               import LoginRequiredAutoLogoutView
 from manifold.core.query                import Query
 from manifoldapi.manifoldapi            import execute_query, execute_admin_query
 from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account
-from portal.actions                     import sfa_update_user, authority_get_pis, authority_add_pis, authority_remove_pis, clear_user_creds
+from portal.actions                     import sfa_update_user, authority_get_pis, authority_add_pis, authority_remove_pis,authority_check_pis ,clear_user_creds
 #
 from unfold.page                        import Page    
 from ui.topmenu                         import topmenu_items_live, the_user
@@ -191,12 +191,7 @@ class UserView(LoginRequiredAutoLogoutView, ThemeView):
             for t in itertools.izip_longest(total_platform_list)]
 
         ## check pi or no
-        pi_status = False
-        pis = authority_get_pis (self.request, authority_hrn)
-        for pi in pis:
-            pi_list = pi['pi_users']
-        if account_usr_hrn_myslice in pi_list:
-            pi_status = True
+        pi_status = authority_check_pis(self.request, user_email)
 
         context = super(UserView, self).get_context_data(**kwargs)
         context['principal_acc'] = principal_acc_list