@getjones/test-infra 1.1.4 → 1.1.5

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@getjones/test-infra",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {
-    "test": "mocha  \"./tests/**/*.test.js\" --slow 3000 --timeout 10000 --exit --inlineDiffs --bail"
+    "test": "mocha  \"./tests/**/*.test.js\" --slow 3000 --timeout 30000 --exit --inlineDiffs --bail --parallel"
   },
   "author": "",
   "license": "ISC",

package/src/env.js

@@ -23,12 +23,12 @@ const requiredValidation = object => {
     const invalidKeys = [];
     Object.keys(object).forEach(key => {
         if (!object[key]) {
-            invalidKeys.push(key);
+            invalidKeys.push(` '${key}'`);
         }
     });
 
     if (invalidKeys.length > 0) {
-        throw `Missing required configuration on your environment variables. The missing env-vars are "${invalidKeys}".`;
+        throw Error(`Missing required configuration on your environment variables.\nThe missing env-vars are:${invalidKeys}`);
     }
 };
 

package/src/index.js

@@ -42,11 +42,12 @@ const getInternalAPI = () => {
 };
 
 const getOpenAPI = () => {
+    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 = { tabs, contractors, projects, requirements };
+    const openAPI = { accounts, tabs, contractors, projects, requirements };
     return openAPI;
 
 };

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

@@ -5,8 +5,8 @@ const generateApiKeyValue = accountName => {
     return crypto.createHash('sha256').update(accountName).digest('base64');
 };
 
-const createApiKey = async (accountId, apiKeyValue, context) => {
-    const data = { apiKeyValue, accountId };
+const createApiKey = async (accountId, apiKeyValue, context, { apiKeyType = null, apiKeyName = null } = {}) => {
+    const data = { apiKeyValue, accountId, apiKeyName, apiKeyType };
     return accountsAPI.createApiKey(data, context);
 };
 
@@ -28,11 +28,17 @@ const deleteApiKey = async (apiKeyValue, context) => {
     return accountsAPI.deleteApiKey(data, context);
 };
 
-const getOrCreateApiKey = async (accountId, apiKey, context) => {
-    const existingApiKey = await getApiKeyByAccountId(accountId, context);
+const getOrCreateApiKey = async (accountId, apiKey, context, { apiKeyType = null, apiKeyName = null } = {}) => {
+    let existingApiKey = await getApiKeyByAccountId(accountId, context);
+
+    if (existingApiKey.apiKeyValue) {
+        return existingApiKey;
+    }
+
+    existingApiKey = await getApiKeyDetails(apiKey, context);
 
     if (!existingApiKey.apiKeyValue) {
-        return createApiKey(accountId, apiKey, context);
+        return createApiKey(accountId, apiKey, context, { apiKeyType, apiKeyName });
     }
 
     return existingApiKey;

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

@@ -2,7 +2,6 @@ const contractorsAPI = require('./contractors.api');
 const { CreateContractorModel } = require('../models/create.contractor.model');
 const { ContractorModel } = require('../models/edit.contractor.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
-const requests = require('../../common/requests');
 
 const createContractors = async (createContractorsModel, context) => {
     validateType(createContractorsModel, CreateContractorModel);

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

@@ -1,15 +1,56 @@
 const { validateType } = require('../../../../common/validations/typeValidations');
 
-function ContractorModel(contractorId, company, emailAddress, tab, tenantRecord, additionalEmails) {
+function ContractorModel(contractorId, company, emailAddress, tab, additionalDetails ) {
+    validateType(tab, VendorTabModel);
+    validateType(additionalDetails, ContractorDetailsModel);
+
     this.contractorId = contractorId;
     this.company = company;
     this.emailAddress = emailAddress;
     this.tab = tab;
-    this.tenantRecord = tenantRecord;
+
+    for (const detail in additionalDetails) {
+        if (additionalDetails[detail]){
+            this[detail] = additionalDetails[detail];
+        }
+    }
+
+}
+
+function ContractorDetailsModel({
+    additionalEmails = null,
+    dba = null,
+    firstName = null,
+    lastName = null,
+    address = null,
+    city = null,
+    state = null,
+    zipCode = null,
+    phoneNumber = null,
+    agreementNumber = null,
+    projectDescription = null,
+    startDate = null,
+    endDate = null,
+    tenantRecord = {}
+} = {}){
     this.additionalEmails = additionalEmails;
+    this.dba = dba;
+    this.fName = firstName;
+    this.lName = lastName;
+    this.location = address;
+    this.city = city;
+    this.state = state;
+    this.zipCode = zipCode;
+    this.phoneNumber = phoneNumber;
+    this.subContractNumber = agreementNumber;
+    this.descriptionOfOperations = projectDescription;
+    this.startDate = startDate;
+    this.endDate = endDate;
 
-    validateType(tenantRecord, TenantRecordModel);
-    validateType(tab, VendorTabModel);
+    if (tenantRecord){
+        validateType(tenantRecord, TenantRecordModel);
+        this.tenantRecord = tenantRecord;
+    }
 }
 
 function TenantRecordModel(id, companyName, emailAddress) {
@@ -22,4 +63,4 @@ function VendorTabModel(type){
     this.type = type;
 }
 
-module.exports = { ContractorModel, TenantRecordModel, VendorTabModel };
+module.exports = { ContractorModel, TenantRecordModel, VendorTabModel, ContractorDetailsModel };

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

@@ -4,7 +4,9 @@ const { backendUrl } = require('../../../../../env').getEnv();
 const Endpoints = {
     create: `${backendUrl}/saas/project`,
     delete: projectId => `${backendUrl}/saas/project/${projectId}`,
-    getByAccountId: `${backendUrl}/saas/project/list`
+    getByAccountId: `${backendUrl}/saas/project/list`,
+    update: `${backendUrl}/saas/project`,
+    getProjectByProjectId: projectId => `${backendUrl}/saas/project/${projectId}`
 };
 
 const create = async (project, context) => {
@@ -16,8 +18,17 @@ const getProjectsByAccountId = async (accountId, context) => {
     return requests.getRequestHandler(Endpoints.getByAccountId, params, context).then(res => res.data);
 };
 
+const getProjectByProjectId = async (projectId, context) => {
+    const params = { };
+    return requests.getRequestHandler(Endpoints.getProjectByProjectId(projectId), params, context).then(res => res.data);
+};
+
 const deleteProjectById = async (projectId, context) => {
     return requests.deleteRequestHandler(Endpoints.delete(projectId), context);
 };
 
-module.exports = { create, getProjectsByAccountId, deleteProjectById };
+const update = async (project, context) => {
+    return requests.postRequestHandler(Endpoints.update, project, context);
+};
+
+module.exports = { create, getProjectsByAccountId, deleteProjectById, update, getProjectByProjectId };

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

@@ -2,6 +2,7 @@ const projectsApi = require('./projects.api');
 const accounts = require('../../../accounts/api/core/accounts.core.setup');
 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 = accounts.getAccountId(accountName, context);
@@ -12,6 +13,10 @@ const getProjectsByAccountId = async (accountId, context) => {
     return projectsApi.getProjectsByAccountId(accountId, context);
 };
 
+const getProjectByProjectId = async (projectId, context) => {
+    return projectsApi.getProjectByProjectId(projectId, context);
+};
+
 const getProjectsByName = async (accountId, projectName, context) => {
     const projects = await getProjectsByAccountId(accountId, context);
     const filteredProjects = projects.filter(project => project.projectName === projectName);
@@ -38,10 +43,18 @@ const getOrCreateProject = async (createProjectModel, context) => {
     return createProject(createProjectModel, context);
 };
 
+const updateProject = async (updateProjectModel, context) => {
+    validateType(updateProjectModel, UpdateProjectModel);
+    return projectsApi.update(updateProjectModel, context);
+};
+
 module.exports = {
     getProjectsByAccountName,
     getProjectsByAccountId,
     createProject,
     deleteProjectByName,
-    getOrCreateProject
+    getOrCreateProject,
+    updateProject,
+    getProjectsByName,
+    getProjectByProjectId
 };

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

@@ -1,9 +1,10 @@
 const projectService = require('./api/core/projects.setup');
 const projectSettingsService = require('./api/settings/project.settings.setup');
 const CreateProjectModel = require('./models/core/create.project.model');
+const UpdateProjectModel = require('./models/core/update.project.model');
 const UpdateProjectSettingsModel = require('./models/settings/update.project.settings.model');
 
-const coreModels = { CreateProjectModel };
+const coreModels = { CreateProjectModel, UpdateProjectModel };
 const settingsModels = { UpdateProjectSettingsModel };
 
 const services = {

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

@@ -0,0 +1,27 @@
+function UpdateProjectModel(accountId, projectId, name, description, address, number, startDate, endDate,
+    city, state, zipCode, companyNameForProject, certificateHolder = '', additionalInsured = '',
+    tenantSolutionEnabled = 0, onboardingEnabled = 0, automaticRenewalEnabled = 0) {
+    this.projectId = projectId;
+    this.projectName = name;
+    this.userId = accountId;
+    this.projectDescription = description;
+
+    this.address = address;
+    this.projectNumber = number;
+    this.projectStartDate = startDate;
+    this.projectEndDate = endDate;
+
+    this.city = city;
+    this.state = state;
+    this.zipCode = zipCode;
+    this.companyNameForProject = companyNameForProject;
+
+    this.certificateHolder = certificateHolder;
+    this.additionalInsured = additionalInsured;
+
+    this.tenantSolutionEnabled = tenantSolutionEnabled;
+    this.onboardingEnabled = onboardingEnabled;
+    this.automaticRenewalEnabled = automaticRenewalEnabled;
+}
+
+module.exports = UpdateProjectModel;

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

@@ -0,0 +1,12 @@
+const requests = require('../common/requests');
+const { openapiUrl } = require('../../../env').getEnv();
+
+const Endpoints = {
+    getAccountList: `${openapiUrl}/accounts`
+};
+
+const getAccountList = async apiKey => {
+    return requests.getRequestHandler(Endpoints.getAccountList, apiKey).then(res => res.data);
+};
+
+module.exports = { getAccountList };

package/src/saas/openapi/accounts/accounts.setup.js

@@ -0,0 +1,7 @@
+const accountsApi = require('./accounts.api');
+
+const getAccountList = async apiKey => {
+    return accountsApi.getAccountList(apiKey);
+};
+
+module.exports = { getAccountList };

package/src/saas/openapi/projects/projects.api.js

@@ -6,7 +6,9 @@ const Endpoints = {
     getAllProjects: `${openapiUrl}/properties/all`,
     getModifiedProjects: `${openapiUrl}/properties/modified`,
     createProject: `${openapiUrl}/properties`,
-    updateProject: projectId => `${openapiUrl}/properties/${projectId}`
+    updateProject: projectId => `${openapiUrl}/properties/${projectId}`,
+    getProjectSettings: projectId => `${openapiUrl}/properties/${projectId}/settings`,
+    updateProjectSettings: projectId => `${openapiUrl}/properties/${projectId}/settings`
 };
 
 const getProjectsByName = async (apiKey, params) => {
@@ -29,10 +31,22 @@ const updateProject = async (apiKey, projectId, projectData) => {
     return requests.patchRequestHandler(Endpoints.updateProject(projectId), apiKey, projectData).then(res => res.data);
 };
 
+const updateProjectSettings = async (apiKey, projectId, projectSettings) => {
+    return requests.patchRequestHandler(Endpoints.updateProjectSettings(projectId),
+        apiKey, projectSettings).then(res => res.data);
+};
+
+const getProjectSettings = async (apiKey, projectId) => {
+    return requests.getRequestHandler(Endpoints.getProjectSettings(projectId),
+        apiKey).then(res => res.data);
+};
+
 module.exports = {
     getProjectsByName,
     getAllProjects,
     getModifiedProjects,
     createProject,
-    updateProject
+    updateProject,
+    updateProjectSettings,
+    getProjectSettings
 };

package/src/saas/openapi/projects/projects.setup.js

@@ -20,10 +20,20 @@ const getModifiedProjects = async (apiKey, timestamp) => {
     return projectsApi.getModifiedProjects(apiKey, { timestamp });
 };
 
+const updateProjectSettings = async (apiKey, projectId, projectSettings) => {
+    return projectsApi.updateProjectSettings(apiKey, projectId, projectSettings);
+};
+
+const getProjectSettings = async (apiKey, projectId) => {
+    return projectsApi.getProjectSettings(apiKey, projectId);
+};
+
 module.exports = {
     getProjectsByName,
     createProject,
     updateProject,
     getAllProjects,
-    getModifiedProjects
+    getModifiedProjects,
+    updateProjectSettings,
+    getProjectSettings
 };