fixed mapping of dict keys from mapped columns, including suggestions from copilot

Author: s3inlc

src/dba/AbstractModelFactory.class.php

@@ -228,21 +228,19 @@ public function update(AbstractModel $model): PDOStatement {
 
     $query = "UPDATE " . $this->getMappedModelTable() . " SET ";
 
+    $values = array_values($dict);
     $keys = self::getMappedModelKeys($model);
-    $values = array();
 
     for ($i = 0; $i < count($keys); $i++) {
       if ($i != count($keys) - 1) {
-        $query = $query . $keys[$i] . "=?,";
-        $values[] = $dict[$keys[$i]];
+        $query .= $keys[$i] . "=?, ";
       }
       else {
-        $query = $query . $keys[$i] . "=?";
-        $values[] = $dict[$keys[$i]];
+        $query .= $keys[$i] . "=?";
       }
     }
 
-    $query = $query . " WHERE " . $model->getPrimaryKey() . "=?";
+    $query .= " WHERE " . $model->getPrimaryKey() . "=?";
     $values[] = $model->getPrimaryKeyValue();
 
     $stmt = $this->getDB()->prepare($query);

src/dba/PaginationFilter.class.php

@@ -36,7 +36,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals
       $table = $factory->getMappedModelTable() . ".";
     }
 
-    $parts = array_map(fn($filter) => $filter->getQueryString(), $this->filters);
+    $parts = array_map(fn($filter) => $filter->getQueryString($factory, true), $this->filters);
     //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType 
     //    where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) 
     //    ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25;
@@ -60,4 +60,4 @@ function getHasValue(): bool {
     }
     return true;
   }
-}
+}

src/dba/UpdateSet.class.php

@@ -16,6 +16,7 @@ function getQuery(AbstractModelFactory $factory, bool $includeTable = false): st
     if ($includeTable) {
       $table = $factory->getMappedModelTable() . ".";
     }
+    
     return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=?";
   }
 

src/dba/models/AbstractModelFactory.template.txt

@@ -35,7 +35,7 @@ class __MODEL_NAME__Factory extends AbstractModelFactory {
    * @param array $dict
    * @return __MODEL_NAME__
    */
-  function createObjectFromDict($pk, $dict): __MODEL_NAME__ {
+  function createObjectFromDict($pk, $dict): __MODEL_NAME__ {__MODEL_MAPPING_DICT__
     return new __MODEL_NAME__(__MODEL__DICT2__);
   }
 

src/dba/models/HealthCheckAgentFactory.class.php

@@ -36,6 +36,7 @@ function getNullObject(): HealthCheckAgent {
    * @return HealthCheckAgent
    */
   function createObjectFromDict($pk, $dict): HealthCheckAgent {
+    $dict['end'] = $dict['htp_end'];
     return new HealthCheckAgent($dict['healthCheckAgentId'], $dict['healthCheckId'], $dict['agentId'], $dict['status'], $dict['cracked'], $dict['numGpus'], $dict['start'], $dict['end'], $dict['errors']);
   }
 

src/dba/models/generator.php

@@ -596,8 +596,9 @@ function getTypingType($str, $nullable = false): string {
   $class = file_get_contents(dirname(__FILE__) . "/AbstractModelFactory.template.txt");
   $class = str_replace("__MODEL_NAME__", $NAME, $class);
   $class = str_replace("__MODEL_DBA_MAPPING__", (array_key_exists("dba_mapping", $MODEL_CONF) ? ($MODEL_CONF['dba_mapping'] ? 'True' : 'False') : 'False'), $class);
-  $dict = array();
-  $dict2 = array();
+  $dict = [];
+  $dict2 = [];
+  $mapping = [];
   foreach ($COLUMNS as $COLUMN) {
     $col = $COLUMN['name'];
     if (sizeof($dict) == 0) {
@@ -607,10 +608,19 @@ function getTypingType($str, $nullable = false): string {
     else {
       $dict[] = "null";
       $dict2[] = "\$dict['$col']";
+      if (array_key_exists("dba_mapping", $COLUMN) && $COLUMN['dba_mapping']) {
+        $mapping[] = "\$dict['$col'] = \$dict['htp_$col'];";
+      }
     }
   }
   $class = str_replace("__MODEL_DICT__", implode(", ", $dict), $class);
   $class = str_replace("__MODEL__DICT2__", implode(", ", $dict2), $class);
+  if (count($mapping) > 0) {
+    $class = str_replace("__MODEL_MAPPING_DICT__", "\n    " . implode("\n    ", $mapping), $class);
+  }
+  else {
+    $class = str_replace("__MODEL_MAPPING_DICT__", "", $class);
+  }
 
   file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.class.php", $class);
 }