fix fetching of the documents

petrjanda · Apr 27, 2012 · 2ee4369 · 2ee4369
1 parent d852b90
commit 2ee4369
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/lib/repository/couchRepository.js b/lib/repository/couchRepository.js
@@ -67,8 +67,8 @@ CouchRepository.prototype.storeEvent = function(aggregateId, name, attrs, callba
  */
 CouchRepository.prototype.getEventsByAggregate = function(aggregateId, callback) {
   var self = this,
-  startKey = '["' + aggregateId + '",0]',
+  startKey = '["' + aggregateId + '","0"]',
-  endKey = '["' + aggregateId + '",9999999999999]',
+  endKey = '["' + aggregateId + '","9999999999999999"]',
   params = '?startkey=' + startKey + '&endkey=' + endKey;
 
   this.start = new Date().getTime();
@@ -93,8 +93,8 @@ CouchRepository.prototype.getEventsByName = function(type, from, callback) {
 
   // Load function itself called once or multiple times.
   var load = function(type, callback) {
-    var startKey = '["' + type + '",' + from + ']',
+    var startKey = '["' + type + '","' + from + '"]',
-    endKey = '["' + type + '",9999999999999]',
+    endKey = '["' + type + '","9999999999999999"]',
     params = '?startkey=' + startKey + '&endkey=' + endKey;
 
     self.start = new Date().getTime();

diff --git a/lib/storage/couchStorage.js b/lib/storage/couchStorage.js
@@ -81,7 +81,7 @@ CouchStorage.prototype.loadView = function(id, callback) {
 CouchStorage.prototype._loadBareView = function(id, callback) {
   this.request({
     method: 'GET',
-    path: '/' + this.database + '/_design/cqrs/_view/viewSnapshot?startkey=["' + id + '",999999999999999999]&endkey=["' + id + '",0]&limit=1&descending=true'
+    path: '/' + this.database + '/_design/cqrs/_view/viewSnapshot?startkey=["' + id + '","999999999999999999"]&endkey=["' + id + '","0"]&limit=1&descending=true'
   }, function(data) {
     data = JSON.parse(data);
 

diff --git a/lib/util/couchdb.js b/lib/util/couchdb.js
@@ -1,6 +1,11 @@
 var http = require('http'),
     nano = require('nano');
 
+/*
+ * Whole class would be replaced by nano!
+ * @depricated
+ */
+
 module.exports = CouchDb = function(options) {
   options = options || {};
 

diff --git a/spec/repository/couchRepositorySpec.js b/spec/repository/couchRepositorySpec.js
@@ -76,7 +76,7 @@ describe('CouchRepository', function() {
 
       expect(couchdb.request).toHaveBeenCalledWith({
         method : 'GET',
-        path : '/cqrs/_design/cqrs/_view/aggregate?startkey=["1",0]&endkey=["1",9999999999999]'
+        path : '/cqrs/_design/cqrs/_view/aggregate?startkey=["1","0"]&endkey=["1","9999999999999999"]'
       }, jasmine.any(Function));
     })
 
@@ -105,7 +105,7 @@ describe('CouchRepository', function() {
 
       expect(couchdb.request).toHaveBeenCalledWith({
         method: 'GET', 
-        path: '/cqrs/_design/cqrs/_view/name?startkey=["foo",1000]&endkey=["foo",9999999999999]'
+        path: '/cqrs/_design/cqrs/_view/name?startkey=["foo","1000"]&endkey=["foo","9999999999999999"]'
       }, jasmine.any(Function));
     })
 
@@ -115,12 +115,12 @@ describe('CouchRepository', function() {
 
         expect(couchdb.request).toHaveBeenCalledWith({
           method: 'GET', 
-          path: '/cqrs/_design/cqrs/_view/name?startkey=["foo",0]&endkey=["foo",9999999999999]'
+          path: '/cqrs/_design/cqrs/_view/name?startkey=["foo","0"]&endkey=["foo","9999999999999999"]'
         }, jasmine.any(Function));
 
         expect(couchdb.request).toHaveBeenCalledWith({
           method: 'GET', 
-          path: '/cqrs/_design/cqrs/_view/name?startkey=["bar",0]&endkey=["bar",9999999999999]'
+          path: '/cqrs/_design/cqrs/_view/name?startkey=["bar","0"]&endkey=["bar","9999999999999999"]'
         }, jasmine.any(Function));
       })
 

diff --git a/spec/storage/couchStorageSpec.js b/spec/storage/couchStorageSpec.js
@@ -37,7 +37,7 @@ describe('CouchStorage', function() {
   }
 
   function viewPath(id) {
-    return '/cqrs/_design/cqrs/_view/viewSnapshot?startkey=["' + id + '",999999999999999999]&endkey=["' + id + '",0]&limit=1&descending=true'
+    return '/cqrs/_design/cqrs/_view/viewSnapshot?startkey=["' + id + '","999999999999999999"]&endkey=["' + id + '","0"]&limit=1&descending=true'
   }
 
   beforeEach(function() {