@onehat/data 1.6.5 → 1.6.6

package/cypress/fixtures/Definitions/GroupsUsers.js

@@ -25,6 +25,13 @@ const GroupsUsers = {
 			{ name: 'users__last_login',	mapping: 'user.last_login',	type: 'datetime' },
 		],
 
+		associations: {
+			hasOne: [
+				'Groups',
+				'Users',
+			],
+		},
+
 	},
 
 	entity: {

package/cypress/integration/OneHatData.spec.js

@@ -175,6 +175,21 @@ describe('OneHatData', function() {
 		})();
 	});
 
+	it('hasRepository', function() {
+		(async function() {
+			await beforeEach();
+
+			const oneHatData = new OneHatData();
+			oneHatData.createSchemas([
+				{ name: 'foo', },
+			]);
+			oneHatData.createBoundRepositories();
+			expect(oneHatData.hasRepository('foo')).to.be.true;
+
+			afterEach();
+		})();
+	});
+
 	it('hasRepositoryWithId', function() {
 		(async function() {
 			await beforeEach();

package/cypress/integration/Schema.spec.js

@@ -11,6 +11,9 @@ describe('Schema', function() {
 		expect(this.schema instanceof Schema).to.be.true;
 		expect(this.schema.name).to.be.eq('GroupsUsers');
 		expect(this.schema.model.associations.hasOne).to.be.an('array');
+		expect(this.schema.model.associations.hasMany).to.be.an('array');
+		expect(this.schema.model.associations.belongsTo).to.be.an('array');
+		expect(this.schema.model.associations.belongsToMany).to.be.an('array');
 		expect(this.schema.entity.methods.testMethod).to.be.a('function');
 		expect(this.schema.repository.type).to.be.eq('onebuild');
 	});

package/package.json

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

package/src/Entity.js

@@ -398,6 +398,17 @@ class Entity extends EventEmitter {
 		return this.schema;
 	}
 
+	/**
+	 * Gets the Repository object
+	 * @return {Repository} repository
+	 */
+	getRepository = () => {
+		if (this.isDestroyed) {
+			throw Error('this.getRepository is no longer valid. Entity has been destroyed.');
+		}
+		return this.repository;
+	}
+
 	/**
 	 * Alias for this.properties
 	 */
@@ -862,18 +873,30 @@ class Entity extends EventEmitter {
 		}
 
 		const schema = this.getSchema();
-		if (!schema.associations.hasOne.includes(repositoryName) &&
-			!schema.associations.hasMany.includes(repositoryName) &&
-			!schema.associations.belongsTo.includes(repositoryName) &&
-			!schema.associations.belongsToMany.includes(repositoryName)
+		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.getRepository().name);
+			throw Error(repositoryName + ' is not associated with this schema');
 		}
+
 		const repository = this.getRepository();
-		if (!repository.oneHatData) {
+		if (!repository) {
+			throw Error('No repository on this entity');
+		}
+
+		const oneHatData = repository.oneHatData;
+		if (!oneHatData) {
 			throw Error('No global oneHatData object');
 		}
-		return repository.oneHatData.getRepository(repositoryName);
+
+		const associatedRepository = oneHatData.getRepository(repositoryName);
+		if (!associatedRepository) {
+			throw Error('Repository ' + repositoryName + ' cannot be found');
+		}
+		
+		return associatedRepository;
 	}
 
 

package/src/OneHatData.js

@@ -442,6 +442,19 @@ export class OneHatData extends EventEmitter {
 		return schema.getBoundRepository();
 	}
 
+	/**
+	 * Checks whether the requested bound Repository exists.
+	 * @param {string} name - Name of Schema
+	 * @return {boolean} hasRepository
+	 */
+	hasRepository = (name) => {
+		if (this.isDestroyed) {
+			throw new Error('this.getRepository is no longer valid. OneHatData has been destroyed.');
+		}
+		const repository = this.getRepository(name);
+		return !!repository;
+	}
+
 	/**
 	 * Get Repositories by a filter function
 	 * @param {function} filter - Filter function