Fix JobInstances (#19)

Make `JobInstances` refer to the `Job` object rather than the `job_id`
string. This aligns  with the approach taken in the other classes.

Author: danmichaelo

spec/Conf/JobInstanceSpec.php

@@ -11,6 +11,7 @@ class JobInstanceSpec extends ObjectBehavior
 {
     public function let(AlmaClient $client, Job $job)
     {
+        $job->job_id = '123';
         $instanceId = '1108569450000121';
         $this->beConstructedWith($client, $job, $instanceId);
     }

spec/Conf/JobInstancesSpec.php

@@ -22,14 +22,14 @@ public function it_provides_a_lazy_interface_to_jobinstance_objects(AlmaClient $
 
         $jobId = '1108569450000121';
         $instanceId = '1108569450000121';
-        $jobInstance = $this->get($jobId, $instanceId);
+        $jobInstance = $this->get($instanceId);
         $jobInstance->shouldBeAnInstanceOf(JobInstance::class);
     }
 
-    public function it_provides_jobintances(AlmaClient $client)
+    public function it_provides_job_instances(AlmaClient $client)
     {
         $jobId = '1108569450000121';
-        $client->getJSON("/conf/jobs/{$jobId}/instances")
+        $client->getJSON("/conf/jobs/{$jobId}/instances?offset=0&limit=10")
             ->shouldBeCalled()
             ->willReturn(SpecHelper::getDummyData('jobinstances_response.json'));
 

src/Conf/Job.php

@@ -23,11 +23,11 @@ class Job extends LazyResource
      * @param Client $client
      * @param string $job_id
      */
-    public function __construct(Client $client, $job_id)
+    public function __construct(Client $client, string $job_id)
     {
         parent::__construct($client);
         $this->job_id = $job_id;
-        $this->instances = new JobInstances($client, $job_id);
+        $this->instances = new JobInstances($client, $this);
     }
 
     /**

src/Conf/JobInstance.php

@@ -10,8 +10,8 @@
  */
 class JobInstance extends LazyResource
 {
-    /** @var string */
-    public $job_id;
+    /** @var Job */
+    public $job;
 
     /** @var string */
     public $job_instance_id;
@@ -20,12 +20,12 @@ class JobInstance extends LazyResource
      * JobInstance constructor.
      *
      * @param Client $client
-     * @param string $job_id
+     * @param Job $job
      * @param string $job_instance_id
      */
-    public function __construct(Client $client, $job_id, $job_instance_id)
+    public function __construct(Client $client, Job $job, string $job_instance_id)
     {
-        $this->job_id = $job_id;
+        $this->job = $job;
         $this->job_instance_id = $job_instance_id;
         parent::__construct($client);
     }
@@ -49,6 +49,6 @@ protected function isInitialized($data)
      */
     protected function urlBase()
     {
-        return "/conf/jobs/{$this->job_id}/instances/{$this->job_instance_id}";
+        return "/conf/jobs/{$this->job->job_id}/instances/{$this->job_instance_id}";
     }
 }

src/Conf/JobInstances.php

@@ -16,32 +16,31 @@ class JobInstances extends SimplePaginatedList implements \ArrayAccess, \Countab
     use ReadOnlyArrayAccess;
     use IterableCollection;
 
-    /** @var string */
-    public $job_id;
+    /** @var Job */
+    public $job;
 
     /**
      * Job Instances constructor.
      *
      * @param Client $client
-     * @param string $job_id
+     * @param Job $job
      */
-    public function __construct(Client $client, $job_id)
+    public function __construct(Client $client, Job $job)
     {
-        $this->job_id = $job_id;
         parent::__construct($client, 'job_instance');
+        $this->job = $job;
     }
 
     /**
-     * Get a single Job Instance by its job_id and instance_id.
+     * Get a single Job Instance by its instance_id.
      *
-     * @param string $job_id
      * @param string $instance_id
      *
      * @return JobInstance
      */
-    public function get($job_id, $instance_id)
+    public function get(string $instance_id)
     {
-        return JobInstance::make($this->client, $job_id, $instance_id);
+        return JobInstance::make($this->client, $this->job, $instance_id);
     }
 
     /**
@@ -53,7 +52,7 @@ public function get($job_id, $instance_id)
      */
     protected function convertToResource($data)
     {
-        return JobInstance::make($this->client, $data->job_info->id, $data->id)
+        return JobInstance::make($this->client, $this->job, $data->id)
             ->init($data);
     }
 
@@ -64,6 +63,6 @@ protected function convertToResource($data)
      */
     protected function urlBase()
     {
-        return "/conf/jobs/{$this->job_id}/instances";
+        return "/conf/jobs/{$this->job->job_id}/instances";
     }
 }