@onehat/data 1.7.9 → 1.7.14

package/cypress/integration/Entity.spec.js

@@ -347,6 +347,18 @@ describe('Entity', function() {
 			expect(_.isEqual(result, expected)).to.be.true;
 		});
 
+		it('getChangedValues', function() {
+			this.entity.foo = 2;
+			const result = this.entity.getChangedValues(),
+				expected = {
+					foo: {
+						original: 1,
+						current: 2,
+					},
+				};
+			expect(_.isEqual(result, expected)).to.be.true;
+		});
+
 		it('data', function() {
 			const result = this.entity.data,
 				expected = {

package/package.json

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

package/src/Entity.js

@@ -711,21 +711,39 @@ class Entity extends EventEmitter {
 	 * @return {array|boolean} diff - Array of property names that have changed, or false
 	 */
 	getChanged = () => {
-		const obj1 = this._originalDataParsed,
-			obj2 = this.getRawValues(),
-			diff = Object.keys(obj1).reduce((result, key) => { // from https://stackoverflow.com/a/40610459/9163076
-				if (obj2 && !obj2.hasOwnProperty(key)) {
+		const original = this._originalDataParsed,
+			current = this.getRawValues(),
+			diff = Object.keys(original).reduce((result, key) => { // from https://stackoverflow.com/a/40610459/9163076
+				if (current && !current.hasOwnProperty(key)) {
 					result.push(key);
-				} else if (_.isEqual(obj1[key], obj2[key])) {
+				} else if (_.isEqual(original[key], current[key])) {
 					const resultKeyIndex = result.indexOf(key);
 					result.splice(resultKeyIndex, 1);
 				}
 				return result;
-			}, Object.keys(obj2));
+			}, Object.keys(current));
 	
 		return !_.isEmpty(diff) ? diff : false;
 	}
 
+	/**
+	 * Gets a comprehensive analysis of what has changed since the last save
+	 * @return {object} changedPropertyValues - Object representing each changed field and both its original and current value
+	 */
+	getChangedValues = () => {
+		const original = this._originalDataParsed,
+			current = this.getRawValues(),
+			names = this.getChanged();
+		const changedPropertyValues = {};
+		_.each(names, (name) => {
+			changedPropertyValues[name] = {
+				original: original[name],
+				current: current[name],
+			};
+		});
+		return changedPropertyValues;
+	}
+
 	/**
 	 * Alias for this.submitValues
 	 */

package/src/Repository/Repository.js

@@ -266,6 +266,11 @@ export default class Repository extends EventEmitter {
 		}
 
 		this._createMethods();
+		this._createStatics();
+
+		if (this.schema.repository.init) {
+			await this.schema.repository.init.call(this);
+		}
 
 		this.isInitialized = true;
 		this.emit('initialize');
@@ -287,6 +292,22 @@ export default class Repository extends EventEmitter {
 		}
 	}
 
+	/**
+	 * Creates the static properties for this Repository, based on Schema.
+	 * @private
+	 */
+	 _createStatics = () => {
+		if (this.isDestroyed) {
+			throw Error('this._createStatics is no longer valid. Entity has been destroyed.');
+		}
+		const staticsDefinitions = this.schema.repository.statics;
+		if (!_.isEmpty(staticsDefinitions)) {
+			_.each(staticsDefinitions, (value, key) => {
+				this[key] = value;
+			});
+		}
+	}
+
 
 	//     __                    __
 	//    / /   ____  ____ _____/ /
@@ -1251,49 +1272,6 @@ export default class Repository extends EventEmitter {
 		return associatedRepository;
 	}
 
-	/**
-	 * 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.