Added some error checking to data source and added test cases to test…

… aggregation
ichikaway · May 1, 2013 · 0303bac · 0303bac
1 parent 2a3433b
commit 0303bac
Show file tree

Hide file tree

Showing 2 changed files with 157 additions and 5 deletions.
diff --git a/Model/Datasource/MongodbSource.php b/Model/Datasource/MongodbSource.php
@@ -1076,8 +1076,13 @@ public function read(Model $Model, $query = array(), $recursive = null) {
                 if(!empty($order)) {
                     $conditions['aggregate'][] = array('$sort' => $order);
                 }
-                $conditions['aggregate'][] = array('$skip' => $offset);
+                if (!empty($offset)) {
-                $conditions['aggregate'][] = array('$limit' => $limit);
+                    $conditions['aggregate'][] = array('$skip' => $offset);
+                }
+                if(!empty($limit))
+                {
+                    $conditions['aggregate'][] = array('$limit' => $limit);
+                }
 
                 $return = $this->_db
                     ->selectCollection($Model->table)

diff --git a/Test/Case/Datasource/MongodbSourceTest.php b/Test/Case/Datasource/MongodbSourceTest.php
@@ -53,9 +53,9 @@ class Post extends AppModel {
  		),
 	);
 
-	public $mongoSchema = array(
+    public $mongoSchema = array(
-		'title' => array('type' => 'string'),
+        'title' => array('type' => 'string'),
-		'body' => array('type' => 'string'),
+        'body' => array('type' => 'string'),
 		'text' => array('type' => 'text'),
 		'uniquefield1' => array('type' => 'text'),
 		'uniquefield2' => array('type' => 'text'),
@@ -228,6 +228,153 @@ public function dropData() {
 		}
 	}
 
+/**
+ * Tests aggregation case
+ *
+ * @return void
+ * @access public
+ */
+    public function testAggregation()
+    {
+        for ($i = 0; $i < 30; $i++) {
+            $saveData[$i]['Post'] = array(
+                'title' => 'test' . $i,
+                'body' => 'aaaa' . $i,
+                'text' => 'bbbb',
+                'count' => $i,
+            );
+        }
+
+        $saveData[30]['Post'] = array(
+            'title' => 'test1',
+            'body' => 'aaaa1',
+            'text' => 'bbbb1',
+            'count' => 1,
+        );
+        $saveData[31]['Post'] = array(
+            'title' => 'test2',
+            'body' => 'aaaa2',
+            'text' => 'bbbb2',
+            'count' => 2,
+        );
+
+        $this->Post->create();
+        $saveResult = $this->Post->saveAll($saveData);
+
+        $conditions = array(
+            'aggregate' => array(
+                array(
+                    '$match' => array(
+                        'text' => 'bbbb'
+                    )
+                ),
+                array(
+                    '$group' => array(
+                        '_id' => '$text',
+                        'count' => array(
+                            '$sum' => '$count'
+                        )
+                    )
+                ),
+                array(
+                    '$project' => array(
+                        'text' => '$_id',
+                        'count' => 1
+                    )
+                )
+            )
+        );
+
+        $result = $this->Post->find('all', array('conditions' => $conditions));
+
+        $expected = array(
+            'Post' => array(
+                '_id' => 'bbbb',
+                'count' => (29 * 30) / 2,
+                'text' => 'bbbb'
+            )
+        );
+
+        $this->assertEquals($expected, $result[0]);
+    }
+
+/**
+ * Tests another aggregation case
+ *
+ * @return void
+ * @access public
+ */
+    public function testAggregationCase1()
+    {
+        for ($i = 0; $i < 30; $i++) {
+            $saveData[$i]['Post'] = array(
+                'title' => 'test' . $i,
+                'body' => 'aaaa' . $i,
+                'text' => 'bbbb' . $i,
+                'count' => $i,
+            );
+        }
+
+        $saveData[30]['Post'] = array(
+            'title' => 'test1',
+            'body' => 'aaaa1',
+            'text' => 'bbbb1',
+            'count' => 1,
+        );
+        $saveData[31]['Post'] = array(
+            'title' => 'test2',
+            'body' => 'aaaa2',
+            'text' => 'bbbb2',
+            'count' => 2,
+        );
+
+        $this->Post->create();
+        $saveResult = $this->Post->saveAll($saveData);
+
+        $conditions = array(
+            'aggregate' => array(
+                array(
+                    '$group' => array(
+                        '_id' => '$title',
+                        'count' => array(
+                            '$sum' => 1
+                        )
+                    )
+                ),
+                array(
+                    '$project' => array(
+                        'title' => '$_id',
+                        'count' => 1,
+                        '_id' => 0
+                    )
+                ),
+                array(
+                    '$match' => array(
+                        'title' => array('$in' => array('test1', 'test2'))
+                    )
+                )
+            )
+        );
+
+        $result = $this->Post->find('all', array('conditions' => $conditions));
+
+        $expected = array(
+            array(
+                'Post' => array(
+                    'count' => 2,
+                    'title' => 'test1'
+                )
+            ),
+            array(
+                'Post' => array(
+                    'count' => 2,
+                    'title' => 'test2'
+                )
+            )
+        );
+
+        $this->assertEquals($expected, $result);
+    }
 
 /**
  * testCreateConnectionName