[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [bodega-server/terietor/ratings2] server: Merge branch 'terietor/ratings' into terietor/ratings2
From:       Giorgos Tsiapaliokas <terietor () gmail ! com>
Date:       2013-07-01 5:30:09
Message-ID: E1UtWgj-00085v-6B () scm ! kde ! org
[Download RAW message or body]

Git commit b8c6fa5e1d499877fcd03ff3b8092d23a5559315 by Giorgos Tsiapaliokas.
Committed on 01/07/2013 at 05:30.
Pushed by tsiapaliwkas into branch 'terietor/ratings2'.

Merge branch 'terietor/ratings' into terietor/ratings2

Conflicts:
	server/lib/bodegadb.js
	server/lib/errors.js

M  +29   -0    server/lib/bodegadb.js
M  +2    -1    server/lib/errors.js
M  +43   -0    server/routes.js

http://commits.kde.org/bodega-server/b8c6fa5e1d499877fcd03ff3b8092d23a5559315

diff --cc server/lib/bodegadb.js
index 3be8d81,1569721..252fef4
--- a/server/lib/bodegadb.js
+++ b/server/lib/bodegadb.js
@@@ -40,12 -40,8 +40,13 @@@ var dbUpdateAsset = require('./db/updat
  var dbListAssets = require('./db/listassets.js');
  var dbStats = require('./db/stats.js');
  var dbStores = require('./db/stores.js');
 +var dbTags = require('./db/tags.js');
  var dbContactInfo = require('./db/contactInfo.js');
 +var dbPostAsset = require('./db/postasset.js');
 +var dbPublishAsset = require('./db/publishasset.js');
 +var dbPartners = require('./db/partners.js');
 +var dbParticipantInfo = require('./db/participantInfo.js');
+ var dbRatings = require('./db/ratings.js');
  
  var BodegaDb = (function() {
      var connectionString;
@@@ -222,36 -202,35 +223,64 @@@
  
      BodegaDb.prototype.deleteStoreChannel = function(req, res) {
          this.dbQuery(dbStores.deleteChannel, req, res);
 +    };
  
+     BodegaDb.prototype.listRatings = function(req, res) {
+         this.dbQuery(dbRatings.listAll, req, res);
+     };
+ 
+     BodegaDb.prototype.createRating = function(req, res) {
+         this.dbQuery(dbRatings.create, req, res);
+     };
+ 
+     BodegaDb.prototype.deleteRating = function(req, res) {
+         this.dbQuery(dbRatings.remove, req, res);
+     };
+ 
+     BodegaDb.prototype.ratingAsset = function(req, res) {
+         this.dbQuery(dbRatings.asset, req, res);
+     };
+ 
+     BodegaDb.prototype.ratingPerson = function(req, res) {
+         this.dbQuery(dbRatings.person, req, res);
+     };
+ 
+     BodegaDb.prototype.ratingAddAsset = function(req, res) {
+         this.dbQuery(dbRatings.addAsset, req, res);
+     };
+ 
+     BodegaDb.prototype.ratingRemoveAsset = function(req, res) {
+         this.dbQuery(dbRatings.removeAsset, req, res);
+     };
+ 
 +    BodegaDb.prototype.listTagTypes = function(req, res) {
 +        this.dbQuery(dbTags.listTypes, req, res);
 +    };
 +
 +    BodegaDb.prototype.listAssetTags = function(req, res) {
 +        this.dbQuery(dbTags.listAssetTags, req, res);
 +    };
 +
 +    BodegaDb.prototype.listChannelTags = function(req, res) {
 +        this.dbQuery(dbTags.listChannelTags, req, res);
 +    };
 +
 +    BodegaDb.prototype.listTags = function(req, res) {
 +        this.dbQuery(dbTags.listTags, req, res);
 +    };
 +
 +    BodegaDb.prototype.createTag = function(req, res) {
 +        this.dbQuery(dbTags.create, req, res);
 +    };
 +
 +    BodegaDb.prototype.deleteTag = function(req, res) {
 +        this.dbQuery(dbTags.remove, req, res);
 +    };
 +
 +    BodegaDb.prototype.updateTag = function(req, res) {
 +        this.dbQuery(dbTags.update, req, res);
 +    };
 +
      BodegaDb.prototype.hunt = function(req, res) {
          this.dbQuery(dbHunt, req, res);
      };
diff --cc server/lib/errors.js
index 356d7c4,61599cb..a15951e
--- a/server/lib/errors.js
+++ b/server/lib/errors.js
@@@ -92,19 -84,8 +92,20 @@@ var ErrorType = 
      "StoreNotDeleted"        : 63,//deleting a store failed
      "StoreIdInvalid"         : 64,//the provided store id is not valid for this user
      "StoreChannelIdInvalid"  : 65,//the requested channel id for editting is invalid
 -    "StoreCreateChannelFailed": 65,//could not create the requested channel
 -    "RatingExists"           : 66//rating already exists
 +    "StoreCreateChannelFailed": 66,//could not create the requested channel
 +    "PublishingFailed"       : 67,//wasn't able to publish an asset
 +
 +    "PartnerNameExists"      : 80,//the partner already exists in the database
 +    "InvalidLinkService"     : 81,//the service requested for use as a link does not exist
 +
 +    "TagIdInvalid"           : 90,//The tag that has been requested doesn't exist
 +    "TagNotDeleted"          : 91,//The tag that has been requested to be deleted is still there
-     "TagExists"              : 92,//The tag that has been requested to be created already exists
++    "TagExists"              : 92,//The tag that has been requested to be created already exists,
++    "RatingExists"           : 93//rating already exists
 +};
 +
 +var DbErrorType = {
 +    UniqueKey: '23505'
  };
  
  module.exports.Type = ErrorType;
[prev in list] [next in list] [prev in thread] [next in thread]