@getjones/test-infra 1.2.2 → 1.2.3

package/package.json

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

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,7 +4,7 @@ const { backendUrl, nodeBackendUrl } = require('../../../../../env').getEnv();
 
 const Endpoints = {
     saveCoverageNode: `${nodeBackendUrl}/coverage`,
-    saveCoverageJava: contractorId => `${backendUrl}/saas/contractors/${contractorId}/coverage`,
+    saveCoverageJava: `${backendUrl}/saas/contractors/coverage`,
     getCoverageByCoiId: coiId => `${nodeBackendUrl}/coverage/${coiId}`
 };
 
@@ -12,8 +12,8 @@ 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) => {

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

@@ -4,8 +4,8 @@ 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) => {

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,