Merge remote-tracking branch 'origin/master' into features/activity-form

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -4,6 +4,7 @@ namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Serializer\Annotation\Groups;
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 
@@ -22,6 +23,7 @@ class Address
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"write"})
      */
     private $id;
 
@@ -29,6 +31,7 @@ class Address
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @groups({"write"})
      */
     private $street = '';
 
@@ -36,6 +39,7 @@ class Address
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @groups({"write"})
      */
     private $streetNumber = '';
 
@@ -43,6 +47,7 @@ class Address
      * @var PostalCode
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     * @groups({"write"})
      */
     private $postcode;
 
@@ -50,6 +55,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $floor;
 
@@ -57,6 +63,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $corridor;
 
@@ -64,6 +71,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $steps;
 
@@ -71,6 +79,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"write"})
      */
     private $buildingName;
 
@@ -78,6 +87,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=16, nullable=true)
+     * @groups({"write"})
      */
     private $flat;
 
@@ -85,6 +95,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"write"})
      */
     private $distribution;
 
@@ -92,6 +103,7 @@ class Address
      * @var string|null
      *
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"write"})
      */
     private $extra;
 
@@ -102,6 +114,7 @@ class Address
      * @var \DateTime
      *
      * @ORM\Column(type="date")
+     * @groups({"write"})
      */
     private $validFrom;
 
@@ -112,11 +125,13 @@ class Address
      * @var \DateTime|null
      *
      * @ORM\Column(type="date", nullable=true)
+     * @groups({"write"})
      */
     private $validTo;
 
     /**
      * True if the address is a "no address", aka homeless person, ...
+     * @groups({"write"})
      *
      * @var bool
      */
@@ -128,6 +143,7 @@ class Address
      * @var Point|null
      *
      * @ORM\Column(type="point", nullable=true)
+     * @groups({"write"})
      */
     private $point;
 
@@ -137,6 +153,7 @@ class Address
      * @var ThirdParty|null
      *
      * @ORM\ManyToOne(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     * @groups({"write"})
      * @ORM\JoinColumn(nullable=true, onDelete="SET NULL")
      */
     private $linkedToThirdParty;

src/Bundle/ChillMainBundle/Entity/AddressReference.php

@@ -4,6 +4,7 @@ namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Doctrine\Model\Point;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity()
@@ -16,21 +17,25 @@ class AddressReference
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
+     * @groups({"read"})
      */
     private $id;
 
     /**
      * @ORM\Column(type="string", length=255)
+     * @groups({"read"})
      */
     private $refId;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $street;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $streetNumber;
 
@@ -38,16 +43,19 @@ class AddressReference
      * @var PostalCode
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
+     * @groups({"read"})
      */
     private $postcode;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $municipalityCode;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
+     * @groups({"read"})
      */
     private $source;
 
@@ -57,6 +65,7 @@ class AddressReference
      * @var Point
      *
      * @ORM\Column(type="point")
+     * @groups({"read"})
      */
     private $point;
 

src/Bundle/ChillMainBundle/Entity/Country.php

@@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * Country
@@ -20,6 +21,7 @@ class Country
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"read"})
      */
     private $id;
 
@@ -27,13 +29,16 @@ class Country
      * @var string
      *
      * @ORM\Column(type="json_array")
+     * @groups({"read"})
+     *
      */
     private $name;
-    
+
     /**
      * @var string
      *
      * @ORM\Column(type="string", length=3)
+     * @groups({"read"})
      */
     private $countryCode;
 
@@ -41,7 +46,7 @@ class Country
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function getId()
     {
@@ -57,20 +62,20 @@ class Country
     public function setName($name)
     {
         $this->name = $name;
-    
+
         return $this;
     }
 
     /**
      * Get name
      *
-     * @return string 
+     * @return string
      */
     public function getName()
     {
         return $this->name;
     }
-    
+
     /**
      * @return string
      */
@@ -90,12 +95,12 @@ class Country
 
     /**
      *
-     * @param string $countryCode            
+     * @param string $countryCode
      */
     public function setCountryCode($countryCode)
     {
         $this->countryCode = $countryCode;
         return $this;
     }
- 
+
 }

src/Bundle/ChillMainBundle/Entity/PostalCode.php

@@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * PostalCode
@@ -25,6 +26,7 @@ class PostalCode
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @groups({"read"})
      */
     private $id;
 
@@ -32,6 +34,7 @@ class PostalCode
      * @var string
      *
      * @ORM\Column(type="string", length=255, name="label")
+     * @groups({"read"})
      */
     private $name;
 
@@ -39,6 +42,7 @@ class PostalCode
      * @var string
      *
      * @ORM\Column(type="string", length=100)
+     * @groups({"read"})
      */
     private $code;
 
@@ -46,6 +50,7 @@ class PostalCode
      * @var Country
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Country")
+     * @groups({"read"})
      */
     private $country;