@getjones/test-infra 2.5.0 → 2.6.1

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

@@ -1,32 +1,32 @@
-const requests = require('../../../../common/requests/cookieAuth/requests');
-const { backendUrl } = require('../../../../env').getEnv();
-
-const Endpoints = {
-	getTabsByProjectId: `${backendUrl}/saas/vendortab`,
-	getTabsByTabId: `${backendUrl}/saas/vendortab`,
-	create: `${backendUrl}/saas/vendortab`,
-	update: `${backendUrl}/saas/vendortab`,
-	delete: `${backendUrl}/saas/vendortab`
-};
-
-const getTabByTabId = (tabId, context) => {
-	return requests.getRequestHandler(Endpoints.getTabsByTabId, { tabId }, context);
-};
-
-const getTabsByProjectId = (projectId, context) => {
-	return requests.getRequestHandler(Endpoints.getTabsByProjectId, { projectId }, context);
-};
-
-const createTab = (tabModel, context) => {
-	return requests.postRequestHandler(Endpoints.create, tabModel, context);
-};
-
-const updateTab = (tabModel, context) => {
-	return requests.putRequestHandler(Endpoints.update, tabModel, context);
-};
-
-const deleteTab = (tabId, context) => {
-	return requests.deleteRequestHandler(Endpoints.delete, context, {}, { tabId });
-};
-
-module.exports = { getTabByTabId, getTabsByProjectId, createTab, updateTab, deleteTab };
+const requests = require('../../../../common/requests/cookieAuth/requests');
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+	getTabsByProjectId: `${backendUrl}/saas/vendortab`,
+	getTabsByTabId: `${backendUrl}/saas/vendortab`,
+	create: `${backendUrl}/saas/vendortab`,
+	update: `${backendUrl}/saas/vendortab`,
+	delete: `${backendUrl}/saas/vendortab`
+};
+
+const getTabByTabId = (tabId, context) => {
+	return requests.getRequestHandler(Endpoints.getTabsByTabId, { tabId }, context);
+};
+
+const getTabsByProjectId = (projectId, context) => {
+	return requests.getRequestHandler(Endpoints.getTabsByProjectId, { projectId }, context);
+};
+
+const createTab = (tabModel, context) => {
+	return requests.postRequestHandler(Endpoints.create, tabModel, context);
+};
+
+const updateTab = (tabModel, context) => {
+	return requests.putRequestHandler(Endpoints.update, tabModel, context);
+};
+
+const deleteTab = (tabId, context) => {
+	return requests.deleteRequestHandler(Endpoints.delete, context, {}, { tabId });
+};
+
+module.exports = { getTabByTabId, getTabsByProjectId, createTab, updateTab, deleteTab };

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

@@ -1,54 +1,54 @@
-const tabsAPI = require('./tabs.api');
-const { CreateTabModel, UpdateTabModel } = require('../models/tabs.model');
-
-const createTab = async (projectId, tabName, tabType, context) => {
-	const tabModel = new CreateTabModel(projectId, tabName, tabType);
-	return tabsAPI.createTab(tabModel, context);
-};
-
-const getTabById = async (tabId, context) => {
-	return tabsAPI.getTabByTabId(tabId, context);
-};
-
-const getTabsByProjectId = async (projectId, context) => {
-	return tabsAPI.getTabsByProjectId(projectId, context);
-};
-
-const getTabsByName = async (projectId, tabName, context, { tabType } = {}) => {
-	const { data: tabs } = await getTabsByProjectId(projectId, context);
-	const requestedTab = tabType ?
-		tabs.find(tab => tab.tabName === tabName && tab.type === tabType) :
-		tabs.find(tab => tab.tabName === tabName);
-	return requestedTab;
-};
-
-const getOrCreateTab = async (projectId, tabName, tabType, context) => {
-	const { data: tabs } = await getTabsByProjectId(projectId, context);
-	const existingTab = tabs.find(tab => tab.tabName === tabName && tab.type === tabType);
-
-	if (existingTab) {
-		return existingTab;
-	}
-
-	const createResponse = await createTab(projectId, tabName, tabType, context);
-	return createResponse.data;
-};
-
-const updateTab = async (projectId, tabName, tabType, tabId, context) => {
-	const tabModel = new UpdateTabModel(projectId, tabName, tabType, tabId);
-	return tabsAPI.updateTab(tabModel, context);
-};
-
-const deleteTabById = async (tabId, context) => {
-	return tabsAPI.deleteTab(tabId, context);
-};
-
-module.exports = {
-	createTab,
-	getTabById,
-	getTabsByProjectId,
-	getTabsByName,
-	getOrCreateTab,
-	updateTab,
-	deleteTabById
-};
+const tabsAPI = require('./tabs.api');
+const { CreateTabModel, UpdateTabModel } = require('../models/tabs.model');
+
+const createTab = async (projectId, tabName, tabType, context) => {
+	const tabModel = new CreateTabModel(projectId, tabName, tabType);
+	return tabsAPI.createTab(tabModel, context);
+};
+
+const getTabById = async (tabId, context) => {
+	return tabsAPI.getTabByTabId(tabId, context);
+};
+
+const getTabsByProjectId = async (projectId, context) => {
+	return tabsAPI.getTabsByProjectId(projectId, context);
+};
+
+const getTabsByName = async (projectId, tabName, context, { tabType } = {}) => {
+	const { data: tabs } = await getTabsByProjectId(projectId, context);
+	const requestedTab = tabType ?
+		tabs.find(tab => tab.tabName === tabName && tab.type === tabType) :
+		tabs.find(tab => tab.tabName === tabName);
+	return requestedTab;
+};
+
+const getOrCreateTab = async (projectId, tabName, tabType, context) => {
+	const { data: tabs } = await getTabsByProjectId(projectId, context);
+	const existingTab = tabs.find(tab => tab.tabName === tabName && tab.type === tabType);
+
+	if (existingTab) {
+		return existingTab;
+	}
+
+	const createResponse = await createTab(projectId, tabName, tabType, context);
+	return createResponse.data;
+};
+
+const updateTab = async (projectId, tabName, tabType, tabId, context) => {
+	const tabModel = new UpdateTabModel(projectId, tabName, tabType, tabId);
+	return tabsAPI.updateTab(tabModel, context);
+};
+
+const deleteTabById = async (tabId, context) => {
+	return tabsAPI.deleteTab(tabId, context);
+};
+
+module.exports = {
+	createTab,
+	getTabById,
+	getTabsByProjectId,
+	getTabsByName,
+	getOrCreateTab,
+	updateTab,
+	deleteTabById
+};

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

@@ -1,3 +1,3 @@
-const services = require('./api/tabs.service');
-
-module.exports = { services };
+const services = require('./api/tabs.service');
+
+module.exports = { services };

package/src/saas/internal-api/tabs/models/tabs.model.js

@@ -1,18 +1,18 @@
-class CreateTabModel {
-	constructor(projectId, tabName, tabType) {
-		this.projectId = projectId;
-		this.tabName = tabName;
-		this.type = tabType;
-	}
-}
-
-class UpdateTabModel {
-	constructor(projectId, tabName, tabType, tabId) {
-		this.projectId = projectId;
-		this.tabName = tabName;
-		this.type = tabType;
-		this.tabId = tabId;
-	}
-}
-
-module.exports = { CreateTabModel, UpdateTabModel };
+class CreateTabModel {
+	constructor(projectId, tabName, tabType) {
+		this.projectId = projectId;
+		this.tabName = tabName;
+		this.type = tabType;
+	}
+}
+
+class UpdateTabModel {
+	constructor(projectId, tabName, tabType, tabId) {
+		this.projectId = projectId;
+		this.tabName = tabName;
+		this.type = tabType;
+		this.tabId = tabId;
+	}
+}
+
+module.exports = { CreateTabModel, UpdateTabModel };

package/src/saas/internal-api/thread-scheduler/runner.js

@@ -1,13 +1,39 @@
-const requests = require('../../internal-api/../../common/requests/cookieAuth/requests');
-const { backendUrl, threadSchedulerSecret } = require('../../../env').getEnv();
-
-const Endpoints = {
-	run: `${backendUrl}/threadSchedular/${threadSchedulerSecret}`
-};
-
-const runThreadScheduler = ({ contractorIds = [], scheduledReportsIds = [] } = {}) => {
-	const params = { contractorIdsList: contractorIds.toString(), scheduledReportsIds: scheduledReportsIds.toString() };
-	return requests.getRequestHandler(Endpoints.run, params);
-};
-
-module.exports = { runThreadScheduler };
+const requests = require('../../internal-api/../../common/requests/cookieAuth/requests');
+const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');
+const timeUtils = require('../../../common/utils/timeUtils');
+
+const { backendUrl, threadSchedulerSecret } = require('../../../env').getEnv();
+
+const Endpoints = {
+	run: `${backendUrl}/threadSchedular/${threadSchedulerSecret}`
+};
+
+const runThreadScheduler = async ({ contractorIds = [], scheduledReportsIds = [], retries = 10 } = {}) => {
+	const params = { contractorIdsList: contractorIds.toString(), scheduledReportsIds: scheduledReportsIds.toString() };
+
+	let response;
+	while (!response || isOverloadError(response.status) && retries--) {
+		response = await requests.getRequestHandler(Endpoints.run, params);
+		await timeUtils.waitFor(1.5).seconds;
+	}
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error('Thread scheduler has failed to run', response);
+	}
+
+	return response;
+};
+
+module.exports = {
+	runForRecords: function(contractorIds) {
+		return runThreadScheduler({ contractorIds });
+	},
+	runForReports: function(scheduledReportsIds) {
+		return runThreadScheduler({ scheduledReportsIds });
+	}
+};
+
+function isOverloadError(errorCode) {
+	const overloadResponseErrors = [httpResponseStatusCodes.TOO_MANY_REQUESTS, httpResponseStatusCodes.CONFLICT];
+	return overloadResponseErrors.includes(errorCode);
+}

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

@@ -1,77 +1,77 @@
-const requests = require('../../../../common/requests/cookieAuth/requests');
-const { backendUrl } = require('../../../../env').getEnv();
-
-const Endpoints = {
-	invite: `${backendUrl}/saas/project/team-member`,
-	editUserProjects: `${backendUrl}/saas/project/team-member`,
-	editUserRole: userId => `${backendUrl}/secured/users/${userId}/change-role`,
-	getByProjectId: projectId =>
-		`${backendUrl}/saas/project/${projectId}/team-members`,
-	getByEmail: email => `${backendUrl}/saas/team-member/by-email/${email}`,
-	delete: userId => `${backendUrl}/saas/users/${userId}`,
-	deleteSingleProject: (userId, projectId) => `${backendUrl}/saas/project/${projectId}/sub-account/${userId}`,
-	reinvite: `${backendUrl}/saas/project/team-member/reinvite`,
-	getUserEncryptedData: (email, userRole) => `${backendUrl}/saas/team-member/email/${email}/role/${userRole}/signup-data`,
-	signupUser: `${backendUrl}/_saas/guests/signup`,
-	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`
-};
-
-const invite = (invitedUser, context, { disableSendMail = true } = {}) => {
-	return requests.putRequestHandler(Endpoints.invite, invitedUser, context, {}, { disableSendMail });
-};
-
-const signupUser = (signupUserModel, context) => {
-	return requests.postRequestHandler(Endpoints.signupUser, signupUserModel, context, {}, {});
-};
-
-const editUserRole = (userId, data, context) => {
-	return requests.patchRequestHandler(Endpoints.editUserRole(userId), context, data);
-};
-
-const editUserProjects = (data, context) => {
-	const params = { disableSendMail: true };
-	return requests.putRequestHandler(Endpoints.editUserProjects, data, context, {}, params);
-};
-
-const getUsersByProjectId = (projectId, context) => {
-	return requests.getRequestHandler(Endpoints.getByProjectId(projectId), null, context);
-};
-
-const getUserByEmail = (email, context) => {
-	return requests.getRequestHandler(Endpoints.getByEmail(email), null, context);
-};
-
-const getUserEncryptedData = (email, role, context) => {
-	return requests.getRequestHandler(Endpoints.getUserEncryptedData(email, role), null, context);
-};
-
-const deleteUser = (userId, context) => {
-	return requests.deleteRequestHandler(Endpoints.delete(userId), context);
-};
-
-const deleteUserFromSingleProject = (userId, projectId, context) => {
-	return requests.deleteRequestHandler(Endpoints.deleteSingleProject(userId, projectId), context);
-};
-
-const removeAllUserTraceFromDb = (userId, context) => {
-	return requests.deleteRequestHandler(Endpoints.removeAllUserTraceFromDb(userId), context);
-};
-
-const reinviteUser = (userId, context) => {
-	const params = { id: userId };
-	return requests.postRequestHandler(Endpoints.reinvite, {}, context, {}, params);
-};
-
-module.exports = {
-	invite,
-	signupUser,
-	getUsersByProjectId,
-	getUserByEmail,
-	getUserEncryptedData,
-	deleteUser,
-	deleteUserFromSingleProject,
-	removeAllUserTraceFromDb,
-	editUserRole,
-	editUserProjects,
-	reinviteUser
-};
+const requests = require('../../../../common/requests/cookieAuth/requests');
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+	invite: `${backendUrl}/saas/project/team-member`,
+	editUserProjects: `${backendUrl}/saas/project/team-member`,
+	editUserRole: userId => `${backendUrl}/secured/users/${userId}/change-role`,
+	getByProjectId: projectId =>
+		`${backendUrl}/saas/project/${projectId}/team-members`,
+	getByEmail: email => `${backendUrl}/saas/team-member/by-email/${email}`,
+	delete: userId => `${backendUrl}/saas/users/${userId}`,
+	deleteSingleProject: (userId, projectId) => `${backendUrl}/saas/project/${projectId}/sub-account/${userId}`,
+	reinvite: `${backendUrl}/saas/project/team-member/reinvite`,
+	getUserEncryptedData: (email, userRole) => `${backendUrl}/saas/team-member/email/${email}/role/${userRole}/signup-data`,
+	signupUser: `${backendUrl}/_saas/guests/signup`,
+	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`
+};
+
+const invite = (invitedUser, context, { disableSendMail = true } = {}) => {
+	return requests.putRequestHandler(Endpoints.invite, invitedUser, context, {}, { disableSendMail });
+};
+
+const signupUser = (signupUserModel, context) => {
+	return requests.postRequestHandler(Endpoints.signupUser, signupUserModel, context, {}, {});
+};
+
+const editUserRole = (userId, data, context) => {
+	return requests.patchRequestHandler(Endpoints.editUserRole(userId), context, data);
+};
+
+const editUserProjects = (data, context) => {
+	const params = { disableSendMail: true };
+	return requests.putRequestHandler(Endpoints.editUserProjects, data, context, {}, params);
+};
+
+const getUsersByProjectId = (projectId, context) => {
+	return requests.getRequestHandler(Endpoints.getByProjectId(projectId), null, context);
+};
+
+const getUserByEmail = (email, context) => {
+	return requests.getRequestHandler(Endpoints.getByEmail(email), null, context);
+};
+
+const getUserEncryptedData = (email, role, context) => {
+	return requests.getRequestHandler(Endpoints.getUserEncryptedData(email, role), null, context);
+};
+
+const deleteUser = (userId, context) => {
+	return requests.deleteRequestHandler(Endpoints.delete(userId), context);
+};
+
+const deleteUserFromSingleProject = (userId, projectId, context) => {
+	return requests.deleteRequestHandler(Endpoints.deleteSingleProject(userId, projectId), context);
+};
+
+const removeAllUserTraceFromDb = (userId, context) => {
+	return requests.deleteRequestHandler(Endpoints.removeAllUserTraceFromDb(userId), context);
+};
+
+const reinviteUser = (userId, context) => {
+	const params = { id: userId };
+	return requests.postRequestHandler(Endpoints.reinvite, {}, context, {}, params);
+};
+
+module.exports = {
+	invite,
+	signupUser,
+	getUsersByProjectId,
+	getUserByEmail,
+	getUserEncryptedData,
+	deleteUser,
+	deleteUserFromSingleProject,
+	removeAllUserTraceFromDb,
+	editUserRole,
+	editUserProjects,
+	reinviteUser
+};

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

@@ -1,101 +1,101 @@
-const { InviteUserModel, SignupUserModel, EditUserModel } = require('../models/users.model');
-const { validateType } = require('../../../../common/validations/typeValidations');
-const { getEnv } = require('../../../../env');
-const { credentials } = getEnv();
-const userAPI = require('./users.api');
-const util = require('../utils/util');
-const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
-
-const inviteUser = async (invitedUser, context, { disableSendMail } = {}) => {
-	return userAPI.invite(invitedUser, context, { disableSendMail });
-};
-
-const signupUser = (signupUserModel, context) => {
-	validateType(signupUserModel, SignupUserModel);
-	return userAPI.signupUser(signupUserModel, context);
-};
-
-const editUserRole = async (userId, data, context) => {
-	return userAPI.editUserRole(userId, data, context);
-};
-
-const editUserProjects = async (editUserModel, context) => {
-	validateType(editUserModel, EditUserModel);
-	return userAPI.editUserProjects([editUserModel], context);
-};
-
-const getUsersByProjectId = async (projectId, context) => {
-	return userAPI.getUsersByProjectId(projectId, context);
-};
-
-const getUserByEmail = async (email, context) => {
-	return userAPI.getUserByEmail(email, context);
-};
-
-const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword } = {}) => {
-	let userResponse = await getUserByEmail(email, context);
-
-	if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified) {
-		return userResponse.data;
-	}
-
-	const inviteUserModel = new InviteUserModel(email, role, projectsIds, context);
-	const inviteResponse = await inviteUser([inviteUserModel], context);
-
-	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
-		throw new Error(`Failed to invite user with email: ${email}`, inviteResponse);
-	}
-
-	userResponse = await getUserByEmail(email, context);
-
-	//Already signup user
-	if (userResponse.data.isVerified) {
-		return userResponse.data;
-	}
-
-	const signupUserModel = await util.getSignupUserModel(email, role, fullName, password, context);
-	const signupResponse = await signupUser(signupUserModel, context);
-
-	if (signupResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to signup user with email: ${email}`, signupResponse);
-	}
-
-	userResponse = await getUserByEmail(email, context);
-	return userResponse.data;
-};
-
-const deleteUser = (userId, context) => {
-	return userAPI.deleteUser(userId, context);
-};
-
-const deleteUserFromSingleProject = (userId, projectId, context) => {
-	return userAPI.deleteUserFromSingleProject(userId, projectId, context);
-};
-
-const removeAllUserTraceFromDb = (userId, context) => {
-	return userAPI.removeAllUserTraceFromDb(userId, context);
-};
-
-const deleteUserByEmail = async (userEmail, context) => {
-	const { data: user } = await getUserByEmail(userEmail, context);
-	return deleteUser(user.subuserId, context);
-};
-
-const reinviteUser = (userId, context) => {
-	return userAPI.reinviteUser(userId, context);
-};
-
-module.exports = {
-	inviteUser,
-	signupUser,
-	getUsersByProjectId,
-	getUserByEmail,
-	getOrCreateUser,
-	deleteUser,
-	deleteUserFromSingleProject,
-	deleteUserByEmail,
-	removeAllUserTraceFromDb,
-	editUserRole,
-	editUserProjects,
-	reinviteUser
-};
+const { InviteUserModel, SignupUserModel, EditUserModel } = require('../models/users.model');
+const { validateType } = require('../../../../common/validations/typeValidations');
+const { getEnv } = require('../../../../env');
+const { credentials } = getEnv();
+const userAPI = require('./users.api');
+const util = require('../utils/util');
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+
+const inviteUser = async (invitedUser, context, { disableSendMail } = {}) => {
+	return userAPI.invite(invitedUser, context, { disableSendMail });
+};
+
+const signupUser = (signupUserModel, context) => {
+	validateType(signupUserModel, SignupUserModel);
+	return userAPI.signupUser(signupUserModel, context);
+};
+
+const editUserRole = async (userId, data, context) => {
+	return userAPI.editUserRole(userId, data, context);
+};
+
+const editUserProjects = async (editUserModel, context) => {
+	validateType(editUserModel, EditUserModel);
+	return userAPI.editUserProjects([editUserModel], context);
+};
+
+const getUsersByProjectId = async (projectId, context) => {
+	return userAPI.getUsersByProjectId(projectId, context);
+};
+
+const getUserByEmail = async (email, context) => {
+	return userAPI.getUserByEmail(email, context);
+};
+
+const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword } = {}) => {
+	let userResponse = await getUserByEmail(email, context);
+
+	if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified) {
+		return userResponse.data;
+	}
+
+	const inviteUserModel = new InviteUserModel(email, role, projectsIds, context);
+	const inviteResponse = await inviteUser([inviteUserModel], context);
+
+	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error(`Failed to invite user with email: ${email}`, inviteResponse);
+	}
+
+	userResponse = await getUserByEmail(email, context);
+
+	//Already signup user
+	if (userResponse.data.isVerified) {
+		return userResponse.data;
+	}
+
+	const signupUserModel = await util.getSignupUserModel(email, role, fullName, password, context);
+	const signupResponse = await signupUser(signupUserModel, context);
+
+	if (signupResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to signup user with email: ${email}`, signupResponse);
+	}
+
+	userResponse = await getUserByEmail(email, context);
+	return userResponse.data;
+};
+
+const deleteUser = (userId, context) => {
+	return userAPI.deleteUser(userId, context);
+};
+
+const deleteUserFromSingleProject = (userId, projectId, context) => {
+	return userAPI.deleteUserFromSingleProject(userId, projectId, context);
+};
+
+const removeAllUserTraceFromDb = (userId, context) => {
+	return userAPI.removeAllUserTraceFromDb(userId, context);
+};
+
+const deleteUserByEmail = async (userEmail, context) => {
+	const { data: user } = await getUserByEmail(userEmail, context);
+	return deleteUser(user.subuserId, context);
+};
+
+const reinviteUser = (userId, context) => {
+	return userAPI.reinviteUser(userId, context);
+};
+
+module.exports = {
+	inviteUser,
+	signupUser,
+	getUsersByProjectId,
+	getUserByEmail,
+	getOrCreateUser,
+	deleteUser,
+	deleteUserFromSingleProject,
+	deleteUserByEmail,
+	removeAllUserTraceFromDb,
+	editUserRole,
+	editUserProjects,
+	reinviteUser
+};

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

@@ -1,4 +1,4 @@
-const models = require('./models/users.model');
-const services = require('./api/users.service');
-
-module.exports = { services, models };
+const models = require('./models/users.model');
+const services = require('./api/users.service');
+
+module.exports = { services, models };