@getjones/test-infra 1.2.6 → 1.2.8

package/package.json

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

package/src/index.js

@@ -9,27 +9,25 @@ const init = conf => {
 };
 
 const getInternalAPI = () => {
-	const internalApiPath = './saas/internal-api';
+	const auth = require('./saas/internal-api/auth');
+	const accounts = require('./saas/internal-api/accounts');
 
-	const auth = require(`${internalApiPath}/auth`);
-	const accounts = require(`${internalApiPath}/accounts`);
+	const projects = require('./saas/internal-api/projects');
+	const tabs = require('./saas/internal-api/tabs');
 
-	const projects = require(`${internalApiPath}/projects`);
-	const tabs = require(`${internalApiPath}/tabs`);
+	const requirements = require('./saas/internal-api/requirements');
+	const contractors = require('./saas/internal-api/contractors');
 
-	const requirements = require(`${internalApiPath}/requirements`);
-	const contractors = require(`${internalApiPath}/contractors`);
+	const coi = require('./saas/internal-api/coi');
+	const compliance = require('./saas/internal-api/compliance');
+	const users = require('./saas/internal-api/users');
 
-	const coi = require(`${internalApiPath}/coi`);
-	const compliance = require(`${internalApiPath}/compliance`);
-	const users = require(`${internalApiPath}/users`);
+	const reports = require('./saas/internal-api/reports');
+	const charts = require('./saas/internal-api/homepageCharts');
 
-	const reports = require(`${internalApiPath}/reports`);
-	const charts = require(`${internalApiPath}/homepageCharts`);
+	const globalRecord = require('./saas/internal-api/globalRecord');
 
-	const globalRecord = require(`${internalApiPath}/globalRecord`);
-
-	const threadScheduler = require(`${internalApiPath}/thread-scheduler/runner`);
+	const threadScheduler = require('./saas/internal-api/thread-scheduler/runner');
 
 	const internalAPI = {
 		auth,
@@ -51,12 +49,11 @@ const getInternalAPI = () => {
 };
 
 const getOpenAPI = () => {
-	const openApiPath = './saas/openapi';
-	const accounts = require(`${openApiPath}/accounts/accounts.setup`);
-	const tabs = require(`${openApiPath}/tabs/tabs.setup`);
-	const contractors = require(`${openApiPath}/contractors/contractors.setup`);
-	const projects = require(`${openApiPath}/projects/projects.setup`);
-	const requirements = require(`${openApiPath}/requirements`);
+	const accounts = require('./saas/openapi/accounts/accounts.setup');
+	const tabs = require('./saas/openapi/tabs/tabs.setup');
+	const contractors = require('./saas/openapi/contractors/contractors.setup');
+	const projects = require('./saas/openapi/projects/projects.setup');
+	const requirements = require('./saas/openapi/requirements');
 	const openAPI = { accounts, tabs, contractors, projects, requirements };
 	return openAPI;
 };

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

@@ -8,21 +8,21 @@ const Endpoints = {
 	edit: accountId => `${backendUrl}/saas/account/${accountId}/settings`
 };
 
-const create = async (account, context) => {
-	return requests.postRequestHandler(Endpoints.create, account, context).then(res => res.data);
+const create = (account, context) => {
+	return requests.postRequestHandler(Endpoints.create, account, context);
 };
 
-const deleteAccount = async (accountId, context) => {
+const deleteAccount = (accountId, context) => {
 	return requests.deleteRequestHandler(Endpoints.delete, context, {}, { 'userId': accountId });
 };
 
-const updateAccountSettings = async (accountId, settings, context) => {
+const updateAccountSettings = (accountId, settings, context) => {
 	return requests.putRequestHandler(Endpoints.edit(accountId), { accountId, ... settings }, context);
 };
 
-const getByName = async (accountName, context) => {
+const getByName = (accountName, context) => {
 	const params = { name: accountName };
-	return requests.getRequestHandler(Endpoints.getAccount, params, context).then(res => res.data);
+	return requests.getRequestHandler(Endpoints.getAccount, params, context);
 };
 
 module.exports = { create, getByName, deleteAccount, updateAccountSettings };

package/src/saas/internal-api/accounts/api/core/accounts.core.setup.js

@@ -13,21 +13,21 @@ const createAccount = async (createAccountModel, context) => {
 		'credentials.strongPassword': createAccountModel.password
 	});
 
-	return await accountsAPI.create(createAccountModel, context);
+	return accountsAPI.create(createAccountModel, context);
 };
 
 const getAccount = async (accountName, context) => {
-	const existingAccounts = await accountsAPI.getByName(accountName, context);
+	const response = await accountsAPI.getByName(accountName, context);
 
-	if (!existingAccounts || existingAccounts.length === 0) {
+	if (!response.data || !response.data.length) {
 		return null;
 	}
 
-	if (existingAccounts.length > 1) {
+	if (response.data.length > 1) {
 		throw new Error(`Got more than one account with the name: ${accountName}. IDs: ${existingAccounts.map(item => item.userId).join(', ')}`);
 	}
 
-	return existingAccounts[0];
+	return response.data[0];
 };
 
 const getOrCreateAccount = async (createAccountModel, context) => {
@@ -38,7 +38,7 @@ const getOrCreateAccount = async (createAccountModel, context) => {
 		return existingAccount;
 	}
 
-	return await createAccount(createAccountModel, context);
+	return createAccount(createAccountModel, context);
 };
 
 const getAccountId = async (accountName, context) => {

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

@@ -9,32 +9,32 @@ const Endpoints = {
 	dynamicApiKey: accountId => `${backendUrl}/saas/accounts/${accountId}/dynamic-api-key`
 };
 
-const createStaticApiKey = async (data, context) => {
-	return requests.postRequestHandler(Endpoints.createApiKey, data, context).then(res => res.data);
+const createStaticApiKey = (data, context) => {
+	return requests.postRequestHandler(Endpoints.createApiKey, data, context);
 };
 
-const createGeneratorApiKey = async (data, context) => {
-	return requests.postRequestHandler(Endpoints.createApiKey, data, context).then(res => res.data);
+const createGeneratorApiKey = (data, context) => {
+	return requests.postRequestHandler(Endpoints.createApiKey, data, context);
 };
 
-const getStaticApiKeyByAccountId = async (accountId, context) => {
-	return requests.getRequestHandler(Endpoints.getStaticApiKeyByAccountId(accountId), {}, context).then(res => res.data);
+const getStaticApiKeyByAccountId = (accountId, context) => {
+	return requests.getRequestHandler(Endpoints.getStaticApiKeyByAccountId(accountId), {}, context);
 };
 
-const getApiKeyDetails = async (apiKeyValue, context) => {
-	return requests.getRequestHandler(Endpoints.getApiKeyByKeyValue, { apiKeyValue }, context).then(res => res.data);
+const getApiKeyDetails = (apiKeyValue, context) => {
+	return requests.getRequestHandler(Endpoints.getApiKeyByKeyValue, { apiKeyValue }, context);
 };
 
-const deleteStaticApiKey = async (accountId, context) => {
-	return requests.deleteRequestHandler(Endpoints.removeStaticApiKey(accountId), context).then(res => res.data);
+const deleteStaticApiKey = (accountId, context) => {
+	return requests.deleteRequestHandler(Endpoints.removeStaticApiKey(accountId), context);
 };
 
-const deleteDynamicApiKey = async (accountId, context) => {
-	return requests.deleteRequestHandler(Endpoints.dynamicApiKey(accountId), context).then(res => res.data);
+const deleteDynamicApiKey = (accountId, context) => {
+	return requests.deleteRequestHandler(Endpoints.dynamicApiKey(accountId), context);
 };
 
-const makeDynamicApiKeyExpired = async (accountId, context) => {
-	return requests.patchRequestHandler(Endpoints.dynamicApiKey(accountId), context, {}).then(res => res.data);
+const makeDynamicApiKeyExpired = (accountId, context) => {
+	return requests.patchRequestHandler(Endpoints.dynamicApiKey(accountId), context, {});
 };
 
 module.exports = {

package/src/saas/internal-api/accounts/api/openapi/accounts.openapi.setup.js

@@ -28,19 +28,19 @@ const deleteStaticApiKey = async (accountId, context) => {
 };
 
 const getOrCreateStaticApiKey = async (accountId, apiKeyValue, context, { apiKeyType = 'ACCOUNT_STATIC', apiKeyName = null } = {}) => {
-	let existingApiKey = await getStaticApiKeyByAccountId(accountId, context);
+	let response = await getStaticApiKeyByAccountId(accountId, context);
 
-	if (existingApiKey.apiKeyValue) {
-		return existingApiKey;
+	if (response.data.apiKeyValue) {
+		return response.data;
 	}
 
-	existingApiKey = await getApiKeyDetails(apiKeyValue, context);
+	response = await getApiKeyDetails(apiKeyValue, context);
 
-	if (!existingApiKey.apiKeyValue) {
-		return createStaticApiKey(accountId, apiKeyValue, context, { apiKeyType, apiKeyName });
+	if (!response.data.apiKeyValue) {
+		response = await createStaticApiKey(accountId, apiKeyValue, context, { apiKeyType, apiKeyName });
 	}
 
-	return existingApiKey;
+	return response.data;
 };
 
 const getOrCreateGeneratorApiKey = async (accountId, apiKeyValue, context, { apiKeyType = 'GENERATOR', apiKeyName = null } = {}) => {

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

@@ -6,24 +6,35 @@ const Endpoints = {
 	preAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
 	audit: `${backendUrl}/saas/auditor/contractors/submit/audits`,
 	contractorDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
-	requirementDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/requirement`
+	requirementDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/requirement`,
+	isReaudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/isreaudit`
 };
 
 const getAuditorContractorList = (page, accountId, context) => {
-	return requests.getRequestHandler(Endpoints.auditorContractorList, { page, accountId }, context).then(res => res.data);
+	return requests.getRequestHandler(Endpoints.auditorContractorList, { page, accountId }, context);
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
 	await requests.getRequestHandler(Endpoints.preAudit(contractorId), {}, context);
-	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context).then(res => res.data);
+	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context);
 };
 
 const getContractorDetailsForAudit = (contractorId, context) => {
-	return requests.getRequestHandler(Endpoints.contractorDetailsForAudit(contractorId), {}, context).then(res => res.data);
+	return requests.getRequestHandler(Endpoints.contractorDetailsForAudit(contractorId), {}, context);
 };
 
 const getRequirementDetailsForAudit = (contractorId, context) => {
-	return requests.getRequestHandler(Endpoints.requirementDetailsForAudit(contractorId), {}, context).then(res => res.data);
+	return requests.getRequestHandler(Endpoints.requirementDetailsForAudit(contractorId), {}, context);
 };
 
-module.exports = { audit, getContractorDetailsForAudit, getRequirementDetailsForAudit, getAuditorContractorList };
+const isReaudit = (contractorId, context) => {
+	return requests.getRequestHandler(Endpoints.isReaudit(contractorId), {}, context);
+};
+
+module.exports = {
+	audit,
+	isReaudit,
+	getAuditorContractorList,
+	getContractorDetailsForAudit,
+	getRequirementDetailsForAudit
+};

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

@@ -19,4 +19,14 @@ const getRequirementDetailsForAudit = async (contractorId, context) => {
 	return await auditApi.getRequirementDetailsForAudit(contractorId, context);
 };
 
-module.exports = { audit, getContractorDetailsForAudit, getRequirementDetailsForAudit, getAuditorContractorList };
+const isReaudit = (contractorId, context) => {
+	return auditApi.isReaudit(contractorId, context);
+};
+
+module.exports = {
+	audit,
+	isReaudit,
+	getAuditorContractorList,
+	getContractorDetailsForAudit,
+	getRequirementDetailsForAudit
+};