@getjones/test-infra 2.1.4 → 2.2.0

package/package.json

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

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

@@ -2,17 +2,11 @@ const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
-	login: `${backendUrl}/logincontroller`,
-	isHubUser: email => `${backendUrl}/vendor-app/is-hub-user?email=${email}`
-
+	login: `${backendUrl}/logincontroller`
 };
 
 const login = (email, password) => {
 	return requests.postRequestHandler(Endpoints.login, { email, password });
 };
 
-const vendorHubLogin = email => {
-	return requests.postRequestHandler(Endpoints.isHubUser(email), { email });
-};
-
-module.exports = { login, vendorHubLogin };
+module.exports = { login };

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

@@ -13,17 +13,6 @@ const getAuthCookie = async (email, password) => {
 	}
 };
 
-const getVendorHubAuthCookie = async email => {
-	try {
-		const response = await authApi.vendorHubLogin(email);
-		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken2='));
-
-		return authCookie;
-	} catch (error) {
-		throw new Error(`Failed to login to vendor hub by email:${email}`, error);
-	}
-};
-
 const getIcsCookie = () => {
 	requiredValidation({
 		'credentials.superUser': credentials.superUser,
@@ -67,7 +56,6 @@ const getAuditorId = async () => {
 
 module.exports = {
 	getAuthCookie,
-	getVendorHubAuthCookie,
 	getIcsCookie,
 	getAuditorCookie,
 	getOperatorCookie,

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

@@ -1,6 +1,7 @@
 const auditApi = require('./audit.api');
 const { AuditRequestModel, AuditListParametersModel, AuditDatesModel } = require('../../models/audit/audit.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
+const env = require('../../../../../../../../src/env');
 const util = require('../../utils/util');
 const dataTypeUtils = require('../../../../../common/utils/dataTypeUtils');
 
@@ -60,7 +61,7 @@ const getAuditMetadata = async (
 		contractCreateDate: vendorDetails.contractCreateDate
 	};
 
-	metadata.auditorId = await util.getAuditorId();
+	metadata.auditorId = await util.getAuditorId(env);
 
 	return metadata;
 };

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

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

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

@@ -1,11 +1,12 @@
 const requirementsAPI = require('./requirements.api');
 const { CreateRequirementModel } = require('../models/create.requirement.model');
+const requirementUtils = require('../utils/utils');
+
 const { validateType } = require('../../../../common/validations/typeValidations');
 
 const createRequirement = (createRequirementModel, context) => {
 	validateType(createRequirementModel, CreateRequirementModel);
-	const params = { 'leaseId': '' };
-	return requirementsAPI.createRequirement(createRequirementModel, context, params);
+	return requirementsAPI.createRequirement(createRequirementModel, context);
 };
 
 const getRequirementsByTabId = (tabId, context) => {
@@ -16,8 +17,58 @@ const getRequirementById = (requirementId, context) => {
 	return requirementsAPI.getRequirementById(requirementId, context);
 };
 
+const getRequirementByName = async (tabId, requirementName, context) => {
+	const { data: requirementList } = await getRequirementsByTabId(tabId, context);
+
+	const requirement = requirementList.find(req => req.name === requirementName);
+
+	if (!requirement) {
+		return null;
+	}
+
+	const requirementResponse = await getRequirementById(requirement.id, context);
+	return requirementResponse.data.requirement;
+};
+
+const getRequirementIdByName = async (tabId, requirementName, context) => {
+	const requirement = await getRequirementByName(tabId, requirementName, context);
+	return requirement ? requirement.id : requirement;
+};
+
+const getOrCreateRequirement = async (accountId, requirement, context, projectId, tabId) => {
+	let existingRequirement = await getRequirementByName(tabId, requirement.name, context);
+
+	if (!existingRequirement) {
+		const createRequirementModel = getCreateRequirementModel(requirement.policies, requirement.name, accountId, projectId, tabId);
+		await createRequirement(createRequirementModel, context);
+		existingRequirement = await getRequirementByName(tabId, requirement.name, context);
+	}
+
+	return existingRequirement;
+};
+
 const deleteByRequirementId = (requirementId, context) => {
 	return requirementsAPI.deleteByRequirementId(requirementId, context);
 };
 
-module.exports = { createRequirement, getRequirementsByTabId, deleteByRequirementId, getRequirementById };
+const deleteRequirementByName = async (requirementName, tabId, context) => {
+	const requirementToDelete = await getRequirementByName(tabId, requirementName, context);
+	return deleteByRequirementId(requirementToDelete.id, context);
+};
+
+const getCreateRequirementModel = (requirementConfig, requirementName, accountId, projectId, tabId) => {
+	return requirementUtils.getCreateRequirementModel(requirementConfig, requirementName, accountId, projectId, tabId);
+};
+
+module.exports = {
+	createRequirement,
+	getRequirementById,
+	getRequirementByName,
+	getRequirementIdByName,
+	getRequirementsByTabId,
+	getOrCreateRequirement,
+	deleteByRequirementId,
+	deleteRequirementByName,
+
+	getCreateRequirementModel
+};

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

@@ -17,7 +17,7 @@ const preparePolicyAttributesTypes = function(value) {
 		return models.AttributeTypes.get(attributeTypes.limit);
 	}
 
-	if (dataTypeUtils.isValueOfABoolenType(attributesValue)) {
+	if (dataTypeUtils.isBoolean(attributesValue)) {
 		return models.AttributeTypes.get(attributeTypes.boolean);
 	}
 
@@ -25,7 +25,7 @@ const preparePolicyAttributesTypes = function(value) {
 };
 
 const prepareEndorsmentAttributesTypes = function(value) {
-	if (dataTypeUtils.isValueOfABoolenType(value)) {
+	if (dataTypeUtils.isBoolean(value)) {
 		return models.AttributeTypes.get(attributeTypes.boolean);
 	}