removing plural from model names. some cleanup

[plstackapi.git] / planetstack / model_policies / model_policy_User.py

diff --git a/planetstack/model_policies/model_policy_User.py b/planetstack/model_policies/model_policy_User.py
index cc8bbe6..5e2adad 100644 (file)
--- a/planetstack/model_policies/model_policy_User.py
+++ b/planetstack/model_policies/model_policy_User.py
@@ -1,32 +1,30 @@
 from core.models import *
 
 def handle(user):
-       from core.models import Deployment,SiteDeployment,UserDeployment
+       from core.models import Controller, ControllerSite, ControllerUser
        from collections import defaultdict
-       deployments = Deployment.objects.all()
-       site_deployments = SiteDeployment.objects.all()
-       site_deploy_lookup = defaultdict(list)
-       for site_deployment in site_deployments:
-               site_deploy_lookup[site_deployment.site].append(site_deployment.deployment)
+       ctrl_site_deployments = ControllerSite.objects.all()
+       controller_lookup = defaultdict(list)
+       for ctrl_site_deployment in ctrl_site_deployments:
+               controller_site_lookup[ctrl_site_deployment.site_deployment].append(ctrl_site_deployment)
 
-       user_deploy_lookup = defaultdict(list)
-       for user_deployment in UserDeployment.objects.all():
-               user_deploy_lookup[user_deployment.user].append(user_deployment.deployment)
+       controller_user_lookup = defaultdict(list)
+       for controller_user in ControllerUser.objects.all():
+               controller_user_lookup[controller_user.user].append(controller_user.controller)
    
-       all_deployments = Deployment.objects.filter() 
        if user.is_admin:
-               # admins should have an account at all deployments
-               expected_deployments = deployments
+               # admins should have an account at all controllers
+               expected_controllers = controllers
        else:
-               # normal users should have an account at their site's deployments
-               #expected_deployments = site_deploy_lookup[user.site]
-               # users are added to all deployments for now
-               expected_deployments = deployments        
+               # normal users should have an account at their site's controllers
+               #expected_controllers = controller_site_lookup[user.site]
+               # users are added to all controllers for now
+               expected_controllers = controllers        
 
-       for expected_deployment in expected_deployments:
-               if not user in user_deploy_lookup or \
-                 expected_deployment not in user_deploy_lookup[user]: 
+       for expected_controller in expected_controllers:
+               if not user in controller_user_lookup or \
+                 expected_controller not in controller_user_lookup[user]: 
                        # add new record
-                       ud = UserDeployment(user=user, deployment=expected_deployment)
+                       ud = ControllerUser(user=user, controller=expected_controller)
                        ud.save()