fix: wrong query to fetch valid jobs

yawik · May 13, 2020 · 023e679 · 023e679
1 parent 8bbed5c
commit 023e679
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Controller/Plugin/AaResponseProcessor.php b/src/Controller/Plugin/AaResponseProcessor.php
@@ -125,7 +125,7 @@ public function process()
                     }
 
                     if ($errXml->ErrorCode == 'FLR_DataStore_110') {
-                        echo "Job [ " . $meta->getJobId() . " ] already online. Set actrion to update.\n";
+                        echo "Job [ " . $meta->getJobId() . " ] already online. Set action to update.\n";
                         $meta->updateStatus(JobMetaStatus::ONLINE, 'Already online on AA.');
                         $meta->setForceUpdate();
                         continue;
@@ -140,7 +140,7 @@ public function process()
 
             echo "-- Process valid jobs\n";
             $metas = $this->repository->createQueryBuilder()
-                ->field('status.name')->in([
+                ->field('status.state')->in([
                     JobMetaStatus::PENDING_ONLINE,
                     JobMetaStatus::PENDING_OFFLINE,
                 ])

diff --git a/src/JobFetcher/OrganizationJobFetcher.php b/src/JobFetcher/OrganizationJobFetcher.php
@@ -86,7 +86,7 @@ public function fetch(): iterable
                 || ($jobMeta->hasStatus(JobMetaStatus::OFFLINE) && !$job->isActive())
                 || (
                     $jobMeta->hasStatus(JobMetaStatus::ONLINE)
-                    && $job->isActive() && $job->getDateModified() <= $jobMeta->getDateModified()
+                    && $job->isActive() && $job->getDateModified() < $jobMeta->getDateModified()
                     && !$jobMeta->mustUpdate()
                 )
             ) {

diff --git a/src/JobFetcher/OrganizationJobFetcherFactory.php b/src/JobFetcher/OrganizationJobFetcherFactory.php
@@ -12,6 +12,7 @@
 
 namespace ExportBA\JobFetcher;
 
+use ExportBA\Entity\JobMetaData;
 use Interop\Container\ContainerInterface;
 
 /**
@@ -27,8 +28,11 @@ public function __invoke(
         ?string $requestedName = null,
         ?array $options = null
     ): OrganizationJobFetcher {
+        $repos = $container->get('repositories');
+
         return new OrganizationJobFetcher(
-            $container->get('repositories')->get('Jobs'),
+            $repos->get('Jobs'),
+            $repos->get(JobMetaData::class),
             $options
         );
     }