save

src/lib/base/BaseRepo.js

@@ -9,20 +9,20 @@ let BaseSchema = require('src/lib/base/BaseSchema');
 
 class Schema extends BaseSchema {
 	constructor(data) {
-		super();
-		this.setSchema(data);
+		super(data);
 	}
 }
 
 class BaseRepo {
 
-	constructor(data) {
-		this._schema = null;
+	constructor(props) {
+		props = props || {};
+		this._schema = new Schema(props);
 		this._table = null;
 	}
 
 	createSchema(schema) {
-		this._schema = new Schema(data);
+		this._schema.setSchema(schema);
 	}
 
 	* create(data) {
@@ -35,6 +35,10 @@ class BaseRepo {
 		this._schema.updateProperties(data);
 	}
 
+	* getProperties() {
+		return yield this._schema.getProperties();
+	}
+
 	* save() {
 		let data = null;
 		// Check if this._schema exists
@@ -77,4 +81,6 @@ class BaseRepo {
 
 	}
 
-}
+}
+
+module.exports = BaseRepo;

src/lib/base/BaseSchema.js

@@ -46,6 +46,13 @@ class BaseSchema {
 	}
 
 	setProperties(props) {
+		props = props || {};
+		if (!('id' in props)) {
+			props['id'] = null;
+		}
+		if (!('last_modified' in props)) {
+			props['last_modified'] = Date.now();
+		}
 		this.props = props || {};
 	}
 

src/repos/ContentRepo.js

@@ -4,11 +4,20 @@ var config = require('src/config.js');
 var r = require('rethinkdb');
 var app = require('src/app.js');
 let _ = require('lodash');
+let BaseRepo = require('src/lib/base/BaseRepo');
 
-
-class ContentRepo {
-	constructor() {
+class ContentRepo extends BaseRepo {
+	constructor(data) {
+		super();
 		this._table = "content";
+
+		let schema = {
+			content: {'type': 'string'},
+			title: {'type': 'string'},
+			author: {'type': 'uuid'}
+		}
+
+		this.createSchema(schema);
 	}
 
 	* getById() {

src/repos/UserRepo.js

@@ -1,16 +1,14 @@
 'use strict';
 
-var config = require('src/config.js');
+var config = require('src/config');
 var r = require('rethinkdb');
 var app = require('src/app.js');
 let _ = require('lodash');
 let BaseRepo = require('src/lib/base/BaseRepo');
-let bcrypt = require('co-bcrypt');
-
 
 class UserRepo extends BaseRepo {
-	constructor(data) {
-		super();
+	constructor(props) {
+		super(props);
 		this._table = "users";
 
 		// Create the schema
@@ -23,14 +21,6 @@ class UserRepo extends BaseRepo {
 		this.createSchema(schema);
 	}
 
-	* setPassword(password) {
-		let salt = yield bcrypt.genSalt(10);
-		let hash = yield bcrypt.hash(password, salt);
-		this.update({
-			password_hash: hash
-		})
-	}
-
 	* getAll() {
 		try {
 			var cursor = yield r.table(this._table).run(app.context.rdbConn);

src/routes.js

@@ -1,7 +1,7 @@
 'use strict';
 
 let Router = require('koa-router');
-let UserController = require("src/controllers/user.js");
+let UserController = require("src/controllers/UserController");
 
 let router = new Router({
 	prefix: '/v1'

src/services/UserService.js

@@ -1,7 +1,8 @@
 'use strict';
+
 var BaseService = require('src/lib/base/service');
 var UserRepo = require('src/repos/UserRepo');
-
+let bcrypt = require('co-bcrypt');
 
 class UserService extends BaseService {
 	constructor(){
@@ -32,7 +33,11 @@ class UserService extends BaseService {
 	}
 
 	* setPassword() {
-
+		let salt = yield bcrypt.genSalt(10);
+		let hash = yield bcrypt.hash(password, salt);
+		userRepo.update({
+			password_hash: hash
+		});
 	}
 
 	* generateHash() {

test/BaseSchemaSpec.js

@@ -39,6 +39,20 @@ describe('BaseSchema testing', function() {
 		assert.equal(_.size(defaultSchema), _.size(baseSchema._schema));
 	});
 
+	it('schema size must pass', function *() {
+		let args = {
+			id: "s",
+			name: 's',
+			age: 2,
+			cgp: 1.2,
+			admin: false
+		};
+		let baseSchema = new BaseSchema(args);
+		baseSchema.setSchema(defaultSchema);
+		let m = yield baseSchema._checkSchemaSize();
+		assert(m[0]);
+	});
+
 	it('validate method must return true', function * () {
 		let args = {
 			id: "s",

test/UserRepoSpec.js

@@ -1,20 +1,21 @@
 'use strict';
 require('app-module-path').addPath(__dirname + "/..");
 
-var assert = require('assert');
+let assert = require('assert');
 require('co-mocha');
 
-var UserRepo = require('src/repos/UserRepo');
+let UserRepo = require('src/repos/UserRepo');
 
 describe('UserRepo testing', function() {
 	it('should instantiate', function * () {
-		var userRepo = new UserRepo();
+		let userRepo = new UserRepo();
 		assert.equal(typeof userRepo, 'object');
 	})
 
 	it('should take parameters', function * () {
-		var userRepo = new UserRepo({name: 'test', email: '[email protected]'});
-		assert.equal(userRepo.name, 'test');
-		assert.equal(userRepo.email, '[email protected]');
+		let userRepo = new UserRepo({name: 'test', email: '[email protected]'});
+		let props = yield userRepo.getProperties();
+		assert.equal(props.name, 'test');
+		assert.equal(props.email, '[email protected]');
 	})
 });