@getjones/test-infra 4.5.24 → 4.5.26

package/eslint.config.mjs

@@ -0,0 +1,156 @@
+import _import from 'eslint-plugin-import';
+import { fixupPluginRules } from '@eslint/compat';
+import globals from 'globals';
+import babelParser from '@babel/eslint-parser';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+import stylisticJs from '@stylistic/eslint-plugin-js'
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+	baseDirectory: __dirname,
+	recommendedConfig: js.configs.recommended,
+	allConfig: js.configs.all
+});
+
+export default [...compat.extends(), {
+	plugins: {
+		import: fixupPluginRules(_import),
+		'@stylistic/js': stylisticJs,
+	},
+	files: ['**/*.js'],
+	languageOptions: {
+		globals: {
+			...globals.node,
+			...globals.mocha
+		},
+
+		parser: babelParser,
+		ecmaVersion: 2020,
+		sourceType: 'module',
+
+		parserOptions: {
+			ecmaFeatures: {
+				jsx: false,
+				spread: true
+			},
+
+			impliedStrict: true,
+			requireConfigFile: false,
+
+			babelOptions: {
+				presets: ['@babel/preset-env']
+			}
+		}
+	},
+
+	rules: {
+		strict: ['error', 'global'],
+		semi: ['error', 'always'],
+		quotes: ['error', 'single'],
+		'prefer-template': 1,
+		'no-unused-vars': 1,
+		'no-cond-assign': 'error',
+		'no-dupe-args': 'error',
+		'no-dupe-keys': 'error',
+		'no-empty': 'error',
+		'arrow-parens': ['error', 'as-needed'],
+		'no-multi-spaces': 'error',
+		'rest-spread-spacing': ['error', 'always'],
+
+		'prefer-const': ['error', {
+			destructuring: 'all'
+		}],
+
+		'no-const-assign': 'error',
+		'no-trailing-spaces': 'error',
+
+		'no-multiple-empty-lines': ['error', {
+			max: 1,
+			maxBOF: 0,
+			maxEOF: 0
+		}],
+
+		'object-curly-spacing': ['error', 'always'],
+		'brace-style': 'error',
+		curly: 'error',
+
+		"space-before-function-paren": ["error", {
+			"anonymous": "never",
+			"named": "never",
+			"asyncArrow": "always"
+		}],
+
+		'lines-between-class-members': ['error', 'always'],
+
+		'padding-line-between-statements': ['error', {
+			blankLine: 'always',
+			prev: 'import',
+			next: '*'
+		}, {
+				blankLine: 'any',
+				prev: 'import',
+				next: 'import'
+			}, {
+				blankLine: 'always',
+				prev: '*',
+				next: 'if'
+			}, {
+				blankLine: 'always',
+				prev: 'if',
+				next: '*'
+			}, {
+				blankLine: 'always',
+				prev: ['function'],
+				next: 'function'
+			}],
+
+		'object-property-newline': ['error', {
+			allowAllPropertiesOnSameLine: true
+		}],
+
+		'comma-dangle': ['error', 'never'],
+
+		'comma-spacing': ['error', {
+			before: false,
+			after: true
+		}],
+
+		'array-bracket-spacing': ['error', 'never'],
+		'space-in-parens': ['error', 'never'],
+
+		'key-spacing': ['error', {
+			beforeColon: false,
+			afterColon: true,
+			mode: 'strict'
+		}],
+
+		'padded-blocks': ['error', 'never'],
+
+		indent: ['error', 'tab', {
+			SwitchCase: 1
+		}],
+
+		'no-mixed-spaces-and-tabs': 'error',
+		'arrow-spacing': 'error',
+		'eol-last': ['error', 'always'],
+		'space-infix-ops': 'error',
+		'space-before-blocks': 'error',
+
+		'keyword-spacing': ['error', {
+			before: true,
+			after: true
+		}],
+		
+		'func-call-spacing': ['error', 'never'],
+		'no-whitespace-before-property': 'error',
+
+		'function-call-argument-newline': ['error', 'consistent'],
+		'dot-location': ['error', 'object'],
+		'semi-style': ['error', 'last'],
+		'no-unexpected-multiline': 'error'
+	}
+}];

package/package.json

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

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

@@ -11,8 +11,8 @@ const Endpoints = {
 	getRecordHistoryOverrideEventGapData: recordHistoryId => `${backendUrl}/saas/record/gap/history/${recordHistoryId}/report`,
 	getRecordOcrStatus: contractorId => `${backendUrl}/saas/contractor/${contractorId}/ocr/status`,
 	delete: contractorId => `${backendUrl}/saas/contractor/${contractorId}`,
-	archive: contractorId => `${backendUrl}/saas/contractor/${contractorId}/archive`,
-	restore: contractorId => `${backendUrl}/saas/contractor/${contractorId}/restore`,
+	archive: `${backendUrl}/saas/contractor/archive`,
+	restore: `${backendUrl}/saas/contractor/restore`,
 	edit: contractorId => `${backendUrl}/saas/contractors/${contractorId}/update`,
 	sendGaps: requestId => `${backendUrl}/saas/request/${requestId}/compliance/status`,
 	resendInvitation: requestId => `${backendUrl}/saas/contractor/${requestId}/reminders/reset`,
@@ -71,11 +71,11 @@ const deleteByContractorId = (contractorId, context) => {
 };
 
 const archiveRecord = (recordVerificationModel, context) => {
-	return requests.deleteRequestHandler(Endpoints.archive(recordVerificationModel.contractorId), context, {}, {}, recordVerificationModel);
+	return requests.deleteRequestHandler(Endpoints.archive, context, {}, {}, recordVerificationModel);
 };
 
 const restoreRecord = (recordVerificationModel, context) => {
-	return requests.postRequestHandler(Endpoints.restore(recordVerificationModel.contractorId), recordVerificationModel, context);
+	return requests.postRequestHandler(Endpoints.restore, recordVerificationModel, context);
 };
 
 const editContractor = (editRequestModel, context) => {

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

@@ -182,8 +182,14 @@ const getSubscriptionModel = (data, { recaptchaResponse = 'recaptchaResponse' }
 	return new SubscriptionModel(data, recaptchaResponse);
 };
 
-const deleteByContractorId = (contractorId, context) => {
-	return contractorsAPI.deleteByContractorId(contractorId, context);
+const deleteByContractorId = async (contractorId, context, { expectError } = {}) => {
+	const response = await contractorsAPI.deleteByContractorId(contractorId, context);
+
+	if (response.status !== httpResponseStatusCodes.NO_CONTENT && !expectError) {
+		throw new Error(`Failed to delete record: ${response.statusText}`);
+	}
+
+	return response;
 };
 
 const deleteAllRecordsInAccount = async (accountId, context, { activationStatus = [activationStatuses.ACTIVE, activationStatuses.ARCHIVED, activationStatuses.DRAFT] } = {}) => {

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

@@ -1,4 +1,5 @@
 const projectsApi = require('./projects.api');
+const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');
 
 const getProjectsByName = async (apiKey, name) => {
 	return projectsApi.getProjectsByName(apiKey, { name });
@@ -33,7 +34,13 @@ const getProjectServiceArea = async (apiKey, city, state) => {
 };
 
 const archiveProject = async (apiKey, projectId) => {
-	return projectsApi.archiveProject(apiKey, projectId);
+	const response = await projectsApi.archiveProject(apiKey, projectId);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to archive project: ${projectId}`);
+	}
+
+	return response;
 };
 
 const restoreProject = async (apiKey, projectId) => {