@onehat/data 1.7.0 → 1.7.4

package/cypress/integration/Repository/Repository.spec.js

@@ -12,6 +12,11 @@ describe('Repository Base', function() {
 					{ name: 'key', type: 'int' },
 					{ name: 'value' },
 				],
+				associations: {
+					hasMany: [
+						'bar'
+					],
+				},
 			},
 			repository: 'null',
 		});
@@ -63,6 +68,43 @@ describe('Repository Base', function() {
 			})
 			expect(repository.id).to.be.not.eq('foo');
 		});
+
+		it('_createMethods', async function() {
+
+			// There is no test method by default
+			expect(this.repository.testMethod).to.not.exist;
+
+			// Set up custom repository with testMethod
+			const schema1 = new Schema({
+					name: 'baz',
+					model: {
+						idProperty: 'key',
+						displayProperty: 'value',
+						properties: [
+							{ name: 'key', type: 'int' },
+							{ name: 'value' },
+						],
+					},
+					repository: {
+						type: 'null',
+						methods: {
+							testMethod: function() {
+								this.bar = 'test me';
+							},
+						},
+					},
+				}),
+				repository = new this.Repository({
+					schema: schema1,
+					data: [],
+				});
+			await repository.initialize();
+			schema1.setBoundRepository(repository);
+
+			// Perform testMethod test
+			repository.testMethod();
+			expect(repository.bar).to.be.eq('test me');
+		});
 	});
 
 	describe('loading', function() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.7.0",
+	"version": "1.7.4",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Entity.js

@@ -165,12 +165,11 @@ class Entity extends EventEmitter {
 			throw Error('this._createMethods is no longer valid. Entity has been destroyed.');
 		}
 		const methodDefinitions = this.schema.entity.methods;
-		if (_.isEmpty(methodDefinitions)) {
-			return;
+		if (!_.isEmpty(methodDefinitions)) {
+			_.each(methodDefinitions, (method, name) => {
+				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
+			});
 		}
-		_.each(methodDefinitions, (method, name) => {
-			this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
-		});
 	}
 
 	/**

package/src/Repository/Ajax.js

@@ -238,9 +238,10 @@ class AjaxRepository extends Repository {
 			matches = name.match(re),
 			paramsToChange = isBaseParam ? this._baseParams : this._params;
 		
+		let first, second;
 		if (matches) { // name has array notation like 'conditions[username]'
-			const first = matches[1],
-				second = matches[2];
+			first = matches[1],
+			second = matches[2];
 			if (paramsToChange && !paramsToChange.hasOwnProperty(first)) {
 				paramsToChange[first] = [];
 			}
@@ -548,7 +549,9 @@ class AjaxRepository extends Repository {
 
 		const method = this.methods.add,
 			url = this.api.batchAdd,
-			data = _.map(entities, entity => entity.submitValues);
+			data = {
+				entities: _.map(entities, entity => entity.submitValues),
+			};
 
 		return this._send(method, url, data)
 					.then(result => {
@@ -626,7 +629,9 @@ class AjaxRepository extends Repository {
 
 		const method = this.methods.edit,
 			url = this.api.batchEdit,
-			data = _.map(entities, entity => entity.submitValues);
+			data = {
+				entities: _.map(entities, entity => entity.submitValues),
+			};
 
 		return this._send(method, url, data)
 					.then(result => {

package/src/Repository/Repository.js

@@ -265,10 +265,28 @@ export default class Repository extends EventEmitter {
 			await this.sort();
 		}
 
+		this._createMethods();
+
 		this.isInitialized = true;
 		this.emit('initialize');
 	}
 
+	/**
+	 * Creates the methods for this Repository, based on Schema.
+	 * @private
+	 */
+	_createMethods = () => {
+		if (this.isDestroyed) {
+			throw Error('this._createMethods is no longer valid. Repository has been destroyed.');
+		}
+		const methodDefinitions = this.schema.repository.methods;
+		if (!_.isEmpty(methodDefinitions)) {
+			_.each(methodDefinitions, (method, name) => {
+				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
+			});
+		}
+	}
+
 
 	//     __                    __
 	//    / /   ____  ____ _____/ /
@@ -1165,6 +1183,49 @@ export default class Repository extends EventEmitter {
 		});
 	}
 
+	/**
+	 * Gets the Schema object
+	 * @return {Schema} schema
+	 */
+	getSchema = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getSchema is no longer valid. Entity has been destroyed.');
+		}
+		return this.schema;
+	}
+
+	/**
+	 * Gets the associated Repository
+	 * @param {string} repositoryName - Name of the Repository to retrieve
+	 * @return {boolean} hasProperty
+	 */
+	getAssociatedRepository = (repositoryName) => {
+		if (this.isDestroyed) {
+			throw Error('this.getAssociatedRepository is no longer valid. Entity has been destroyed.');
+		}
+
+		const schema = this.getSchema();
+		if (!schema.model.associations.hasOne.includes(repositoryName) &&
+			!schema.model.associations.hasMany.includes(repositoryName) &&
+			!schema.model.associations.belongsTo.includes(repositoryName) &&
+			!schema.model.associations.belongsToMany.includes(repositoryName)
+			) {
+			throw Error(repositoryName + ' is not associated with this schema');
+		}
+
+		const oneHatData = this.oneHatData;
+		if (!oneHatData) {
+			throw Error('No global oneHatData object');
+		}
+
+		const associatedRepository = oneHatData.getRepository(repositoryName);
+		if (!associatedRepository) {
+			throw Error('Repository ' + repositoryName + ' cannot be found');
+		}
+		
+		return associatedRepository;
+	}
+
 	/**
 	 * Utility function.
 	 * Detects if entity is in the current page of the storage medium.
@@ -1254,13 +1315,13 @@ export default class Repository extends EventEmitter {
 				switch(operation) {
 					case 'add':
 						entities = this.getNonPersisted();
-						if (this.combineBatch) {
+						if (_.size(entities) > 0) {
+							if (this.combineBatch) {
 
 								result = this.batchAsSynchronous ? await this._doBatchAdd(entities) : this._doBatchAdd(entities);
 								results.push(result);
 		
-						} else {
-							if (_.size(entities) > 0) {
+							} else {
 								for (i = 0; i < entities.length; i++) {
 									entity = entities[i];
 	
@@ -1275,18 +1336,16 @@ export default class Repository extends EventEmitter {
 								}
 							}
 						}
-			
-			
 						break;
 					case 'edit':
 						entities = this.getDirty();
-						if (this.combineBatch) {
+						if (_.size(entities) > 0) {
+							if (this.combineBatch) {
 
-							result = this.batchAsSynchronous ? await this._doBatchEdit(entities) : this._doBatchEdit(entities);
-							results.push(result);
+								result = this.batchAsSynchronous ? await this._doBatchEdit(entities) : this._doBatchEdit(entities);
+								results.push(result);
 
-						} else {
-							if (_.size(entities) > 0) {
+							} else {
 								for (i = 0; i < entities.length; i++) {
 									entity = entities[i];
 
@@ -1304,13 +1363,13 @@ export default class Repository extends EventEmitter {
 						break;
 					case 'delete':
 						entities = this.getDeleted();
-						if (this.combineBatch) {
+						if (_.size(entities) > 0) {
+							if (this.combineBatch) {
 
 								result = this.batchAsSynchronous ? await this._doBatchDelete(entities) : this._doBatchDelete(entities);
 								results.push(result);
 
-						} else {
-							if (_.size(entities) > 0) {
+							} else {
 								for (i = 0; i < entities.length; i++) {
 									entity = entities[i];