Merge branch 'feature/batch-info-provider-import'

src/DataTables/Filters/Constraints/Part/BulkImportJobExistsConstraint.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\DataTables\Filters\Constraints\Part;
+
+use App\DataTables\Filters\Constraints\BooleanConstraint;
+use App\Entity\InfoProviderSystem\BulkInfoProviderImportJobPart;
+use Doctrine\ORM\QueryBuilder;
+
+class BulkImportJobExistsConstraint extends BooleanConstraint
+{
+
+    public function __construct()
+    {
+        parent::__construct('bulk_import_job_exists');
+    }
+
+    public function apply(QueryBuilder $queryBuilder): void
+    {
+        // Do not apply a filter if value is null (filter is set to ignore)
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        // Use EXISTS subquery to avoid join conflicts
+        $existsSubquery = $queryBuilder->getEntityManager()->createQueryBuilder();
+        $existsSubquery->select('1')
+            ->from(BulkInfoProviderImportJobPart::class, 'bip_exists')
+            ->where('bip_exists.part = part.id');
+
+        if ($this->value === true) {
+            // Filter for parts that ARE in bulk import jobs
+            $queryBuilder->andWhere('EXISTS (' . $existsSubquery->getDQL() . ')');
+        } else {
+            // Filter for parts that are NOT in bulk import jobs
+            $queryBuilder->andWhere('NOT EXISTS (' . $existsSubquery->getDQL() . ')');
+        }
+    }
+}

src/DataTables/Filters/Constraints/Part/BulkImportJobStatusConstraint.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\DataTables\Filters\Constraints\Part;
+
+use App\DataTables\Filters\Constraints\AbstractConstraint;
+use App\DataTables\Filters\Constraints\ChoiceConstraint;
+use App\Entity\InfoProviderSystem\BulkInfoProviderImportJobPart;
+use Doctrine\ORM\QueryBuilder;
+
+class BulkImportJobStatusConstraint extends ChoiceConstraint
+{
+
+    public function __construct()
+    {
+        parent::__construct('bulk_import_job_status');
+    }
+
+    public function apply(QueryBuilder $queryBuilder): void
+    {
+        // Do not apply a filter if values are empty or operator is null
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        // Use EXISTS subquery to check if part has a job with the specified status(es)
+        $existsSubquery = $queryBuilder->getEntityManager()->createQueryBuilder();
+        $existsSubquery->select('1')
+            ->from(BulkInfoProviderImportJobPart::class, 'bip_status')
+            ->join('bip_status.job', 'job_status')
+            ->where('bip_status.part = part.id');
+
+        // Add status conditions based on operator
+        if ($this->operator === 'ANY') {
+            $existsSubquery->andWhere('job_status.status IN (:job_status_values)');
+            $queryBuilder->andWhere('EXISTS (' . $existsSubquery->getDQL() . ')');
+            $queryBuilder->setParameter('job_status_values', $this->value);
+        } elseif ($this->operator === 'NONE') {
+            $existsSubquery->andWhere('job_status.status IN (:job_status_values)');
+            $queryBuilder->andWhere('NOT EXISTS (' . $existsSubquery->getDQL() . ')');
+            $queryBuilder->setParameter('job_status_values', $this->value);
+        }
+    }
+}

src/DataTables/Filters/Constraints/Part/BulkImportPartStatusConstraint.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace App\DataTables\Filters\Constraints\Part;
+
+use App\DataTables\Filters\Constraints\ChoiceConstraint;
+use App\Entity\InfoProviderSystem\BulkInfoProviderImportJobPart;
+use Doctrine\ORM\QueryBuilder;
+
+class BulkImportPartStatusConstraint extends ChoiceConstraint
+{
+    public function __construct()
+    {
+        parent::__construct('bulk_import_part_status');
+    }
+
+    public function apply(QueryBuilder $queryBuilder): void
+    {
+        // Do not apply a filter if values are empty or operator is null
+        if (!$this->isEnabled()) {
+            return;
+        }
+
+        // Use EXISTS subquery to check if part has the specified status(es)
+        $existsSubquery = $queryBuilder->getEntityManager()->createQueryBuilder();
+        $existsSubquery->select('1')
+            ->from(BulkInfoProviderImportJobPart::class, 'bip_part_status')
+            ->where('bip_part_status.part = part.id');
+
+        // Add status conditions based on operator
+        if ($this->operator === 'ANY') {
+            $existsSubquery->andWhere('bip_part_status.status IN (:part_status_values)');
+            $queryBuilder->andWhere('EXISTS (' . $existsSubquery->getDQL() . ')');
+            $queryBuilder->setParameter('part_status_values', $this->value);
+        } elseif ($this->operator === 'NONE') {
+            $existsSubquery->andWhere('bip_part_status.status IN (:part_status_values)');
+            $queryBuilder->andWhere('NOT EXISTS (' . $existsSubquery->getDQL() . ')');
+            $queryBuilder->setParameter('part_status_values', $this->value);
+        }
+    }
+}

src/DataTables/Filters/PartFilter.php

@@ -29,6 +29,9 @@ use App\DataTables\Filters\Constraints\DateTimeConstraint;
 use App\DataTables\Filters\Constraints\EntityConstraint;
 use App\DataTables\Filters\Constraints\IntConstraint;
 use App\DataTables\Filters\Constraints\NumberConstraint;
+use App\DataTables\Filters\Constraints\Part\BulkImportJobExistsConstraint;
+use App\DataTables\Filters\Constraints\Part\BulkImportJobStatusConstraint;
+use App\DataTables\Filters\Constraints\Part\BulkImportPartStatusConstraint;
 use App\DataTables\Filters\Constraints\Part\LessThanDesiredConstraint;
 use App\DataTables\Filters\Constraints\Part\ParameterConstraint;
 use App\DataTables\Filters\Constraints\Part\TagsConstraint;
@@ -102,6 +105,14 @@ class PartFilter implements FilterInterface
     public readonly TextConstraint $bomName;
     public readonly TextConstraint $bomComment;
 
+    /*************************************************
+     * Bulk Import Job tab
+     *************************************************/
+
+    public readonly BulkImportJobExistsConstraint $inBulkImportJob;
+    public readonly BulkImportJobStatusConstraint $bulkImportJobStatus;
+    public readonly BulkImportPartStatusConstraint $bulkImportPartStatus;
+
     public function __construct(NodesListBuilder $nodesListBuilder)
     {
         //Must be done for every new set of attachment filters, to ensure deterministic parameter names.
@@ -130,7 +141,7 @@ class PartFilter implements FilterInterface
          */
         $this->amountSum = (new IntConstraint('(
                     SELECT COALESCE(SUM(__partLot.amount), 0.0)
-                    FROM '.PartLot::class.' __partLot
+                    FROM ' . PartLot::class . ' __partLot
                     WHERE __partLot.part = part.id
                     AND __partLot.instock_unknown = false
                     AND (__partLot.expiration_date IS NULL OR __partLot.expiration_date > CURRENT_DATE())
@@ -166,6 +177,11 @@ class PartFilter implements FilterInterface
         $this->bomName = new TextConstraint('_projectBomEntries.name');
         $this->bomComment = new TextConstraint('_projectBomEntries.comment');
 
+        // Bulk Import Job filters
+        $this->inBulkImportJob = new BulkImportJobExistsConstraint();
+        $this->bulkImportJobStatus = new BulkImportJobStatusConstraint();
+        $this->bulkImportPartStatus = new BulkImportPartStatusConstraint();
+
     }
 
     public function apply(QueryBuilder $queryBuilder): void

src/DataTables/PartsDataTable.php

@@ -142,23 +142,25 @@ final class PartsDataTable implements DataTableTypeInterface
                 'label' => $this->translator->trans('part.table.storeLocations'),
                 //We need to use a aggregate function to get the first store location, as we have a one-to-many relation
                 'orderField' => 'NATSORT(MIN(_storelocations.name))',
-                'render' => fn ($value, Part $context) => $this->partDataTableHelper->renderStorageLocations($context),
+                'render' => fn($value, Part $context) => $this->partDataTableHelper->renderStorageLocations($context),
             ], alias: 'storage_location')
 
             ->add('amount', TextColumn::class, [
                 'label' => $this->translator->trans('part.table.amount'),
-                'render' => fn ($value, Part $context) => $this->partDataTableHelper->renderAmount($context),
+                'render' => fn($value, Part $context) => $this->partDataTableHelper->renderAmount($context),
                 'orderField' => 'amountSum'
             ])
             ->add('minamount', TextColumn::class, [
                 'label' => $this->translator->trans('part.table.minamount'),
-                'render' => fn($value, Part $context): string => htmlspecialchars($this->amountFormatter->format($value,
-                    $context->getPartUnit())),
+                'render' => fn($value, Part $context): string => htmlspecialchars($this->amountFormatter->format(
+                    $value,
+                    $context->getPartUnit()
+                )),
             ])
             ->add('partUnit', TextColumn::class, [
                 'label' => $this->translator->trans('part.table.partUnit'),
                 'orderField' => 'NATSORT(_partUnit.name)',
-                'render' => function($value, Part $context): string {
+                'render' => function ($value, Part $context): string {
                     $partUnit = $context->getPartUnit();
                     if ($partUnit === null) {
                         return '';
@@ -167,7 +169,7 @@ final class PartsDataTable implements DataTableTypeInterface
                     $tmp = htmlspecialchars($partUnit->getName());
 
                     if ($partUnit->getUnit()) {
-                        $tmp .= ' ('.htmlspecialchars($partUnit->getUnit()).')';
+                        $tmp .= ' (' . htmlspecialchars($partUnit->getUnit()) . ')';
                     }
                     return $tmp;
                 }
@@ -230,7 +232,7 @@ final class PartsDataTable implements DataTableTypeInterface
                     }
 
                     if (count($projects) > $max) {
-                        $tmp .= ", + ".(count($projects) - $max);
+                        $tmp .= ", + " . (count($projects) - $max);
                     }
 
                     return $tmp;
@@ -366,7 +368,7 @@ final class PartsDataTable implements DataTableTypeInterface
             $builder->addSelect(
                 '(
                     SELECT COALESCE(SUM(partLot.amount), 0.0)
-                    FROM '.PartLot::class.' partLot
+                    FROM ' . PartLot::class . ' partLot
                     WHERE partLot.part = part.id
                     AND partLot.instock_unknown = false
                     AND (partLot.expiration_date IS NULL OR partLot.expiration_date > CURRENT_DATE())
@@ -423,6 +425,13 @@ final class PartsDataTable implements DataTableTypeInterface
             //Do not group by many-to-* relations, as it would restrict the COUNT having clauses to be maximum 1
             //$builder->addGroupBy('_projectBomEntries');
         }
+        if (str_contains($dql, '_jobPart')) {
+            $builder->leftJoin('part.bulkImportJobParts', '_jobPart');
+            $builder->leftJoin('_jobPart.job', '_bulkImportJob');
+            //Do not group by many-to-* relations, as it would restrict the COUNT having clauses to be maximum 1
+            //$builder->addGroupBy('_jobPart');
+            //$builder->addGroupBy('_bulkImportJob');
+        }
 
         return $builder;
     }