@getjones/test-infra 2.6.7 → 2.7.0

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

@@ -68,22 +68,11 @@ const deleteRequirementByName = async (requirementName, tabId, context) => {
 	return deleteByRequirementId(requirementToDelete.id, context);
 };
 
-const getCreateRequirementModel = requirement => {
-	return requirementUtils.getCreateRequirementModel(requirement);
-};
-
-const getUpdatedRequirementModel = async (updatedRequirement, tabId, context) => {
-	const { name: requirementName } = updatedRequirement;
-	const existingRequirement = await getRequirementByName(tabId, requirementName, context);
-	updatedRequirement.dateModified = existingRequirement.dateModified;
-
-	return requirementUtils.getUpdateRequirementModel(updatedRequirement);
-};
-
 const deleteAllRequirementsInTabs = async (tabIds, context) => {
 	const failedToDeleteRequirements = [];
 	for (const tabId of tabIds) {
 		const { data: existingRequirements } = await getRequirementsByTabId(tabId, context);
+
 		for (const requirement of existingRequirements) {
 			const response = await deleteByRequirementId(requirement.id, context);
 
@@ -99,6 +88,19 @@ const deleteAllRequirementsInTabs = async (tabIds, context) => {
 	}
 };
 
+const getCreateRequirementModel = requirement => {
+	return requirementUtils.getCreateRequirementModel(requirement);
+};
+
+const getUpdatedRequirementModel = async (updatedRequirement, tabId, context, { originalRequirementName } = {}) => {
+	const requirementName = originalRequirementName || updatedRequirement.name;
+	const existingRequirement = await getRequirementByName(tabId, requirementName, context);
+	updatedRequirement.id = existingRequirement.id;
+	updatedRequirement.dateModified = existingRequirement.dateModified;
+
+	return requirementUtils.getUpdateRequirementModel(updatedRequirement);
+};
+
 module.exports = {
 	createRequirement,
 	getRequirementById,
@@ -110,7 +112,7 @@ module.exports = {
 	updateRequirementWithNotification,
 	deleteByRequirementId,
 	deleteRequirementByName,
+	deleteAllRequirementsInTabs,
 	getCreateRequirementModel,
-	getUpdatedRequirementModel,
-	deleteAllRequirementsInTabs
+	getUpdatedRequirementModel
 };

package/src/saas/internal-api/requirements/models/update.requirement.model.js

@@ -1,14 +1,15 @@
 const { validateType } = require('../../../../common/validations/typeValidations');
 const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 const { PolicyModel } = require('./policy.model');
-
+const { VENDORS } = require('../../../../common/consts/recordTypes');
 class UpdateRequirementModel {
-	constructor({ id, name, policies, dateModified, sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB }) {
+	constructor({ id, name, policies, dateModified, sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB, recordType = VENDORS }) {
 		this.id = id;
 		this.name = name;
 		this.policies = policies;
 		this.dateModified = dateModified;
 		this.sharingLevel = sharingLevel;
+		this.recordType = recordType;
 
 		validateType(policies, Array);
 		policies && validateType(policies[0], PolicyModel);

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

@@ -88,12 +88,12 @@ const getCreateRequirementModel = function(requirement) {
 };
 
 const getUpdateRequirementModel = function(updatedRequirement) {
-	const { id, policies, name, sharingLevel, dateModified } = updatedRequirement;
+	const { id, policies, name, recordType, sharingLevel, dateModified } = updatedRequirement;
 
 	const parsedPolicies = parseRequirementConfig(policies);
 	const policyModels = parsedPolicies.map(policy => getPolicyModel(policy));
 
-	return new UpdateRequirementModel({ id, name, policies: policyModels, dateModified, sharingLevel });
+	return new UpdateRequirementModel({ id, name, policies: policyModels, dateModified, sharingLevel, recordType });
 };
 
 module.exports = {