Merge pull request #54 from UIUCLibrary/i53

I53

Author: alexdryden

Module.php

@@ -1362,72 +1362,90 @@ public function siteUpdate(Event $event)
         $operation = $request->getOperation();
         $error_store = $event->getParam('errorStore');
 
-        if ($operation==='update' && array_key_exists('team', $request->getContent())){
 
-            //Add and remove TeamSites
-            //From each of those teams,
-            // update TeamReasource=>Item->ItemSite,
-            // update TeamUser=>User->DefaultSites, update
+        //entity not validated till after this event, so to avoid flushing them with invalid changes, validate here
+        $site_entity = new SiteAdapter();
 
+        //point to service locator
+        $site_entity->setServiceLocator($this->getServiceLocator());
 
-            //teams from the form
-            $form_teams = $request->getContent()['team'];
-            $site_id = $request->getId();
+        //validate hydrated entity
+        $site_entity->validateEntity($entity, $error_store);
+        if ($error_store->hasErrors()) {
+            $validationException = new Exception\ValidationException;
+            $validationException->setErrorStore($error_store);
+            throw $validationException;
+        } else {
 
-            //teams that site is a member of
-            $team_sites = $em->getRepository('Teams\Entity\TeamSite')->findBy(['site'=>$site_id]);
+            if ($operation === 'update' && array_key_exists('team', $request->getContent())) {
 
-            //array of existing teams ids
-            $existing_teams = array_map(function ($team_site) {return $team_site->getTeam()->getId();}, $team_sites);
+                //Add and remove TeamSites
+                //From each of those teams,
+                // update TeamReasource=>Item->ItemSite,
+                // update TeamUser=>User->DefaultSites, update
 
-            $added_teams = array_diff($form_teams, $existing_teams);
-            $removed_teams = array_diff($existing_teams, $form_teams);
 
-            foreach ($team_sites as $team_site):
-                if (in_array($team_site->getTeam()->getId(), $removed_teams)){
-                    $em->remove($team_site);
-                }
-            endforeach;
-            $em->flush();
+                //teams from the form
+                $form_teams = $request->getContent()['team'];
+                $site_id = $request->getId();
 
-            //add teams to the site for each new team listed in the form
-            foreach ($added_teams as $team):
-                $team_site = new TeamSite(
-                    $em->getRepository('Teams\Entity\Team')->findOneBy(['id' => $team]),
-                    $em->getRepository('Omeka\Entity\Site')->findOneBy(['id' => $site_id])
-                );
-                $em->persist($team_site);
-            endforeach;
-            $em->flush();
+                //teams that site is a member of
+                $team_sites = $em->getRepository('Teams\Entity\TeamSite')->findBy(['site' => $site_id]);
 
-            //get any items or users that need to be updated
-            //by either removing or adding item-sits or user default site
-            $delta_item_site = [];
-            $delta_user_site = [];
-            foreach (array_merge($added_teams, $removed_teams) as $team_id){
-                $delta_item_site[] = $em->getRepository('Teams\Entity\Team')
-                    ->findOneBy(['id'=>$team_id])
-                    ->getTeamResources();
-                $delta_user_site[] = $em->getRepository('Teams\Entity\Team')
-                    ->findOneBy(['id'=>$team_id])
-                    ->getTeamUsers();
-            }
+                //array of existing teams ids
+                $existing_teams = array_map(function ($team_site) {
+                    return $team_site->getTeam()->getId();
+                }, $team_sites);
+
+                $added_teams = array_diff($form_teams, $existing_teams);
+                $removed_teams = array_diff($existing_teams, $form_teams);
 
-            $logger = $this->getServiceLocator()->get('Omeka\Logger');
+                foreach ($team_sites as $team_site):
+                    if (in_array($team_site->getTeam()->getId(), $removed_teams)) {
+                        $em->remove($team_site);
+                    }
+                endforeach;
+                $em->flush();
 
-            foreach ($delta_item_site as $team_item_collection){
-                foreach ($team_item_collection as $team_item){
-                    $this->updateItemSites($team_item->getResource()->getId());
+                //add teams to the site for each new team listed in the form
+                foreach ($added_teams as $team):
+                    $team_site = new TeamSite(
+                        $em->getRepository('Teams\Entity\Team')->findOneBy(['id' => $team]),
+                        $em->getRepository('Omeka\Entity\Site')->findOneBy(['id' => $site_id])
+                    );
+                    $em->persist($team_site);
+                endforeach;
+                $em->flush();
+
+                //get any items or users that need to be updated
+                //by either removing or adding item-sits or user default site
+                $delta_item_site = [];
+                $delta_user_site = [];
+                foreach (array_merge($added_teams, $removed_teams) as $team_id) {
+                    $delta_item_site[] = $em->getRepository('Teams\Entity\Team')
+                        ->findOneBy(['id' => $team_id])
+                        ->getTeamResources();
+                    $delta_user_site[] = $em->getRepository('Teams\Entity\Team')
+                        ->findOneBy(['id' => $team_id])
+                        ->getTeamUsers();
                 }
-            }
 
-            //update current team users to include new site in their default sites
-            foreach ($delta_user_site as $team_users):
-                foreach ($team_users as $team_user):
+                $logger = $this->getServiceLocator()->get('Omeka\Logger');
+
+                foreach ($delta_item_site as $team_item_collection) {
+                    foreach ($team_item_collection as $team_item) {
+                        $this->updateItemSites($team_item->getResource()->getId());
+                    }
+                }
+
+                //update current team users to include new site in their default sites
+                foreach ($delta_user_site as $team_users):
+                    foreach ($team_users as $team_user):
                         $user_id = $team_user->getUser()->getId();
                         $this->updateUserSites($user_id);
+                    endforeach;
                 endforeach;
-            endforeach;
+            }
         }
     }