@getjones/test-infra 1.3.8 → 1.4.0

package/package.json

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

package/src/common/validations/typeValidations.js

@@ -4,4 +4,10 @@ const validateType = (input, expectedType) => {
 	}
 };
 
-module.exports = { validateType };
+const validateDateString = dateString => {
+	if (isNaN(Date.parse(dateString))) {
+		throw TypeError(`Invalid date string '${dateString}'`);
+	}
+};
+
+module.exports = { validateType, validateDateString };

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

@@ -35,8 +35,8 @@ const archiveByContractorId = (contractorId, context) => {
 	return requests.deleteRequestHandler(Endpoints.archive(contractorId), context);
 };
 
-const restoreByContractorId = (contractorId, context) => {
-	return requests.postRequestHandler(Endpoints.restore(contractorId), {}, context);
+const restoreByContractorId = (recordVerificationModel, context) => {
+	return requests.postRequestHandler(Endpoints.restore(recordVerificationModel.contractorId), recordVerificationModel, context);
 };
 
 const editContractor = (editContractorModel, context) => {

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

@@ -2,6 +2,7 @@ const contractorsAPI = require('./contractors.api');
 const { CreateContractorModel } = require('../models/create.contractor.model');
 const { ContractorModel, MptModel } = require('../models/edit.contractor.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
+const { RecordModifyDateVerificationModel } = require('../models/verification.contractor.model');
 
 const createContractor = async (createContractorModel, context) => {
 	validateType(createContractorModel, CreateContractorModel);
@@ -28,8 +29,9 @@ const archiveByContractorId = (contractorId, context) => {
 	return contractorsAPI.archiveByContractorId(contractorId, context);
 };
 
-const restoreByContractorId = (contractorId, context) => {
-	return contractorsAPI.restoreByContractorId(contractorId, context);
+const restoreByContractorId = (recordVerificationModel, context) => {
+	validateType(recordVerificationModel, RecordModifyDateVerificationModel);
+	return contractorsAPI.restoreByContractorId(recordVerificationModel, context);
 };
 
 const editContractor = (editContractorModel, context) => {

package/src/saas/internal-api/contractors/models/verification.contractor.model.js

@@ -0,0 +1,33 @@
+const { validateDateString } = require('../../../../common/validations/typeValidations');
+
+class RecordModifyDateVerificationModel {
+	constructor(
+		contractorId,
+		contractorDateModified,
+		{
+			contractorOverrideDateModified,
+			requirementId,
+			requirementDateModified
+		} = {}
+	) {
+		validateDateString(contractorDateModified);
+
+		if (contractorOverrideDateModified) {
+			validateDateString(contractorOverrideDateModified);
+		}
+
+		if (requirementId) {
+			validateDateString(requirementDateModified);
+		}
+
+		this.contractorId = contractorId;
+		this.contractorDateModified = contractorDateModified;
+		this.contractorOverrideDateModified = contractorOverrideDateModified;
+		this.requirementId = requirementId;
+		this.requirementDateModified = requirementDateModified;
+	}
+}
+
+module.exports = {
+	RecordModifyDateVerificationModel
+};

package/src/saas/internal-api/globalRecord/api/global.record.api.js

@@ -28,8 +28,8 @@ const getAllGlobalRecords = async (data, pageNumber, itemsInPage, context) => {
 	return cookieAuthRequests.postRequestHandler(Endpoints.getAllGlobalRecords(pageNumber, itemsInPage), data, context);
 };
 
-const deleteGlobalRecord = async (id, nodeBackendSecret) => {
-	return apiKeyAuthRequests.deleteRequestHandler(Endpoints.deleteGlobalRecord(id), nodeBackendSecret);
+const deleteGlobalRecord = async (id, nodeBackendSecret, globalRecordModel) => {
+	return apiKeyAuthRequests.deleteRequestHandler(Endpoints.deleteGlobalRecord(id), nodeBackendSecret, {}, {}, globalRecordModel);
 };
 
 const updateGlobalRecord = async (id, nodeBackendSecret, updatedGlobalRecord) => {

package/src/saas/internal-api/globalRecord/api/global.record.service.js

@@ -40,8 +40,8 @@ const getGlobalRecordServiceAreas = async context => {
 	return globalRecordAPI.getGlobalRecordServiceAreas(context);
 };
 
-const deleteGlobalRecord = async id => {
-	return globalRecordAPI.deleteGlobalRecord(id, nodeBackendSecret);
+const deleteGlobalRecord = async (id, globalRecordModel) => {
+	return globalRecordAPI.deleteGlobalRecord(id, nodeBackendSecret, globalRecordModel);
 };
 
 const updateGlobalRecord = async (id, updatedGlobalRecordModel) => {

package/src/saas/internal-api/globalRecord/models/global.record.model.js

@@ -14,7 +14,8 @@ class CreateGlobalRecordModel {
 			serviceAreas,
 			primaryEmail,
 			dba,
-			lastPublishUserName
+			lastPublishUserName,
+			__v
 		} = {}
 	) {
 		this.id = id;
@@ -31,6 +32,7 @@ class CreateGlobalRecordModel {
 		this.primaryEmail = primaryEmail;
 		this.dba = dba;
 		this.lastPublishUserName = lastPublishUserName;
+		this.__v = __v;
 	}
 }
 

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

@@ -4,48 +4,58 @@ const globalRecordModels = require('../models/global.record.model');
 const { CreateGlobalRecordModel } = globalRecordModels;
 const { createGlobalRecord, getAllGlobalRecordsInPage } = globalRecordServices;
 
-const { getCapitalLetterUnicodeValueList, getUniqueNumber } = require('../../../../common/utils/numberUtils');
+const {
+	getCapitalLetterUnicodeValueList,
+	getUniqueNumber
+} = require('../../../../common/utils/numberUtils');
 
 const { SERVICE_AREAS } = require('../consts');
 
-const createGlobalRecordConfig = (name, { stateIndex, glPolicyNumbers } = {}) => {
+const createGlobalRecordConfig = (
+	name,
+	{ stateIndex, glPolicyNumbers } = {}
+) => {
 	const serviceArea = getServiceAreaByIndex(stateIndex || 0);
 	const uniqueNumbers = glPolicyNumbers || getUniqueNumber();
 	const emailBase = name.replace(/\s+/g, '').toLowerCase();
 	return {
-		'header': `${name}Header`,
-		'recordName': `${name}Name`,
-		'additionalContacts': [`${emailBase}@additional1.jon`, `${emailBase}@additional2.jon`],
-		'brokerEmails': [`${emailBase}@broker1.jon`, `${emailBase}@broker2.jon`],
-		'expirationDate': '2030-12-09',
-		'publishDate': '',
-		'lastPublishUserName': '',
-		'glPolicyNumbers': [uniqueNumbers.toString()],
-		'numberOfAssociatedRequests': 0,
-		'numberOfFilledMandatory': 0,
-		'dba': '',
-		'primaryEmail': '',
-		'serviceAreas': [
-			getServiceArea(serviceArea)
-		]
+		header: `${name}Header`,
+		recordName: `${name}Name`,
+		additionalContacts: [
+			`${emailBase}@additional1.jon`,
+			`${emailBase}@additional2.jon`
+		],
+		brokerEmails: [`${emailBase}@broker1.jon`, `${emailBase}@broker2.jon`],
+		expirationDate: '2030-12-09',
+		publishDate: '',
+		lastPublishUserName: '',
+		glPolicyNumbers: [uniqueNumbers.toString()],
+		numberOfAssociatedRequests: 0,
+		numberOfFilledMandatory: 0,
+		dba: '',
+		primaryEmail: '',
+		serviceAreas: [getServiceArea(serviceArea)],
+		__v: 0
 	};
 };
 
 const getServiceArea = state => {
 	return {
-		'city': `${state}TestCity`,
-		'state': state
+		city: `${state}TestCity`,
+		state: state
 	};
 };
 
-const createGlobalRecordConfigs = (nameList, { stateIndexes, glPolicyNumbers } = {}) => {
-	return nameList.map((name, index) => createGlobalRecordConfig(
-		name,
-		{
+const createGlobalRecordConfigs = (
+	nameList,
+	{ stateIndexes, glPolicyNumbers } = {}
+) => {
+	return nameList.map((name, index) =>
+		createGlobalRecordConfig(name, {
 			stateIndex: stateIndexes ? stateIndexes[index] : index,
 			glPolicyNumbers: glPolicyNumbers ? glPolicyNumbers[index] : null
-		}
-	));
+		})
+	);
 };
 
 const createGlobalRecordModel = config => {
@@ -64,7 +74,8 @@ const createGlobalRecordModel = config => {
 			serviceAreas: config.serviceAreas,
 			primaryEmail: config.primaryEmail,
 			dba: config.dba,
-			lastPublishUserName: config.lastPublishUserName
+			lastPublishUserName: config.lastPublishUserName,
+			__v: config.__v
 		}
 	);
 };
@@ -81,7 +92,10 @@ const getCreateRandomGlobalRecordModels = nameList => {
 const createGlobalRecords = async (globalRecordModelList, context) => {
 	const newGlobalRecodDetailsList = new Array();
 	for (globalRecordModel of globalRecordModelList) {
-		const newGlobalRecordDetails = await createGlobalRecord(globalRecordModel, context);
+		const newGlobalRecordDetails = await createGlobalRecord(
+			globalRecordModel,
+			context
+		);
 		newGlobalRecodDetailsList.push(newGlobalRecordDetails);
 	}
 
@@ -92,7 +106,10 @@ const getGlobalRecordsByNumberOfPages = async (numberOfPages, context) => {
 	const allGlobalRecords = new Array();
 
 	for (let pageNumber = 1; pageNumber <= numberOfPages; pageNumber++) {
-		const allGlobalRecordsInPage = await getAllGlobalRecordsInPage(pageNumber, context);
+		const allGlobalRecordsInPage = await getAllGlobalRecordsInPage(
+			pageNumber,
+			context
+		);
 		allGlobalRecords.push(allGlobalRecordsInPage);
 	}
 
@@ -104,11 +121,16 @@ const getServiceAreaByIndex = stateIndex => {
 };
 
 const getGlobalRecordsDefaultNameList = (nameBase, listLength) => {
-	const letterUnicodeValueList = getCapitalLetterUnicodeValueList({ listLength });
+	const letterUnicodeValueList = getCapitalLetterUnicodeValueList({
+		listLength
+	});
 
 	//How much times same letter will appear in one index on the array
 	const repeatTimes = 4;
-	return letterUnicodeValueList.map(unicode => `${nameBase} ${String.fromCharCode(unicode).repeat(repeatTimes)}`);
+	return letterUnicodeValueList.map(
+		unicode =>
+			`${nameBase} ${String.fromCharCode(unicode).repeat(repeatTimes)}`
+	);
 };
 
 module.exports = {

package/src/saas/internal-api/projects/api/core/projects.service.js

@@ -1,14 +1,8 @@
 const projectsApi = require('./projects.api');
-const { core: accounts } = require('../../../accounts');
 const { validateType } = require('../../../../../common/validations/typeValidations');
 const CreateProjectModel = require('../../models/core/create.project.model');
 const UpdateProjectModel = require('../../models/core/update.project.model');
 
-const getProjectsByAccountName = async (accountName, context) => {
-	const accountId = await accounts.getAccountId(accountName, context);
-	return getProjectsByAccountId(accountId, context);
-};
-
 const getProjectsByAccountId = (accountId, context) => {
 	return projectsApi.getProjectsByAccountId(accountId, context);
 };
@@ -17,15 +11,21 @@ const getProjectByProjectId = (projectId, context) => {
 	return projectsApi.getProjectByProjectId(projectId, context);
 };
 
-const getProjectsByName = async (accountId, projectName, context) => {
+const getProjectByName = async (accountId, projectName, context) => {
 	const { data: projects } = await getProjectsByAccountId(accountId, context);
-	const filteredProjects = projects.filter(project => project.projectName === projectName);
-	return filteredProjects;
+	const requestedProject = projects.find(project => project.projectName === projectName);
+	return requestedProject ? requestedProject : null;
 };
 
 const deleteProjectByName = async (accountId, projectName, context) => {
-	const projects = await getProjectsByName(accountId, projectName, context);
-	projects.map(async project => await projectsApi.deleteProjectById(project.projectId, context));
+	const { data: projects } = await getProjectsByAccountId(accountId, context);
+	const filteredProjects = projects.filter(project => project.projectName === projectName);
+
+	await Promise.all(
+		filteredProjects.map(
+			async project => await projectsApi.deleteProjectById(project.projectId, context)
+		)
+	);
 };
 
 const createProject = (createProjectModel, context) => {
@@ -34,14 +34,14 @@ const createProject = (createProjectModel, context) => {
 };
 
 const getOrCreateProject = async (createProjectModel, context) => {
-	let existingProjects = await getProjectsByName(createProjectModel.userId, createProjectModel.projectName, context);
+	let project = await getProjectByName(createProjectModel.userId, createProjectModel.projectName, context);
 
-	if (!existingProjects.length) {
+	if (!project) {
 		await createProject(createProjectModel, context);
-		existingProjects = await getProjectsByName(createProjectModel.userId, createProjectModel.projectName, context);
+		project = await getProjectByName(createProjectModel.userId, createProjectModel.projectName, context);
 	}
 
-	return existingProjects[0] || null;
+	return project;
 };
 
 const updateProject = (updateProjectModel, context) => {
@@ -50,12 +50,11 @@ const updateProject = (updateProjectModel, context) => {
 };
 
 module.exports = {
-	getProjectsByAccountName,
+	getOrCreateProject,
 	getProjectsByAccountId,
+	getProjectByProjectId,
+	getProjectByName,
 	createProject,
 	deleteProjectByName,
-	getOrCreateProject,
-	updateProject,
-	getProjectsByName,
-	getProjectByProjectId
+	updateProject
 };

package/src/saas/internal-api/projects/consts/defaultProject.js

@@ -0,0 +1,3 @@
+const DEFAULT_PROJECT_NAME = 'My First Project';
+
+module.exports = { NAME: DEFAULT_PROJECT_NAME };

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

@@ -16,4 +16,9 @@ const models = {
 	settings: settingsModels
 };
 
-module.exports = { models, services };
+const utils = require('./utils/utils');
+const consts = {
+	DEFAULT_PROJECT: require('./consts/defaultProject')
+};
+
+module.exports = { models, services, utils, consts };

package/src/saas/internal-api/projects/models/core/create.project.model.js

@@ -1,6 +1,21 @@
-function CreateProjectModel(accountId, name, description, address, number, startDate, endDate,
-	city, state, zipCode, companyNameForProject, certificateHolder = '', additionalInsured = '',
-	tenantSolutionEnabled = 0, onboardingEnabled = 0, automaticRenewalEnabled = 0) {
+function CreateProjectModel(
+	accountId,
+	name,
+	description,
+	address,
+	number,
+	startDate,
+	endDate,
+	city,
+	state,
+	zipCode,
+	companyNameForProject,
+	certificateHolder = '',
+	additionalInsured = '',
+	tenantSolutionEnabled = 0,
+	onboardingEnabled = 0,
+	automaticRenewalEnabled = 0
+) {
 	this.projectName = name;
 	this.userId = accountId;
 	this.regionOrDivision = description;

package/src/saas/internal-api/projects/models/core/update.project.model.js

@@ -1,6 +1,23 @@
-function UpdateProjectModel(accountId, projectId, name, description, address, number, startDate, endDate,
-	city, state, zipCode, companyNameForProject, certificateHolder = '', additionalInsured = '',
-	tenantSolutionEnabled = 0, onboardingEnabled = 0, automaticRenewalEnabled = 0, onboardedVendors = 0) {
+function UpdateProjectModel(
+	accountId,
+	projectId,
+	name,
+	description,
+	address,
+	number,
+	startDate,
+	endDate,
+	city,
+	state,
+	zipCode,
+	companyNameForProject,
+	certificateHolder = '',
+	additionalInsured = '',
+	tenantSolutionEnabled = 0,
+	onboardingEnabled = 0,
+	automaticRenewalEnabled = 0,
+	onboardedVendors = 0
+) {
 	this.projectId = projectId;
 	this.projectName = name;
 	this.userId = accountId;

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

@@ -0,0 +1,61 @@
+const services = require('../api/core/projects.service');
+
+const CreateProjectModel = require('../models/core/create.project.model');
+const UpdateProjectModel = require('../models/core/update.project.model');
+
+const { NAME: DEFAULT_PROJECT_NAME } = require('../consts/defaultProject');
+
+const getDefaultProjectId = async (accountId, context) => {
+	const defaultProject = await services.getProjectByName(accountId, DEFAULT_PROJECT_NAME, context);
+	return defaultProject ? defaultProject.projectId : null;
+};
+
+const getOrCreateProject = (accountId, projectConfig, context) => {
+	const createProjectModel = getCreateProjectModel(accountId, projectConfig);
+	return services.getOrCreateProject(createProjectModel, context);
+};
+
+const getCreateProjectModel = (accountId, projectData) => {
+	const createProjectModel = new CreateProjectModel(
+		accountId,
+		projectData.name || projectData['Property Name'] || projectData['Project Name'],
+		projectData.description || projectData['Region/Division'] || 'N/A',
+		projectData.address || projectData['Address'] || 'N/A',
+		projectData.number || projectData['Property Number'] || projectData['Project Number'] || 'N/A',
+		projectData.startDate || projectData['Start Date'] || '01/01/2021',
+		projectData.endDate || projectData['End Date'] || '01/01/2021',
+		projectData.city || projectData['City'] || 'N/A',
+		projectData.state || projectData['State'] || 'Alabama',
+		projectData.zipCode || projectData['Zip Code'] || '11111',
+		projectData.companyNameForProject || projectData['Company Name (for external communications)']
+	);
+	return createProjectModel;
+};
+
+const getUpdateProjectModel = (accountId, projectId, projectData) => {
+	const updateProjectModel = new UpdateProjectModel(
+		accountId,
+		projectId,
+		projectData.name || projectData['Property Name'] || projectData['Project Name'],
+		projectData.description || projectData['Region/Division'],
+		projectData.address || projectData['Address'],
+		projectData.number || projectData['Property Number'] || projectData['Project Number'],
+		projectData.startDate || projectData['Start Date'],
+		projectData.endDate || projectData['End Date'],
+		projectData.city || projectData['City'],
+		projectData.state || projectData['State'],
+		projectData.zipCode || projectData['Zip Code'] || '11111',
+		projectData.companyNameForProject || projectData['Company Name (for external communications)']
+	);
+
+	return updateProjectModel;
+};
+
+// combine the config handling in single func
+
+module.exports = {
+	getOrCreateProject,
+	getDefaultProjectId,
+	getCreateProjectModel,
+	getUpdateProjectModel
+};

package/tests/validation.test.js

@@ -0,0 +1,42 @@
+const { expect } = require('chai');;
+
+const { validateDateString } = require('../src/common/validations/typeValidations');
+const VALID_DATE_STRINGS = Object.freeze([
+	'2022-08-03T11:47:07.499Z',
+	'2022-08-03T14:16:27.000+0000'
+
+]);
+const INVALID_DATE_STRINGS = Object.freeze([
+	'2022-08-03T11:47:07.',
+	'2022-08-03T11:47:07.499Z1',
+	'2022-08-03T11:47:07.Z',
+	'2022-08-03T11:47:07.499Za',
+	'2022-0803T11:47:07.499Z',
+	'2022-08-03T100:47:07.499Z',
+	'2022-08-03T11:4:07.499Z',
+	'2022-08-03T11:47:7z.499Z',
+	'2022-08-03T11:47:07.a499Z',
+	'2022-0803T14:16:27.000+0000',
+	'2022-08-03T14:16:27.000+000a',
+	'2022-08-03T14:16:27.000+0000c',
+	'2022-08-0314:16:27.000+0000',
+	'2022-08-03x14:16:27.000+0000',
+	'2022-08-03a14:16:27.000+0000',
+	'2022-08-03T14:16:2.000+0000',
+	'asd1q2123'
+
+]);
+
+describe('Validation | Test Validation functions', function() {
+	it('Should validate date strings', () => {
+		for (const dateString of VALID_DATE_STRINGS) {
+			expect(() => validateDateString(dateString), `Expect string: '${dateString}' to pass date validation.`).to.not.throw(TypeError);
+		}
+	});
+
+	it('Should throw error for invalid date strings', () => {
+		for (const dateString of INVALID_DATE_STRINGS) {
+			expect(() => validateDateString(dateString), `Expect string: '${dateString}' to fail date validation.`).to.throw(TypeError);
+		}
+	});
+});