Fixed issue with non required join and filtering on case type.

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Fixed #87 Dataprocessors with required contact id filters throws "One of parameters (value: ) is not of the type Int" error for anonymous users by !77
 * Compatibility fix for Symfony 2.8, 3.4 and 4.0
+* Fixed issue with non required join and filtering on case type.
 
 # Version 1.34
 

Civi/DataProcessor/DataFlow/MultipleDataFlows/SimpleJoin.php

@@ -8,7 +8,9 @@ namespace Civi\DataProcessor\DataFlow\MultipleDataFlows;
 
 use Civi\DataProcessor\DataFlow\AbstractDataFlow;
 use Civi\DataProcessor\DataFlow\CombinedDataFlow\CombinedSqlDataFlow;
+use Civi\DataProcessor\DataFlow\CombinedDataFlow\SubqueryDataFlow;
 use Civi\DataProcessor\DataFlow\SqlDataFlow;
+use Civi\DataProcessor\DataFlow\SqlDataFlow\WhereClauseInterface;
 use Civi\DataProcessor\DataFlow\SqlTableDataFlow;
 use Civi\DataProcessor\DataSpecification\FieldExistsException;
 use Civi\DataProcessor\ProcessorType\AbstractProcessorType;
@@ -88,6 +90,11 @@ class SimpleJoin implements JoinInterface, SqlJoinInterface {
    */
   protected $right_source;
 
+  /**
+   * @var WhereClauseInterface[]
+   */
+  protected $filterClauses = array();
+
   /**
    * @var String
    *   The join type, e.g. INNER, LEFT, OUT etc..
@@ -112,6 +119,16 @@ class SimpleJoin implements JoinInterface, SqlJoinInterface {
     $this->type = $type;
   }
 
+  /**
+   * @param WhereClauseInterface $clause
+   *
+   * @return \Civi\DataProcessor\DataFlow\MultipleDataFlows\JoinInterface
+   */
+  public function addFilterClause(WhereClauseInterface $clause) {
+    $this->filterClauses[] = $clause;
+    return $this;
+  }
+
   /**
    * Returns true when this join has additional configuration
    *
@@ -194,7 +211,7 @@ class SimpleJoin implements JoinInterface, SqlJoinInterface {
   public function processConfiguration($submittedValues, SourceInterface $joinFromSource) {
     $left_prefix = $joinFromSource->getSourceName();
     $left_field = $this->correctFieldName($submittedValues['left_field'], $joinFromSource);
-    list($right_prefix, $right_field) = explode("::",$submittedValues['right_field'], 2);
+    [$right_prefix, $right_field] = explode("::",$submittedValues['right_field'], 2);
 
     $configuration = array(
       'left_prefix' => $left_prefix,
@@ -448,7 +465,26 @@ class SimpleJoin implements JoinInterface, SqlJoinInterface {
       $tablePart = $sourceDataFlowDescription->getDataFlow()->getTableStatement();
     }
 
-    return "{$this->type} JOIN {$tablePart} {$joinClause} ";
+    $extraClause  = "";
+    $dataFlow = $sourceDataFlowDescription->getDataFlow();
+    if ($dataFlow  instanceof  SqlTableDataFlow) {
+      $whereClauses = $dataFlow->getWhereClauses();
+      foreach($whereClauses as $whereClause) {
+        if ($whereClause->isJoinClause() && $whereClause) {
+          $this->filterClauses[] = $whereClause;
+          $dataFlow->removeWhereClause($whereClause);
+        }
+      }
+    }
+    if (count($this->filterClauses)) {
+      $extraClauses = array();
+      foreach($this->filterClauses as $filterClause) {
+        $extraClauses[] = $filterClause->getWhereClause();
+      }
+      $extraClause = " AND (".implode(" AND ", $extraClauses). ")";
+    }
+
+    return "{$this->type} JOIN {$tablePart} {$joinClause} {$extraClause}";
   }
 
   public function getLeftTable() {

Civi/DataProcessor/DataFlow/MultipleDataFlows/SimpleNonRequiredJoin.php

@@ -8,6 +8,7 @@ namespace Civi\DataProcessor\DataFlow\MultipleDataFlows;
 
 use Civi\DataProcessor\DataFlow\AbstractDataFlow;
 use Civi\DataProcessor\DataFlow\CombinedDataFlow\CombinedSqlDataFlow;
+use Civi\DataProcessor\DataFlow\CombinedDataFlow\SubqueryDataFlow;
 use Civi\DataProcessor\DataFlow\SqlDataFlow;
 use Civi\DataProcessor\DataFlow\SqlTableDataFlow;
 use Civi\DataProcessor\ProcessorType\AbstractProcessorType;
@@ -15,11 +16,6 @@ use Civi\DataProcessor\DataFlow\SqlDataFlow\WhereClauseInterface;
 
 class SimpleNonRequiredJoin  extends  SimpleJoin {
 
-  /**
-   * @var WhereClauseInterface[]
-   */
-  protected $filterClauses = array();
-
   public function __construct($left_prefix = null, $left_field = null, $right_prefix = null, $right_field = null, $type = "LEFT") {
     parent::__construct($left_prefix, $left_field, $right_prefix, $right_field, $type);
   }
@@ -34,68 +30,4 @@ class SimpleNonRequiredJoin  extends  SimpleJoin {
   }
 
 
-  /**
-   * @param WhereClauseInterface $clause
-   *
-   * @return \Civi\DataProcessor\DataFlow\MultipleDataFlows\JoinInterface
-   */
-  public function addFilterClause(WhereClauseInterface $clause) {
-    $this->filterClauses[] = $clause;
-    return $this;
-  }
-
-  /**
-   * Returns the SQL join statement
-   *
-   * For example:
-   *  INNER JOIN civicrm_contact source_3 ON source_3.id = source_2.contact_id
-   * OR
-   *  LEFT JOIN civicrm_contact source_3 ON source3.id = source_2.contact_id
-   *
-   * @param \Civi\DataProcessor\DataFlow\MultipleDataFlows\DataFlowDescription $sourceDataFlowDescription
-   *   The source data flow description used to genereate the join stament.
-   *
-   * @return string
-   */
-  public function getJoinClause(DataFlowDescription $sourceDataFlowDescription) {
-    $this->initialize();
-    $joinClause = "ON 1";
-    if ($this->left_table && $this->right_table && $sourceDataFlowDescription->getJoinSpecification()) {
-      $leftColumnName = "`{$this->left_table}`.`{$this->left_field}`";
-      if ($this->leftFieldSpec) {
-        $leftColumnName = $this->leftFieldSpec->getSqlColumnName($this->left_table);
-      }
-      $rightColumnName = "`{$this->right_table}`.`{$this->right_field}`";
-      if ($this->rightFieldSpec) {
-        $rightColumnName = $this->rightFieldSpec->getSqlColumnName($this->right_table);
-      }
-      $joinClause = "ON {$leftColumnName}  = {$rightColumnName}";
-    }
-    if ($sourceDataFlowDescription->getDataFlow() instanceof SqlDataFlow) {
-      $tablePart = $sourceDataFlowDescription->getDataFlow()->getTableStatement();
-    }
-
-    $extraClause  = "";
-    $dataFlow = $sourceDataFlowDescription->getDataFlow();
-    if ($dataFlow  instanceof  SqlDataFlow) {
-      $whereClauses = $dataFlow->getWhereClauses();
-      foreach($whereClauses as $whereClause) {
-        if ($whereClause->isJoinClause() && $whereClause) {
-          $this->filterClauses[] = $whereClause;
-          $dataFlow->removeWhereClause($whereClause);
-        }
-      }
-    }
-    if (count($this->filterClauses)) {
-      $extraClauses = array();
-      foreach($this->filterClauses as $filterClause) {
-        $extraClauses[] = $filterClause->getWhereClause();
-      }
-      $extraClause = " AND (".implode(" AND ", $extraClauses). ")";
-    }
-
-    return "{$this->type} JOIN {$tablePart} {$joinClause} {$extraClause}";
-  }
-
-
 }