@getjones/test-infra 1.2.2 → 1.2.4

package/package.json

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

package/src/index.js

@@ -24,6 +24,8 @@ const getInternalAPI = () => {
 	const users = require('./saas/internal-api/users');
 
 	const reports = require('./saas/internal-api/reports');
+	const charts = require('./saas/internal-api/homepageCharts');
+
 
 	const internalAPI = {
 		auth,
@@ -35,7 +37,8 @@ const getInternalAPI = () => {
 		coi,
 		compliance,
 		reports,
-		users
+		users,
+		charts
 	};
 
 	return internalAPI;

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

@@ -1,18 +1,18 @@
 const accountsAPI = require('./settings.api');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const UpdateAccountSettings = require('../../models/settings/update.settings.model');
+const UpdateAccountSettingsModel = require('../../models/settings/update.settings.model');
 
 const getAccountSettings = async (accountId, context) => {
     return accountsAPI.getAccountSettings(accountId, context).then(res => res.data);
 };
 
 const updateAccountSettings = async (updateAccountSettingsModel, context) => {
-    validateType(updateAccountSettingsModel, UpdateAccountSettings);
+    validateType(updateAccountSettingsModel, UpdateAccountSettingsModel);
     return accountsAPI.updateAccountSettings(updateAccountSettingsModel, context);
 };
 
 const restoreAccountSettings = async (accountId, context) => {
-    const updateAccountSettingsModel = new UpdateAccountSettings(accountId, false, false);
+    const updateAccountSettingsModel = new UpdateAccountSettingsModel(accountId, false, false , false);
     return accountsAPI.updateAccountSettings(updateAccountSettingsModel, context);
 };
 

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

@@ -1,8 +1,8 @@
 const CreateAccountModel = require('./models/core/create.account.model');
 const coreModels = { CreateAccountModel };
 
-const UpdateAccountSettings = require('./models/settings/update.settings.model');
-const settingsModels = { UpdateAccountSettings };
+const UpdateAccountSettingsModel = require('./models/settings/update.settings.model');
+const settingsModels = { UpdateAccountSettingsModel };
 
 const models = { core: coreModels, settings: settingsModels };
 

package/src/saas/internal-api/accounts/models/settings/update.settings.model.js

@@ -1,7 +1,15 @@
-function UpdateAccountSettings(accountId, isMultiPropertyTenants, isHighPriority) {
-	this.accountId = accountId;
-	this.isMultiPropertyTenants = isMultiPropertyTenants;
-	this.isHighPriority = isHighPriority;
+class UpdateAccountSettingsModel {
+  constructor(
+    accountId,
+    isMultiPropertyTenants,
+    isHighPriority,
+    hasAnalyticsDashboard
+  ) {
+    this.accountId = accountId;
+    this.isMultiPropertyTenants = isMultiPropertyTenants;
+    this.isHighPriority = isHighPriority;
+    this.hasAnalyticsDashboard = hasAnalyticsDashboard;
+  }
 }
 
-module.exports = UpdateAccountSettings;
+module.exports = UpdateAccountSettingsModel;

package/src/saas/internal-api/common/requests.js

@@ -23,10 +23,10 @@ const postRequestHandler = async (url, body, context = null, headers = {}, param
 	}
 };
 
-const putRequestHandler = async (url, body, context = null, headers = {}) => {
+const putRequestHandler = async (url, body, context = null, headers = {}, params = {}) => {
 	enrichCookie(headers, context);
 	try {
-		const response = await axios.put(url, body, { headers });
+		const response = await axios.put(url, body, { headers, params });
 		return response;
 	} catch (error) {
 		errorValidation.validateError(error);

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

@@ -4,7 +4,7 @@ const { backendUrl } = require('../../../../../env').getEnv();
 const Endpoints = {
     auditorContractorList: `${backendUrl}/saas/auditor/contractors`,
     preAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
-    audit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/audits`,
+    audit: `${backendUrl}/saas/auditor/contractors/submit/audits`,
     contractorDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
     requirementDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/requirement`
 };
@@ -15,7 +15,7 @@ const getAuditorContractorList = (page, accountId, context) => {
 
 const audit = async (contractorId, auditRequestModel, context) => {
     const response = await requests.getRequestHandler(Endpoints.preAudit(contractorId), {}, context);
-    return requests.postRequestHandler(Endpoints.audit(contractorId), auditRequestModel, context).then(res => res.data);
+    return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context).then(res => res.data);
 };
 
 const getContractorDetailsForAudit = (contractorId, context) => {

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

@@ -4,24 +4,30 @@ const { backendUrl, nodeBackendUrl } = require('../../../../../env').getEnv();
 
 const Endpoints = {
     saveCoverageNode: `${nodeBackendUrl}/coverage`,
-    saveCoverageJava: contractorId => `${backendUrl}/saas/contractors/${contractorId}/coverage`,
-    getCoverageByCoiId: coiId => `${nodeBackendUrl}/coverage/${coiId}`
+    saveCoverageJava: `${backendUrl}/saas/contractors/coverage`,
+    getCoverageByCoiId: coiId => `${nodeBackendUrl}/coverage/${coiId}`,
+    deleteCoverageByCoiId: coiId => `${nodeBackendUrl}/coverage/${coiId}`
 };
 
 const saveCoverageNode = (coverage, nodeBackendSecret) => {
     return openApiRequests.postRequestHandler(Endpoints.saveCoverageNode, nodeBackendSecret, coverage);
 };
 
-const saveCoverageJava = (auditorContext, contractorId, coverage) => {
-    return internalApiRequests.postRequestHandler(Endpoints.saveCoverageJava(contractorId), coverage, auditorContext);
+const saveCoverageJava = (auditorContext, auditDates, coverage) => {
+    return internalApiRequests.postRequestHandler(Endpoints.saveCoverageJava, { auditDates, coverage }, auditorContext);
 };
 
 const getCoverageByCoiId = (coiId, nodeBackendSecret) => {
     return openApiRequests.getRequestHandler(Endpoints.getCoverageByCoiId(coiId), nodeBackendSecret);
 };
 
+const deleteCoverageByCoiId = (coiId, nodeBackendSecret) => {
+    return openApiRequests.deleteRequestHandler(Endpoints.deleteCoverageByCoiId(coiId), nodeBackendSecret);
+};
+
 module.exports = {
     saveCoverageNode, 
     saveCoverageJava, 
-    getCoverageByCoiId
+    getCoverageByCoiId,
+    deleteCoverageByCoiId
 };

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

@@ -4,16 +4,21 @@ const saveCoverageNode = async (coverage, nodeBackendSecret) => {
     return coverageApi.saveCoverageNode(coverage, nodeBackendSecret);
 };
 
-const saveCoverageJava = async (auditorContext, contractorId, coverage) => {
-    return coverageApi.saveCoverageJava(auditorContext, contractorId, coverage);
+const saveCoverageJava = async (auditorContext, auditDates, coverage) => {
+    return coverageApi.saveCoverageJava(auditorContext, auditDates, coverage);
 };
 
 const getCoverageByCoiId = async (coiId, nodeBackendSecret) => {
     return coverageApi.getCoverageByCoiId(coiId, nodeBackendSecret).then(res => res && res.data);
 };
 
+const deleteCoverageByCoiId = async (coiId, nodeBackendSecret) => {
+    return coverageApi.deleteCoverageByCoiId(coiId, nodeBackendSecret).then(res => res && res.data);
+};
+
 module.exports = {
     saveCoverageNode,
     saveCoverageJava, 
-    getCoverageByCoiId
+    getCoverageByCoiId,
+    deleteCoverageByCoiId
 };

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

@@ -1,3 +1,5 @@
+const { validateType } = require('../../../../../common/validations/typeValidations');
+
 const COI_AUDIT_STATUSES = {
     NOT_AUDITED: '0',
     REAUDIT: '3'
@@ -21,50 +23,67 @@ const AUDIT_POLICY_NAMES = {
 
 const AUDITOR_ROLE = 'Auditor';
 
-function AuditRequestModel({
-    accountId = null,
-    projectId = null,
-    requirementId = null,
-    contractorId = null,
-    certificateId = null,
-    auditorId = null,
-    auditEntities = null,
-    dateModified = null,
-    isReaudit = null,
-    isProjectOnboarding = false,
-    auditorRole = AUDITOR_ROLE,
-    shouldSendNotificationToPM = true
-}) {
-    const auditData = {
-        userId: accountId,
-        projectId: projectId,
-        requirementId: requirementId,
-        contractorId: contractorId,
-        certificateId: certificateId,
-        auditorId: auditorId,
-        policyDetails: auditEntities,
-        auditorStatus: COI_AUDIT_STATUSES.NOT_AUDITED,
-        dateModified: dateModified,
-        isReaudit: isReaudit,
-        projectOnboarding: isProjectOnboarding,
-        role: auditorRole,
-        sendNotificationToPM: shouldSendNotificationToPM
-    };
+class AuditRequestModel{
+    constructor(
+        accountId = null,
+        projectId = null,
+        requirementId = null,
+        contractorId = null,
+        certificateId = null,
+        auditorId = null,
+        auditEntities = null,
+        isReaudit = null,
+        isProjectOnboarding = false,
+        shouldSendNotificationToPM = true,
+        auditDates = {},
+        auditStatus = null,
+        auditorRole = AUDITOR_ROLE,
+        ){
+            const auditData = {
+                userId: accountId,
+                projectId: projectId,
+                requirementId: requirementId,
+                contractorId: contractorId,
+                certificateId: certificateId,
+                auditorId: auditorId,
+                policyDetails: auditEntities,
+                auditorStatus: COI_AUDIT_STATUSES.NOT_AUDITED,
+                isReaudit: isReaudit,
+                projectOnboarding: isProjectOnboarding,
+                role: auditorRole,
+                sendNotificationToPM: shouldSendNotificationToPM,
+                auditStatus
+            };
 
-    this.auditData = auditData;
-    this.dateModified = dateModified;
+            validateType(auditDates,AuditDatesModel)
+            this.auditData = auditData;
+            this.auditDates = auditDates    
+    }
 }
 
-function AuditEntityModel(policyId, attributeName, status, value) {
+class AuditEntityModel {
+    constructor(policyId, attributeName, status, value){
     this.contractorInsuranceId = policyId;
     this.limitname = attributeName;
     this.status = status;
     this.value = value;
+    }
+}
+
+class AuditDatesModel{
+    constructor(contractorId ,contractorDateModified, dateStartedAudit, contractorOverrideDateModified, contractCreateDate){
+        this.contractorId = contractorId;
+        this.contractorDateModified = contractorDateModified;
+        this.dateStartedAudit = dateStartedAudit;
+        this.contractorOverrideDateModified = contractorOverrideDateModified;
+        this.contractCreateDate = contractCreateDate;
+    }
 }
 
 module.exports = {
     AuditRequestModel,
     AuditEntityModel,
+    AuditDatesModel,
     COI_AUDIT_STATUSES,
     AUDIT_ENTITY_STATUSES,
     AUDIT_ATTRIBUTE_NAMES,

package/src/saas/internal-api/homepageCharts/api/charts.api.js

@@ -0,0 +1,12 @@
+const requests = require('../../common/requests');
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+    getHomePageChartsDataApi: () => `${backendUrl}/saas/user/properties/compliance-summary`,
+};
+
+const getHomePageChartsData = context => {
+    return requests.getRequestHandler(Endpoints.getHomePageChartsDataApi(), {}, context).then(res => res.data);
+};
+
+module.exports = { getHomePageChartsData };

package/src/saas/internal-api/homepageCharts/api/charts.setup.js

@@ -0,0 +1,7 @@
+const chartsAPI = require('./charts.api');
+
+const getHomePageChartsData = async context => {
+    return chartsAPI.getHomePageChartsData(context);
+};
+
+module.exports = { getHomePageChartsData };

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

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

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

@@ -0,0 +1,55 @@
+const requests = require("../../common/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`
+};
+
+const invite = async (invitedUser, context) => {
+	const headers = {}
+	const params = { disableSendMail: true }
+	return requests.putRequestHandler(Endpoints.invite, invitedUser, context, headers, params).then(res => res.data);
+};
+
+const editUserRole = async (userId, data, context) => {
+	return requests.patchRequestHandler(Endpoints.editUserRole(userId), context, data);
+};
+
+const editUserProjects = async (data, context) => {
+	const headers = {}
+	const params = { disableSendMail: true }
+	return requests.putRequestHandler(Endpoints.editUserProjects, data, context, headers, params);
+};
+
+const getUsersByProjectId = async (projectId, context) => {
+	return requests.getRequestHandler(Endpoints.getByProjectId(projectId), null, context).then(res => res.data);
+};
+
+const getUserByEmail = async (email, context) => {
+	return requests.getRequestHandler(Endpoints.getByEmail(email), null, context).then(res => res.data);
+};
+
+const deleteUser = async (userId, context) => {
+	return requests.deleteRequestHandler(Endpoints.delete(userId), context);
+};
+
+const deleteUserFromSingleProject = async (userId, projectId, context) => {
+	return requests.deleteRequestHandler(Endpoints.deleteSingleProject(userId, projectId), context);
+};
+
+const reinviteUser = async (userId, context) => {
+	const body = {}
+	const headers = {}
+	const params = { id: userId }
+	return requests.postRequestHandler(Endpoints.reinvite, body, context, headers, params);
+};
+
+module.exports = { invite, getUsersByProjectId, getUserByEmail, deleteUser, deleteUserFromSingleProject, editUserRole, editUserProjects, reinviteUser };

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

@@ -0,0 +1,38 @@
+const EditUserModel = require('../models/edit.user.model');
+const userAPI = require('./users.api');
+const { validateType } = require('../../../../common/validations/typeValidations');
+
+const inviteUser = async (invitedUser, context) => {
+	return userAPI.invite(invitedUser, 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 deleteUser = (userId, context) => {
+	return userAPI.deleteUser(userId, context);
+};
+
+const deleteUserFromSingleProject = (userId, projectId, context) => {
+	return userAPI.deleteUserFromSingleProject(userId, projectId, context);
+};
+
+const reinviteUser = (userId, context) => {
+	return userAPI.reinviteUser(userId, context);
+};
+
+module.exports = { inviteUser, getUsersByProjectId, getUserByEmail, deleteUser, deleteUserFromSingleProject, editUserRole, editUserProjects, reinviteUser };

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

@@ -1,3 +1,8 @@
-const services = require('./api/invite.setup');
+const EditUserModel = require('./models/edit.user.model');
+const coreModels = { EditUserModel };
 
-module.exports = { services };
+const models = { core: coreModels };
+
+const services = require('./api/users.setup');
+
+module.exports = { services, models };

package/src/saas/internal-api/users/models/edit.user.model.js

@@ -0,0 +1,10 @@
+class EditUserModel {
+    constructor(subUserId, email, role, projects = []) {
+        this.subUserId = subUserId;
+        this.email = email;
+        this.role = role;
+        this.projects = projects;
+    }
+}
+
+module.exports = EditUserModel;

package/src/saas/internal-api/compliance/models/coverage/coverage.model.js

@@ -1,53 +0,0 @@
-class coverageRequestModel {
-    constructor({
-        coiId, 
-        documentsModel
-    }) {
-        this.coiId = coiId,
-        this.documents = documentsModel;
-    }
-}
-
-class coverageDocumentModel {
-    constructor({
-        documentType, 
-        pagesModel
-    }) {
-        this.documentType = documentType,
-        this.pagesModel = pagesModel;
-    }
-}
-
-class coveragePageModel {
-    constructor({
-        pageNumber, 
-        policies
-    }) {
-        this.pageNumber = pageNumber,
-        this.policies = policies;
-    }
-}
-
-class coveragePolicyModel {
-    constructor({
-        key, 
-        policyEntities,
-        provisions,
-        limits
-    }) {
-        this.key = key,
-        this.policyEntities = policyEntities,
-        this.provisions = provisions,
-        this.limits = limits
-    }
-}
-
-const documentTypesList = ['accord25']
-
-module.exports = {
-    coverageRequestModel,
-    coverageDocumentModel,
-    coveragePageModel,
-    coveragePolicyModel,
-    documentTypesList
-};

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

@@ -1,29 +0,0 @@
-const requests = require('../../common/requests');
-const { backendUrl } = require('../../../../env').getEnv();
-
-const Endpoints = {
-	invite: projectId => `${backendUrl}/saas/project/${projectId}/team-member`,
-	getByProjectId: projectId => `${backendUrl}/saas/project/${projectId}/team-members`,
-	getByEmail: email => `${backendUrl}/saas/team-member/by-email/${email}`,
-	delete: userId => `${backendUrl}/saas/users/${userId}`
-};
-
-const invite = async (projectId, invitedUser, context) => {
-	return requests.putRequestHandler(Endpoints.invite(projectId), invitedUser, context).then(
-		res => res.data
-	);
-};
-
-const getUsersByProjectId = async (projectId, context) => {
-	return requests.getRequestHandler(Endpoints.getByProjectId(projectId), null, context).then(res => res.data);
-};
-
-const getUserByEmail = async (email, context) => {
-	return requests.getRequestHandler(Endpoints.getByEmail(email), null, context).then(res => res.data);
-};
-
-const deleteUser = async (userId, context) => {
-	return requests.deleteRequestHandler(Endpoints.delete(userId), context);
-};
-
-module.exports = { invite, getUsersByProjectId, getUserByEmail, deleteUser };

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

@@ -1,19 +0,0 @@
-const inviteUserAPI = require('./invite.api');
-
-const invite = async (projectId, invitedUser, context) => {
-	return inviteUserAPI.invite(projectId, invitedUser, context);
-};
-
-const getUsersByProjectId = async (projectId, context) => {
-	return inviteUserAPI.getUsersByProjectId(projectId, context);
-};
-
-const getUserByEmail = async (email, context) => {
-	return inviteUserAPI.getUserByEmail(email, context);
-};
-
-const deleteUser = (userId, context) => {
-	return inviteUserAPI.deleteUser(userId, context);
-};
-
-module.exports = { invite, getUsersByProjectId, getUserByEmail, deleteUser };