- A lot of fixes made again in this patch

src/Repository.php

@@ -2,7 +2,7 @@
 
 namespace Ulmus;
 
-use Ulmus\Annotation\Property\{Field, Where, Having, Relation, Join, WithJoin, Relation\Ignore as RelationIgnore};
+use Ulmus\Annotation\Property\{ Field, Filter, FilterJoin, Where, Having, Relation, Join, WithJoin, Relation\Ignore as RelationIgnore };
 use Ulmus\Common\EntityResolver;
 
 class Repository
@@ -63,7 +63,7 @@ class Repository
 
     public function count() : int
     {
-        $this->removeQueryFragment($this->queryBuilder->getFragment(Query\Select::class));
+        $this->removeQueryFragment(Query\Select::class);
 
         if ( $this->queryBuilder->getFragment(Query\GroupBy::class) ) {
             $this->select( "DISTINCT COUNT(*) OVER ()" );
@@ -79,12 +79,12 @@ class Repository
         return Ulmus::runSelectQuery($this->queryBuilder, $this->adapter)->fetchColumn(0);
     }
 
-    protected function deleteOne()
+    public function deleteOne()
     {
         return $this->limit(1)->deleteSqlQuery()->runQuery();
     }
 
-    protected function deleteAll()
+    public function deleteAll()
     {
         return $this->deleteSqlQuery()->runQuery();
     }
@@ -125,7 +125,7 @@ class Repository
         }
     }
 
-    public function save(object $entity) : bool
+    public function save(object $entity, ? array $fieldsAndValue = null) : bool
     {
         if ( ! $this->matchEntity($entity) ) {
             throw new \Exception("Your entity class `" . get_class($entity) . "` cannot match entity type of repository `{$this->entityClass}`");
@@ -136,7 +136,7 @@ class Repository
         $primaryKeyDefinition = Ulmus::resolveEntity($this->entityClass)->getPrimaryKeyField();
 
         if ( ! $entity->isLoaded() ) {
-            $statement = $this->insertSqlQuery($dataset)->runQuery();
+            $statement = $this->insertSqlQuery($fieldsAndValue ?? $dataset)->runQuery();
 
             if ( ( 0 !== $statement->lastInsertId ) && 
                ( null !== $primaryKeyDefinition )) {
@@ -152,7 +152,9 @@ class Repository
                 throw new \Exception(sprintf("No primary key found for entity %s", $this->entityClass));
             }
 
-            if ( [] !== $diff = $this->generateDatasetDiff($entity) ) {
+            $diff = $fieldsAndValue ?? $this->generateDatasetDiff($entity);
+
+            if ( [] !== $diff ) {
                 $pkField = key($primaryKeyDefinition);
                 $pkFieldName = $primaryKeyDefinition[$pkField]->name ?? $pkField;
                 $this->where($pkFieldName, $dataset[$pkFieldName]);
@@ -211,13 +213,6 @@ class Repository
         }
     }
 
-    public function removeQueryFragment(? Query\Fragment $fragment) : self
-    {
-        $fragment && $this->queryBuilder->removeFragment($fragment);
-
-        return $this;
-    }
-
     public function selectEntity(string $entity, string $alias, string $prependField = "") : self
     {
         $prependField and ($prependField .= "$");
@@ -435,7 +430,6 @@ class Repository
             $this->select("{$this->alias}.*");
         }
 
-        # @TODO Apply FILTER annotation to this too !
         foreach(array_filter((array) $fields) as $item) {
             $annotation = $this->entityResolver->searchFieldAnnotation($item, new Join) ?:
                 $this->entityResolver->searchFieldAnnotation($item, new Relation);
@@ -467,6 +461,10 @@ class Repository
                     $this->having(is_object($condition->field) ? $condition->field : $entity::field($condition->field), $condition->value, $condition->operator);
                 }
 
+                foreach($this->entityResolver->searchFieldAnnotationList($item, new Filter() ) as $filter) {
+                    call_user_func_array([ $this->entityClass, $filter->method ], [ $this, $item ]);
+                }
+
                 $this->close();
 
                 $key = is_string($annotation->key) ? $this->entityClass::field($annotation->key) : $annotation->key;
@@ -488,6 +486,10 @@ class Repository
                             $join->where(is_object($field) ? $field : $entity::field($field, $alias), $condition->value, $condition->operator);
                         }
                     }
+
+                    foreach($this->entityResolver->searchFieldAnnotationList($item, new FilterJoin() ) as $filter) {
+                        call_user_func_array([ $this->entityClass, $filter->method ], [ $join, $item ]);
+                    }
                 });
             }
             else {
@@ -560,30 +562,6 @@ class Repository
         return $this;
     }
 
-    public function filterServerRequest(SearchRequest\SearchRequestInterface $searchRequest, bool $count = true) : self
-    {
-        if ($count) {
-            $searchRequest->count = $searchRequest->filter($this->serverRequestCountRepository())
-                ->wheres($searchRequest->wheres(), Query\Where::OPERATOR_EQUAL, Query\Where::CONDITION_AND)
-                ->likes($searchRequest->likes(), Query\Where::CONDITION_OR)
-                ->groups($searchRequest->groups())
-                ->count();
-        }
-
-        return $searchRequest->filter($this)
-            ->wheres($searchRequest->wheres(), Query\Where::OPERATOR_EQUAL, Query\Where::CONDITION_AND)
-            ->likes($searchRequest->likes(), Query\Where::CONDITION_OR)
-            ->orders($searchRequest->orders())
-            ->groups($searchRequest->groups())
-            ->offset($searchRequest->offset())
-            ->limit($searchRequest->limit());
-    }
-
-    protected function serverRequestCountRepository() : Repository
-    {
-        return new Repository\ServerRequestCountRepository($this->entityClass, $this->alias, $this->adapter);
-    }
-
     public function collectionFromQuery(? string $entityClass = null) : EntityCollection
     {
         $class = $entityClass ?: $this->entityClass;
@@ -677,7 +655,7 @@ class Repository
     public function createSqlQuery() : self
     {
         if ( null === $this->queryBuilder->getFragment(Query\Create::class) ) {
-            $this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList()), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
+            $this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
         }
 
         if ( null === $this->queryBuilder->getFragment(Query\Engine::class) ) {
@@ -689,6 +667,16 @@ class Repository
         return $this;
     }
 
+    public function alterSqlQuery(array $fields) : self
+    {
+        if ( null === $this->queryBuilder->getFragment(Query\Alter::class) ) {
+            $this->queryBuilder->create($this->escapeFieldList($this->entityResolver->fieldList(EntityResolver::KEY_ENTITY_NAME, true)), $this->escapeTable($this->entityResolver->tableName()), $this->entityResolver->schemaName());
+        }
+
+
+        return $this;
+    }
+
     protected function fromRow($row) : self
     {
 
@@ -770,4 +758,29 @@ class Repository
     }
 
     protected function finalizeQuery() : void {}
+
+    public function filterServerRequest(SearchRequest\SearchRequestInterface $searchRequest, bool $count = true) : self
+    {
+        if ($count) {
+            # @TODO Must be placed inside an event instead of directly there !
+            $searchRequest->count = $searchRequest->filter($this->serverRequestCountRepository())
+                ->wheres($searchRequest->wheres(), Query\Where::OPERATOR_EQUAL, Query\Where::CONDITION_AND)
+                ->likes($searchRequest->likes(), Query\Where::CONDITION_OR)
+                ->groups($searchRequest->groups())
+                ->count();
+        }
+
+        return $searchRequest->filter($this)
+            ->wheres($searchRequest->wheres(), Query\Where::OPERATOR_EQUAL, Query\Where::CONDITION_AND)
+            ->likes($searchRequest->likes(), Query\Where::CONDITION_OR)
+            ->orders($searchRequest->orders())
+            ->groups($searchRequest->groups())
+            ->offset($searchRequest->offset())
+            ->limit($searchRequest->limit());
+    }
+
+    protected function serverRequestCountRepository() : Repository
+    {
+        return new Repository\ServerRequestCountRepository($this->entityClass, $this->alias, $this->adapter);
+    }
 }