Update RaLocation: remove institute from methods, add accessor

Author: Alex Rothuis

src/Surfnet/Stepup/Configuration/Entity/RaLocation.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Surfnet\Stepup\Identity\Entity;
+namespace Surfnet\Stepup\Configuration\Entity;
 
 use Surfnet\Stepup\Configuration\Value\ContactInformation;
 use Surfnet\Stepup\Configuration\Value\Institution;
@@ -10,42 +10,88 @@
 
 class RaLocation
 {
+    /**
+     * @var RaLocationId
+     */
+    private $raLocationId;
+
     /**
      * @var RaLocationName
      */
     private $locationName;
 
     /**
-     * @var RaLocationId
+     * @var Location
      */
-    private $raLocationId;
+    private $location;
 
     /**
      * @var ContactInformation
      */
     private $contactInformation;
 
     /**
-     * @var Institution
+     * @param RaLocationId $raLocationId
+     * @param RaLocationName $raLocationName
+     * @param Location $location
+     * @param ContactInformation $contactInformation
+     * @return RaLocation
      */
-    private $institution;
-
-    /**
-     * @var Location
-     */
-    private $location;
+    public static function create(
+        RaLocationId $raLocationId,
+        RaLocationName $raLocationName,
+        Location $location,
+        ContactInformation $contactInformation
+    ) {
+        return new self($raLocationId, $raLocationName, $location, $contactInformation);
+    }
 
-    public function __construct(
+    private function __construct(
         RaLocationId $raLocationId,
-        Institution $institution,
         RaLocationName $locationName,
         Location $location,
         ContactInformation $contactInformation
     ) {
         $this->raLocationId       = $raLocationId;
-        $this->institution        = $institution;
         $this->locationName       = $locationName;
         $this->location           = $location;
         $this->contactInformation = $contactInformation;
     }
+
+    public function hasRaLocationId(RaLocationId $raLocationId)
+    {
+        return $this->raLocationId->equals($raLocationId);
+    }
+
+    /**
+     * @return RaLocationId
+     */
+    public function getRaLocationId()
+    {
+        return $this->raLocationId;
+    }
+
+    /**
+     * @return RaLocationName
+     */
+    public function getLocationName()
+    {
+        return $this->locationName;
+    }
+
+    /**
+     * @return Location
+     */
+    public function getLocation()
+    {
+        return $this->location;
+    }
+
+    /**
+     * @return ContactInformation
+     */
+    public function getContactInformation()
+    {
+        return $this->contactInformation;
+    }
 }