Merge pull request #539 from cross-solution/develop

Release 0.33.3

Author: cbleek

module/Jobs/src/Entity/Decorator/JsonLdProvider.php

@@ -31,7 +31,7 @@ class JsonLdProvider implements JsonLdProviderInterface
     /**
      * the decorated job entity.
      *
-     * @var \Jobs\Entity\JobInterface
+     * @var \Jobs\Entity\JobInterface|\Jobs\Entity\Job
      */
     private $job;
 
@@ -63,7 +63,6 @@ public function toJsonLd()
             '@type' => 'JobPosting',
             'title' => $this->job->getTitle(),
             'description' => $this->getDescription($this->job->getTemplateValues()),
-            'rate' => $this->getRate(),
             'datePosted' => $dateStart,
             'identifier' => [
                 '@type' => 'PropertyValue',
@@ -82,6 +81,8 @@ public function toJsonLd()
             'validThrough' => $dateEnd
         ];
 
+        $array += $this->generateSalary();
+
         return Json::encode($array);
     }
 
@@ -138,17 +139,24 @@ private function getDescription(TemplateValuesInterface $values)
         return $description;
     }
 
-    /**
-     * Generates a rate from salary entity
-     *
-     * @return string
-     */
-    private function getRate()
+    private function generateSalary()
     {
         $salary = $this->job->getSalary();
 
-        return ($salary && !is_null($salary->getValue())) ?
-            ($salary->getValue() . ' ' . $salary->getCurrency() . '/' . $salary->getUnit()) :
-            /*@translate*/ 'Undefined';
+        if (!$salary || null === $salary->getValue()) {
+            return [];
+        }
+
+        return [
+            'baseSalary' => [
+                '@type' => 'MonetaryAmount',
+                'currency' => $salary->getCurrency(),
+                'value' => [
+                    '@type' => 'QuantitiveValue',
+                    'value' => $salary->getValue(),
+                    'unitText' => $salary->getUnit()
+                ],
+            ],
+        ];
     }
 }

module/Jobs/test/JobsTest/Entity/Decorator/JsonLdProviderTest.php

@@ -16,6 +16,7 @@
 use Jobs\Entity\Job;
 use Jobs\Entity\JsonLdProviderInterface;
 use Jobs\Entity\Location;
+use Jobs\Entity\Salary;
 use Organizations\Entity\Organization;
 use Organizations\Entity\OrganizationName;
 
@@ -43,13 +44,16 @@ class JsonLdProviderTest extends \PHPUnit_Framework_TestCase
         '@testInheritance' => ['as_reflection' => true],
         '@testConstructSetsJob' => false,
         '@testGeneratesJsonLdWithoutOrganizationAndDate' => [
-            'args' => 'getJobWoOrgAndDate'
+            'args' => 'getJobWoOrgAndDate',
         ],
+        '@testGeneratesJsonLdWithSalary' => [
+            'args' => 'getJobWithSalary',
+        ]
     ];
 
     private $inheritance = [ JsonLdProviderInterface::class ];
 
-    private function getJob($withOrganization=true, $withDatePublishStart=true)
+    private function getJob($withOrganization=true, $withDatePublishStart=true, $withSalary=false)
     {
         $job = new Job();
         $organization = new Organization();
@@ -67,6 +71,10 @@ private function getJob($withOrganization=true, $withDatePublishStart=true)
         $locations->add($location);
         $job->setLocations($locations);
 
+        if ($withSalary) {
+            $job->getSalary()->setValue(1000)->setCurrency('EUR')->setUnit(Salary::UNIT_DAY);
+        }
+
         return [$job];
     }
 
@@ -75,6 +83,11 @@ private function getJobWoOrgAndDate()
         return $this->getJob(false, false);
     }
 
+    private function getJobWithSalary()
+    {
+        return $this->getJob(false, false, true);
+    }
+
     public function testConstructSetsJob()
     {
         $job = new Job();
@@ -102,4 +115,34 @@ public function testGeneratesJsonLdWithoutOrganizationAndDate()
 
         $this->assertNull($array['datePosted']);
     }
+
+    public function testGeneratesJsonLdWithoutSalary()
+    {
+        $json = $this->target->toJsonLd();
+
+        $array = json_decode($json, JSON_OBJECT_AS_ARRAY);
+
+        $this->assertArrayNotHasKey('baseSalary', $array);
+    }
+
+    public function testGeneratesJsonLdWithSalary()
+    {
+        $json = $this->target->toJsonLd();
+
+        $array = json_decode($json, JSON_OBJECT_AS_ARRAY);
+
+        $this->assertArrayHasKey('baseSalary', $array);
+
+        $expect = [
+            '@type' => 'MonetaryAmount',
+            'currency' => 'EUR',
+            'value' => [
+                '@type' => 'QuantitiveValue',
+                'value' => 1000,
+                'unitText' => Salary::UNIT_DAY,
+            ],
+        ];
+
+        $this->assertEquals($expect, $array['baseSalary']);
+    }
 }