@getjones/test-infra 2.2.1 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "2.2.1",
+  "version": "2.4.0",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {

package/src/env.js

@@ -37,9 +37,21 @@ const isLocalhost = () => {
 	return privateMembers.backendUrl.includes('localhost');
 };
 
+const systemUserIdentities = {};
+
+const getSystemUserIdentity = email => {
+	return systemUserIdentities[email] || null;
+};
+
+const addUserIdentity = (email, cookie, id) => {
+	systemUserIdentities[email] = { cookie, id };
+};
+
 module.exports = {
 	init,
 	getEnv: () => privateMembers,
 	requiredValidation,
-	isLocalhost
+	isLocalhost,
+	getSystemUserIdentity,
+	addUserIdentity
 };

package/src/saas/internal-api/accounts/consts/consts.js

@@ -0,0 +1,6 @@
+const ACCOUNT_TYPES = {
+	PROPERTY: 'Property Management',
+	CONSTRUCTION: 'Construction'
+};
+
+module.exports = { ACCOUNT_TYPES };

package/src/saas/internal-api/accounts/index.js

@@ -6,6 +6,7 @@ const settingsModels = { UpdateAccountSettingsModel };
 
 const models = { core: coreModels, settings: settingsModels };
 const utils = require('./utils/utils');
+const consts = require('./consts/consts');
 
 const coreService = require('./api/core/accounts.core.service');
 const openApiServices = require('./api/openapi/accounts.openapi.service');
@@ -17,4 +18,4 @@ const services = {
 	settings: settingsServices
 };
 
-module.exports = { services, models, utils };
+module.exports = { services, models, utils, consts };

package/src/saas/internal-api/accounts/models/core/create.account.model.js

@@ -1,15 +1,16 @@
 const env = require('../../../../../env');
 const { credentials, accountCreationSecret } = env.getEnv();
-const PROPERTY_TYPE = 'Property Management';
+const { ACCOUNT_TYPES } = require('../../consts/consts');
 
-function CreateAccountModel(accountName, email, password = credentials.strongPassword,
-	secret = accountCreationSecret, propertyType = PROPERTY_TYPE) {
-	this.companyName = accountName;
-	this.email = email;
-	this.password = password;
-	this.verifyPassword = password;
-	this.secret = secret;
-	this.userType = propertyType;
+class CreateAccountModel {
+	constructor(accountName, email, password = credentials.strongPassword, propertyType = ACCOUNT_TYPES.PROPERTY) {
+		this.companyName = accountName;
+		this.email = email;
+		this.password = password;
+		this.verifyPassword = password;
+		this.userType = propertyType;
+		this.secret = accountCreationSecret;
+	}
 }
 
 module.exports = CreateAccountModel;

package/src/saas/internal-api/auth/api/auth.service.js

@@ -1,12 +1,20 @@
-const { getEnv, requiredValidation } = require('../../../../env');
+const { getEnv, requiredValidation, getSystemUserIdentity, addUserIdentity } = require('../../../../env');
 const { credentials } = getEnv();
 const authApi = require('./auth.api');
 
 const getAuthCookie = async (email, password) => {
+	const systemUser = getSystemUserIdentity(email);
+
+	if (systemUser) {
+		return systemUser.cookie;
+	}
+
 	try {
 		const response = await authApi.login(email, password);
 		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken='));
 
+		addUserIdentity(email, authCookie, response.data.id);
+
 		return authCookie;
 	} catch (error) {
 		throw new Error(`Failed to login to email:${email}`, error);
@@ -50,26 +58,10 @@ const getOperatorCookie = () => {
 	return getAuthCookie(operatorUser, operatorPassword);
 };
 
-const getAuditorId = async () => {
-	const { auditorUser, auditorPassword } = credentials;
-	requiredValidation({
-		'credentials.auditorUser': auditorUser,
-		'credentials.auditorPassword': auditorPassword
-	});
-
-	try {
-		const response = await authApi.login(auditorUser, auditorPassword);
-		return response.data.id;
-	} catch (error) {
-		throw new Error('Failed to get auditor id', error);
-	}
-};
-
 module.exports = {
 	getAuthCookie,
 	getVendorHubAuthCookie,
 	getIcsCookie,
 	getAuditorCookie,
-	getOperatorCookie,
-	getAuditorId
+	getOperatorCookie
 };

package/src/saas/internal-api/compliance/api/audit/audit.api.js

@@ -1,6 +1,5 @@
 const requests = require('../../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../../env').getEnv();
-const { createAuditEntity } = require('../../utils/util');
 
 const Endpoints = {
 	auditorContractorList: `${backendUrl}/saas/auditor/contractors`,

package/src/saas/internal-api/compliance/utils/util.js

@@ -2,7 +2,8 @@ const { AUDIT_ENTITY_STATUSES, DEFAULT_POLICY_ID, VALID_SCORES } = require('../c
 const { isObject, isArray } = require('../../../../common/utils/dataTypeUtils');
 const timeUtils = require('../../../../common/utils/timeUtils');
 const auditModels = require('../models/audit/audit.model');
-const auth = require('../../auth');
+const { getEnv, getSystemUserIdentity } = require('../../../../env');
+const { credentials } = getEnv();
 
 const emptyValue = '';
 
@@ -127,7 +128,8 @@ const createAuditEntity = (
 };
 
 const getAuditorId = () => {
-	return auth.services.getAuditorId();
+	const auditorIdentity = getSystemUserIdentity(credentials.auditorUser);
+	return auditorIdentity.id;
 };
 
 module.exports = {

package/src/saas/internal-api/requirements/api/requirements.api.js

@@ -8,16 +8,17 @@ const Endpoints = {
 	delete: requirementId => `${backendUrl}/saas/requirement/${requirementId}`
 };
 
-const createRequirement = (createRequirementModel, context) => {
-	return requests.postRequestHandler(Endpoints.create, createRequirementModel, context);
+const createRequirement = (createRequirementModel, tabId, context) => {
+	const params = { tabId };
+	return requests.postRequestHandler(Endpoints.create, createRequirementModel, context, {}, params);
 };
 
 const getRequirementsByTabId = (tabId, context) => {
 	return requests.getRequestHandler(Endpoints.getRequirementsByTabId, { tabId }, context);
 };
 
-const getRequirementById = (requirementId, context) => {
-	return requests.getRequestHandler(Endpoints.getRequirementById(requirementId), {}, context);
+const getRequirementById = (requirementId, context, isPermanentLink = false) => {
+	return requests.getRequestHandler(Endpoints.getRequirementById(requirementId), { isPermanentLink }, context);
 };
 
 const deleteByRequirementId = (requirementId, context) => {

package/src/saas/internal-api/requirements/api/requirements.service.js

@@ -4,20 +4,20 @@ const requirementUtils = require('../utils/utils');
 
 const { validateType } = require('../../../../common/validations/typeValidations');
 
-const createRequirement = (createRequirementModel, context) => {
+const createRequirement = (createRequirementModel, tabId, context) => {
 	validateType(createRequirementModel, CreateRequirementModel);
-	return requirementsAPI.createRequirement(createRequirementModel, context);
+	return requirementsAPI.createRequirement(createRequirementModel, tabId, context);
 };
 
 const getRequirementsByTabId = (tabId, context) => {
 	return requirementsAPI.getRequirementsByTabId(tabId, context);
 };
 
-const getRequirementById = (requirementId, context) => {
-	return requirementsAPI.getRequirementById(requirementId, context);
+const getRequirementById = (requirementId, context, isPermanentLink = false) => {
+	return requirementsAPI.getRequirementById(requirementId, context, isPermanentLink);
 };
 
-const getRequirementByName = async (tabId, requirementName, context) => {
+const getRequirementByName = async (tabId, requirementName, context, isPermanentLink = false) => {
 	const { data: requirementList } = await getRequirementsByTabId(tabId, context);
 
 	const requirement = requirementList.find(req => req.name === requirementName);
@@ -26,7 +26,7 @@ const getRequirementByName = async (tabId, requirementName, context) => {
 		return null;
 	}
 
-	const requirementResponse = await getRequirementById(requirement.id, context);
+	const requirementResponse = await getRequirementById(requirement.id, context, isPermanentLink);
 	return requirementResponse.data.requirement;
 };
 
@@ -35,12 +35,12 @@ const getRequirementIdByName = async (tabId, requirementName, context) => {
 	return requirement ? requirement.id : requirement;
 };
 
-const getOrCreateRequirement = async (accountId, requirement, context, projectId, tabId) => {
+const getOrCreateRequirement = async (requirement, tabId, context) => {
 	let existingRequirement = await getRequirementByName(tabId, requirement.name, context);
 
 	if (!existingRequirement) {
-		const createRequirementModel = getCreateRequirementModel(requirement.policies, requirement.name, accountId, projectId, tabId);
-		await createRequirement(createRequirementModel, context);
+		const createRequirementModel = getCreateRequirementModel(requirement);
+		await createRequirement(createRequirementModel, tabId, context);
 		existingRequirement = await getRequirementByName(tabId, requirement.name, context);
 	}
 
@@ -56,8 +56,8 @@ const deleteRequirementByName = async (requirementName, tabId, context) => {
 	return deleteByRequirementId(requirementToDelete.id, context);
 };
 
-const getCreateRequirementModel = (requirementConfig, requirementName, accountId, projectId, tabId) => {
-	return requirementUtils.getCreateRequirementModel(requirementConfig, requirementName, accountId, projectId, tabId);
+const getCreateRequirementModel = requirement => {
+	return requirementUtils.getCreateRequirementModel(requirement);
 };
 
 module.exports = {

package/src/saas/internal-api/requirements/consts/consts.js

@@ -0,0 +1,6 @@
+const REQUIREMENT_SHARING_LEVELS = {
+	TAB: 'Tab',
+	ACCOUNT: 'Account'
+};
+
+module.exports = { REQUIREMENT_SHARING_LEVELS };

package/src/saas/internal-api/requirements/models/create.requirement.model.js

@@ -1,37 +1,37 @@
 const Enum = require('enum');
 const { validateType } = require('../../../../common/validations/typeValidations');
+const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 
-const DEFAULT_REQUIREMENT_TYPE = 'REQUIREMENT';
+class CreateRequirementModel {
+	constructor(name, policies, sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB) {
+		this.name = name;
+		this.policies = policies;
+		this.sharingLevel = sharingLevel;
 
-function CreateRequirementModel(accountId, projectId, tabId, name, policies) {
-	this.userId = accountId;
-	this.projectId = projectId;
-	this.tabId = tabId;
-	this.name = name;
-	this.policies = policies;
-	this.requirementType = DEFAULT_REQUIREMENT_TYPE;
-
-	validateType(policies, Array);
-	policies && validateType(policies[0], Policy);
+		validateType(policies, Array);
+		policies && validateType(policies[0], Policy);
+	}
 }
 
-function Policy(name, attributes) {
-	this.policyName = name;
-	this.attributes = attributes;
+class Policy {
+	constructor(name, attributes) {
+		this.policyName = name;
+		this.attributes = attributes;
 
-	validateType(attributes, Array);
-	attributes && validateType(attributes[0], Attribute);
+		validateType(attributes, Array);
+		attributes && validateType(attributes[0], Attribute);
+	}
 }
 
-function Attribute(name, type, values) {
-	this.attributeName = name;
-	this.type = type.value;
-	this.values = values.map(function(value) {
-		return { value };
-	});
+class Attribute {
+	constructor(name, type, values) {
+		this.attributeName = name;
+		this.type = type.value;
+		this.values = values.map(value => ({ value }));
 
-	if (!AttributeTypes.get(type) || !AttributeTypes.get(type.key)) {
-		throw TypeError(`Expected type to be instance of: ${AttributeTypes.name}`);
+		if (!AttributeTypes.get(type) || !AttributeTypes.get(type.key)) {
+			throw TypeError(`Expected type to be instance of: ${AttributeTypes.name}`);
+		}
 	}
 }
 

package/src/saas/internal-api/requirements/utils/utils.js

@@ -1,6 +1,7 @@
 const models = require('../models/create.requirement.model');
 const attributeTypes = require('../consts/attributeTypes.json');
 const dataTypeUtils = require('../../../../common/utils/dataTypeUtils');
+const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 
 const convertNumericValuesToNumberType = function(value) {
 	if (dataTypeUtils.isString(value) && value.startsWith('$')) {
@@ -76,11 +77,13 @@ const getPolicyModel = function(policyData) {
 	return new models.Policy(policyData.name, attributeModels);
 };
 
-const getCreateRequirementModel = function(requirementConfig, requirementName, accountId, projectId, tabId) {
-	const policies = parseRequirementConfig(requirementConfig);
-	const policyModels = policies.map(policy => getPolicyModel(policy));
+const getCreateRequirementModel = function(requirement) {
+	const { policies, name, sharingLevel } = requirement;
 
-	return new models.CreateRequirementModel(accountId, projectId, tabId, requirementName, policyModels);
+	const parsedPolicies = parseRequirementConfig(policies);
+	const policyModels = parsedPolicies.map(policy => getPolicyModel(policy));
+
+	return new models.CreateRequirementModel(name, policyModels, sharingLevel);
 };
 
 module.exports = {