Update default timeouts, update tests

OndraFiedler · OndraFiedler · commit 374584d99b37 · 2024-10-04T15:39:45.000+02:00
diff --git a/index.js b/index.js
@@ -2,4 +2,4 @@
 
 exports.requests = require("./lib/requests");
 exports.errors = require("./lib/errors");
-exports.ApiClient = require("./lib/api-client").ApiClient;
+exports.ApiClient = require("./lib/api-client").ApiClient;
diff --git a/lib/errors/index.js b/lib/errors/index.js
@@ -1,4 +1,4 @@
 'use strict';
 exports.ApiError = require("./api-error").ApiError;
 exports.ResponseError = require("./response-error").ResponseError;
-exports.TimeoutError = require("./timeout-error").TimeoutError;
+exports.TimeoutError = require("./timeout-error").TimeoutError;
diff --git a/lib/requests/add-bookmark.js b/lib/requests/add-bookmark.js
@@ -30,7 +30,7 @@ class AddBookmark extends rqs.Request {
    *         - Description: A dictionary of additional data for the interaction.
    */
   constructor(userId, itemId, optional) {
-    super('POST', '/bookmarks/', 1000, false);
+    super('POST', '/bookmarks/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/add-cart-addition.js b/lib/requests/add-cart-addition.js
@@ -36,7 +36,7 @@ class AddCartAddition extends rqs.Request {
    *         - Description: A dictionary of additional data for the interaction.
    */
   constructor(userId, itemId, optional) {
-    super('POST', '/cartadditions/', 1000, false);
+    super('POST', '/cartadditions/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/add-detail-view.js b/lib/requests/add-detail-view.js
@@ -33,7 +33,7 @@ class AddDetailView extends rqs.Request {
    *         - Description: A dictionary of additional data for the interaction.
    */
   constructor(userId, itemId, optional) {
-    super('POST', '/detailviews/', 1000, false);
+    super('POST', '/detailviews/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/add-item-property.js b/lib/requests/add-item-property.js
@@ -6,7 +6,7 @@
 const rqs = require("./request");
 
 /**
- * Adding an item property is somehow equivalent to adding a column to the table of items. The items may be characterized by various properties of different types.
+ * Adding an item property is somewhat equivalent to adding a column to the table of items. The items may be characterized by various properties of different types.
  */
 class AddItemProperty extends rqs.Request {
 
diff --git a/lib/requests/add-item.js b/lib/requests/add-item.js
@@ -16,7 +16,7 @@ class AddItem extends rqs.Request {
    * @param {string} itemId - ID of the item to be created.
    */
   constructor(itemId) {
-    super('PUT', `/items/${itemId}`, 1000, false);
+    super('PUT', `/items/${itemId}`, 3000, false);
     this.itemId = itemId;
   }
 
diff --git a/lib/requests/add-purchase.js b/lib/requests/add-purchase.js
@@ -39,7 +39,7 @@ class AddPurchase extends rqs.Request {
    *         - Description: A dictionary of additional data for the interaction.
    */
   constructor(userId, itemId, optional) {
-    super('POST', '/purchases/', 1000, false);
+    super('POST', '/purchases/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/add-rating.js b/lib/requests/add-rating.js
@@ -31,7 +31,7 @@ class AddRating extends rqs.Request {
    *         - Description: A dictionary of additional data for the interaction.
    */
   constructor(userId, itemId, rating, optional) {
-    super('POST', '/ratings/', 1000, false);
+    super('POST', '/ratings/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     this.rating = rating;
diff --git a/lib/requests/add-series.js b/lib/requests/add-series.js
@@ -15,7 +15,7 @@ class AddSeries extends rqs.Request {
    * @param {string} seriesId - ID of the series to be created.
    */
   constructor(seriesId) {
-    super('PUT', `/series/${seriesId}`, 1000, false);
+    super('PUT', `/series/${seriesId}`, 3000, false);
     this.seriesId = seriesId;
   }
 
diff --git a/lib/requests/add-user-property.js b/lib/requests/add-user-property.js
@@ -6,7 +6,7 @@
 const rqs = require("./request");
 
 /**
- * Adding a user property is somehow equivalent to adding a column to the table of users. The users may be characterized by various properties of different types.
+ * Adding a user property is somewhat equivalent to adding a column to the table of users. The users may be characterized by various properties of different types.
  */
 class AddUserProperty extends rqs.Request {
 
diff --git a/lib/requests/add-user.js b/lib/requests/add-user.js
@@ -15,7 +15,7 @@ class AddUser extends rqs.Request {
    * @param {string} userId - ID of the user to be added.
    */
   constructor(userId) {
-    super('PUT', `/users/${userId}`, 1000, false);
+    super('PUT', `/users/${userId}`, 3000, false);
     this.userId = userId;
   }
 
diff --git a/lib/requests/delete-bookmark.js b/lib/requests/delete-bookmark.js
@@ -21,7 +21,7 @@ class DeleteBookmark extends rqs.Request {
    *         - Description: Unix timestamp of the bookmark. If the `timestamp` is omitted, then all the bookmarks with the given `userId` and `itemId` are deleted.
    */
   constructor(userId, itemId, optional) {
-    super('DELETE', '/bookmarks/', 1000, false);
+    super('DELETE', '/bookmarks/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/delete-cart-addition.js b/lib/requests/delete-cart-addition.js
@@ -21,7 +21,7 @@ class DeleteCartAddition extends rqs.Request {
    *         - Description: Unix timestamp of the cart addition. If the `timestamp` is omitted, then all the cart additions with the given `userId` and `itemId` are deleted.
    */
   constructor(userId, itemId, optional) {
-    super('DELETE', '/cartadditions/', 1000, false);
+    super('DELETE', '/cartadditions/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/delete-detail-view.js b/lib/requests/delete-detail-view.js
@@ -21,7 +21,7 @@ class DeleteDetailView extends rqs.Request {
    *         - Description: Unix timestamp of the detail view. If the `timestamp` is omitted, then all the detail views with the given `userId` and `itemId` are deleted.
    */
   constructor(userId, itemId, optional) {
-    super('DELETE', '/detailviews/', 1000, false);
+    super('DELETE', '/detailviews/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/delete-item.js b/lib/requests/delete-item.js
@@ -17,7 +17,7 @@ class DeleteItem extends rqs.Request {
    * @param {string} itemId - ID of the item to be deleted.
    */
   constructor(itemId) {
-    super('DELETE', `/items/${itemId}`, 1000, false);
+    super('DELETE', `/items/${itemId}`, 3000, false);
     this.itemId = itemId;
   }
 
diff --git a/lib/requests/delete-purchase.js b/lib/requests/delete-purchase.js
@@ -21,7 +21,7 @@ class DeletePurchase extends rqs.Request {
    *         - Description: Unix timestamp of the purchase. If the `timestamp` is omitted, then all the purchases with the given `userId` and `itemId` are deleted.
    */
   constructor(userId, itemId, optional) {
-    super('DELETE', '/purchases/', 1000, false);
+    super('DELETE', '/purchases/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/delete-rating.js b/lib/requests/delete-rating.js
@@ -21,7 +21,7 @@ class DeleteRating extends rqs.Request {
    *         - Description: Unix timestamp of the rating. If the `timestamp` is omitted, then all the ratings with the given `userId` and `itemId` are deleted.
    */
   constructor(userId, itemId, optional) {
-    super('DELETE', '/ratings/', 1000, false);
+    super('DELETE', '/ratings/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/delete-series.js b/lib/requests/delete-series.js
@@ -16,7 +16,7 @@ class DeleteSeries extends rqs.Request {
    * @param {string} seriesId - ID of the series to be deleted.
    */
   constructor(seriesId) {
-    super('DELETE', `/series/${seriesId}`, 1000, false);
+    super('DELETE', `/series/${seriesId}`, 3000, false);
     this.seriesId = seriesId;
   }
 
diff --git a/lib/requests/delete-user.js b/lib/requests/delete-user.js
@@ -16,7 +16,7 @@ class DeleteUser extends rqs.Request {
    * @param {string} userId - ID of the user to be deleted.
    */
   constructor(userId) {
-    super('DELETE', `/users/${userId}`, 1000, false);
+    super('DELETE', `/users/${userId}`, 3000, false);
     this.userId = userId;
   }
 
diff --git a/lib/requests/delete-view-portion.js b/lib/requests/delete-view-portion.js
@@ -21,7 +21,7 @@ class DeleteViewPortion extends rqs.Request {
    *         - Description: Identifier of a session.
    */
   constructor(userId, itemId, optional) {
-    super('DELETE', '/viewportions/', 1000, false);
+    super('DELETE', '/viewportions/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     optional = optional || {};
diff --git a/lib/requests/get-item-property-info.js b/lib/requests/get-item-property-info.js
@@ -15,7 +15,7 @@ class GetItemPropertyInfo extends rqs.Request {
    * @param {string} propertyName - Name of the property about which the information is to be retrieved.
    */
   constructor(propertyName) {
-    super('GET', `/items/properties/${propertyName}`, 1000, false);
+    super('GET', `/items/properties/${propertyName}`, 3000, false);
     this.propertyName = propertyName;
   }
 
diff --git a/lib/requests/get-item-values.js b/lib/requests/get-item-values.js
@@ -15,7 +15,7 @@ class GetItemValues extends rqs.Request {
    * @param {string} itemId - ID of the item whose properties are to be obtained.
    */
   constructor(itemId) {
-    super('GET', `/items/${itemId}`, 1000, false);
+    super('GET', `/items/${itemId}`, 3000, false);
     this.itemId = itemId;
   }
 
diff --git a/lib/requests/get-user-values.js b/lib/requests/get-user-values.js
@@ -15,7 +15,7 @@ class GetUserValues extends rqs.Request {
    * @param {string} userId - ID of the user whose properties are to be obtained.
    */
   constructor(userId) {
-    super('GET', `/users/${userId}`, 1000, false);
+    super('GET', `/users/${userId}`, 3000, false);
     this.userId = userId;
   }
 
diff --git a/lib/requests/insert-to-series.js b/lib/requests/insert-to-series.js
@@ -23,7 +23,7 @@ class InsertToSeries extends rqs.Request {
    *         - Description: Indicates that any non-existing entity specified within the request should be created (as if corresponding PUT requests were invoked). This concerns both the `seriesId` and the `itemId`. If `cascadeCreate` is set to true, the behavior also depends on the `itemType`. Either item or series may be created if not present in the database.
    */
   constructor(seriesId, itemType, itemId, time, optional) {
-    super('POST', `/series/${seriesId}/items/`, 1000, false);
+    super('POST', `/series/${seriesId}/items/`, 3000, false);
     this.seriesId = seriesId;
     this.itemType = itemType;
     this.itemId = itemId;
diff --git a/lib/requests/remove-from-series.js b/lib/requests/remove-from-series.js
@@ -18,7 +18,7 @@ class RemoveFromSeries extends rqs.Request {
    * @param {number} time - Time index of the item to be removed.
    */
   constructor(seriesId, itemType, itemId, time) {
-    super('DELETE', `/series/${seriesId}/items/`, 1000, false);
+    super('DELETE', `/series/${seriesId}/items/`, 3000, false);
     this.seriesId = seriesId;
     this.itemType = itemType;
     this.itemId = itemId;
diff --git a/lib/requests/request.js b/lib/requests/request.js
@@ -19,4 +19,4 @@ class Request {
   }
 }
 
-exports.Request = Request
+exports.Request = Request
diff --git a/lib/requests/set-view-portion.js b/lib/requests/set-view-portion.js
@@ -35,7 +35,7 @@ class SetViewPortion extends rqs.Request {
    *         - Description: A dictionary of additional data for the interaction.
    */
   constructor(userId, itemId, portion, optional) {
-    super('POST', '/viewportions/', 1000, false);
+    super('POST', '/viewportions/', 3000, false);
     this.userId = userId;
     this.itemId = itemId;
     this.portion = portion;
diff --git a/test/add-bookmark-batch_test.js b/test/add-bookmark-batch_test.js
@@ -26,7 +26,6 @@ describe('AddBookmark', function(){
       new rqs.AddBookmark('entity_id','entity_id',{'timestamp': '2013-10-29T09:38:41.341Z'}),
       new rqs.AddBookmark('entity_id','nonex_id'),
       new rqs.AddBookmark('nonex_id','entity_id'),
-      new rqs.AddBookmark('entity_id','entity_id',{'timestamp': -15}),
       new rqs.AddBookmark('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5}),
       new rqs.AddBookmark('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5})
       ];
@@ -38,9 +37,8 @@ describe('AddBookmark', function(){
         chai.equal(responses[2].code, 200);
         chai.equal(responses[3].code, 404);
         chai.equal(responses[4].code, 404);
-        chai.equal(responses[5].code, 400);
-        chai.equal(responses[6].code, 200);
-        chai.equal(responses[7].code, 409);
+        chai.equal(responses[5].code, 200);
+        chai.equal(responses[6].code, 409);
       done();
     });
   });
diff --git a/test/add-bookmark-callback_test.js b/test/add-bookmark-callback_test.js
@@ -89,21 +89,6 @@ describe('AddBookmark', function(){
     }));
   });
   
-  it ('fails with invalid time', (done) => {
-    let req, req2, resp;
-    req = new rqs.AddBookmark('entity_id','entity_id',{'timestamp': -15});
-    env.client.send(req,((err,res) => {
-      if(err) {
-        chai.equal(err.name, 'ResponseError');
-        chai.equal(err.statusCode, 400);
-        done();
-      }
-      else {
-        chai.fail();
-      }
-    }));
-  });
-  
   it ('really stores interaction to the system', (done) => {
     let req, req2, resp;
     req = new rqs.AddBookmark('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5});
diff --git a/test/add-bookmark-test.js b/test/add-bookmark-test.js
@@ -81,23 +81,6 @@ describe('AddBookmark', function(){
     });
   });
   
-  it ('fails with invalid time', (done) => {
-    let req, req2, resp;
-    req = new rqs.AddBookmark('entity_id','entity_id',{'timestamp': -15});
-    env.client.send(req)
-    .then((res) => {
-      chai.fail();
-      done();
-    })
-    .catch((err) => {
-      if (err instanceof recombee.errors.ResponseError) {
-        chai.equal(err.statusCode, 400);
-        done();
-      }
-      throw err;
-    });
-  });
-  
   it ('really stores interaction to the system', (done) => {
     let req, req2, resp;
     req = new rqs.AddBookmark('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5});
diff --git a/test/add-cart-addition-batch_test.js b/test/add-cart-addition-batch_test.js
@@ -26,7 +26,6 @@ describe('AddCartAddition', function(){
       new rqs.AddCartAddition('entity_id','entity_id',{'timestamp': '2013-10-29T09:38:41.341Z'}),
       new rqs.AddCartAddition('entity_id','nonex_id'),
       new rqs.AddCartAddition('nonex_id','entity_id'),
-      new rqs.AddCartAddition('entity_id','entity_id',{'timestamp': -15}),
       new rqs.AddCartAddition('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5}),
       new rqs.AddCartAddition('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5})
       ];
@@ -38,9 +37,8 @@ describe('AddCartAddition', function(){
         chai.equal(responses[2].code, 200);
         chai.equal(responses[3].code, 404);
         chai.equal(responses[4].code, 404);
-        chai.equal(responses[5].code, 400);
-        chai.equal(responses[6].code, 200);
-        chai.equal(responses[7].code, 409);
+        chai.equal(responses[5].code, 200);
+        chai.equal(responses[6].code, 409);
       done();
     });
   });
diff --git a/test/add-cart-addition-callback_test.js b/test/add-cart-addition-callback_test.js
@@ -89,21 +89,6 @@ describe('AddCartAddition', function(){
     }));
   });
   
-  it ('fails with invalid time', (done) => {
-    let req, req2, resp;
-    req = new rqs.AddCartAddition('entity_id','entity_id',{'timestamp': -15});
-    env.client.send(req,((err,res) => {
-      if(err) {
-        chai.equal(err.name, 'ResponseError');
-        chai.equal(err.statusCode, 400);
-        done();
-      }
-      else {
-        chai.fail();
-      }
-    }));
-  });
-  
   it ('really stores interaction to the system', (done) => {
     let req, req2, resp;
     req = new rqs.AddCartAddition('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5});
diff --git a/test/add-cart-addition-test.js b/test/add-cart-addition-test.js
@@ -81,23 +81,6 @@ describe('AddCartAddition', function(){
     });
   });
   
-  it ('fails with invalid time', (done) => {
-    let req, req2, resp;
-    req = new rqs.AddCartAddition('entity_id','entity_id',{'timestamp': -15});
-    env.client.send(req)
-    .then((res) => {
-      chai.fail();
-      done();
-    })
-    .catch((err) => {
-      if (err instanceof recombee.errors.ResponseError) {
-        chai.equal(err.statusCode, 400);
-        done();
-      }
-      throw err;
-    });
-  });
-  
   it ('really stores interaction to the system', (done) => {
     let req, req2, resp;
     req = new rqs.AddCartAddition('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5});
diff --git a/test/add-detail-view-batch_test.js b/test/add-detail-view-batch_test.js
@@ -26,7 +26,6 @@ describe('AddDetailView', function(){
       new rqs.AddDetailView('entity_id','entity_id',{'timestamp': '2013-10-29T09:38:41.341Z'}),
       new rqs.AddDetailView('entity_id','nonex_id'),
       new rqs.AddDetailView('nonex_id','entity_id'),
-      new rqs.AddDetailView('entity_id','entity_id',{'timestamp': -15}),
       new rqs.AddDetailView('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5}),
       new rqs.AddDetailView('u_id2','i_id2',{'cascadeCreate': true,'timestamp': 5})
       ];
@@ -38,9 +37,8 @@ describe('AddDetailView', function(){
         chai.equal(responses[2].code, 200);
         chai.equal(responses[3].code, 404);
         chai.equal(responses[4].code, 404);
-        chai.equal(responses[5].code, 400);
-        chai.equal(responses[6].code, 200);
-        chai.equal(responses[7].code, 409);
+        chai.equal(responses[5].code, 200);
+        chai.equal(responses[6].code, 409);
       done();
     });
   });
diff --git a/test/add-detail-view-callback_test.js b/test/add-detail-view-callback_test.js
diff --git a/test/add-detail-view-test.js b/test/add-detail-view-test.js
diff --git a/test/add-purchase-batch_test.js b/test/add-purchase-batch_test.js
diff --git a/test/add-purchase-callback_test.js b/test/add-purchase-callback_test.js
diff --git a/test/add-purchase-test.js b/test/add-purchase-test.js
diff --git a/test/add-rating-batch_test.js b/test/add-rating-batch_test.js
diff --git a/test/add-rating-callback_test.js b/test/add-rating-callback_test.js
diff --git a/test/add-rating-test.js b/test/add-rating-test.js
diff --git a/test/list-items-batch_test.js b/test/list-items-batch_test.js
diff --git a/test/list-items-callback_test.js b/test/list-items-callback_test.js
diff --git a/test/list-items-test.js b/test/list-items-test.js
diff --git a/test/list-users-batch_test.js b/test/list-users-batch_test.js
diff --git a/test/list-users-callback_test.js b/test/list-users-callback_test.js
diff --git a/test/list-users-test.js b/test/list-users-test.js
diff --git a/test/set-view-portion-batch_test.js b/test/set-view-portion-batch_test.js
diff --git a/test/set-view-portion-callback_test.js b/test/set-view-portion-callback_test.js
diff --git a/test/set-view-portion-test.js b/test/set-view-portion-test.js
