Skip to content

Commit 57e244f

Browse files
Remove innecesary boolean validation
1 parent f121304 commit 57e244f

File tree

2 files changed

+2
-39
lines changed

2 files changed

+2
-39
lines changed

src/utils/inputValidation/__tests__/eventProperties.spec.ts

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ERROR_NOT_BOOLEAN, ERROR_NOT_PLAIN_OBJECT, ERROR_SIZE_EXCEEDED, WARN_SETTING_NULL, WARN_TRIMMING_PROPERTIES } from '../../../logger/constants';
22
import { loggerMock } from '../../../logger/__tests__/sdkLogger.mock';
33

4-
import { validateEventProperties, validateImpressionsDisabled } from '../eventProperties';
4+
import { validateEventProperties } from '../eventProperties';
55

66
function calculateSize(obj: any) {
77
// we calculate the expected size.
@@ -210,30 +210,4 @@ describe('INPUT VALIDATION for Impressions disabled', () => {
210210
new Map()
211211
];
212212

213-
test('Not setting impressionsDisabled is acceptable', () => {
214-
expect(validateImpressionsDisabled(loggerMock, undefined, 'some_method_eventProps')).toBeUndefined();
215-
216-
expect(loggerMock.error).not.toBeCalled(); // Should not log any errors.
217-
expect(loggerMock.warn).not.toBeCalled(); // It should have not logged any warnings.
218-
});
219-
220-
test('When setting a value for impressionsDisabled, only booleans are acceptable', () => {
221-
222-
impressionsDisabledInvalidValues.forEach(val => {
223-
expect(validateImpressionsDisabled(loggerMock, val, 'some_method_eventProps')).toBeUndefined();
224-
expect(loggerMock.error).toBeCalledWith(ERROR_NOT_BOOLEAN, ['some_method_eventProps', 'impressionsDisabled']); // Should log an error.
225-
loggerMock.error.mockClear();
226-
});
227-
228-
expect(loggerMock.warn).not.toBeCalled(); // It should have not logged any warnings.
229-
});
230-
231-
test('It should return the impressionsDisabled value when valid', () => {
232-
expect(validateImpressionsDisabled(loggerMock, true, 'some_method_eventProps')).toBeTruthy();
233-
expect(validateImpressionsDisabled(loggerMock, false, 'some_method_eventProps')).toBeFalsy();
234-
235-
expect(loggerMock.error).not.toBeCalled(); // Should not log any errors.
236-
expect(loggerMock.warn).not.toBeCalled(); // It should have not logged any warnings.
237-
});
238-
239213
});

src/utils/inputValidation/eventProperties.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,6 @@ const MAX_PROPERTIES_AMOUNT = 300;
1414
const MAX_EVENT_SIZE = 1024 * 32;
1515
const BASE_EVENT_SIZE = 1024; // We assume 1kb events without properties (avg measured)
1616

17-
export function validateImpressionsDisabled(log: ILogger, maybeImpressionsDisabled: any, method: string): boolean | undefined {
18-
if (maybeImpressionsDisabled === undefined) return;
19-
20-
if (maybeImpressionsDisabled === null || !isBoolean(maybeImpressionsDisabled)) {
21-
log.error(ERROR_NOT_BOOLEAN, [method, 'impressionsDisabled']);
22-
return;
23-
}
24-
25-
return maybeImpressionsDisabled;
26-
}
27-
2817
export function validateEventProperties(log: ILogger, maybeProperties: any, method: string): { properties: SplitIO.Properties | null | false, size: number } {
2918
if (maybeProperties == undefined) return { properties: null, size: BASE_EVENT_SIZE }; // eslint-disable-line eqeqeq
3019

@@ -83,7 +72,7 @@ export function validateEvaluationOptions(log: ILogger, maybeOptions: any, metho
8372
const properties = validateEventProperties(log, maybeOptions.properties, method).properties;
8473
let options = properties && Object.keys(properties).length > 0 ? { properties } : undefined;
8574

86-
const impressionsDisabled = validateImpressionsDisabled(log, maybeOptions.impressionsDisabled, method);
75+
const impressionsDisabled = maybeOptions.impressionsDisabled;
8776
if (!impressionsDisabled) return options;
8877

8978
return options ? { ...options, impressionsDisabled } : { impressionsDisabled };

0 commit comments

Comments
 (0)