Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PDCL-1333 - remove event name validation logic #804

Merged
merged 1 commit into from
Feb 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/DataCollector/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ governing permissions and limitations under the License.

import validateUserEventOptions from "./validateUserEventOptions";

const createDataCollector = ({ eventManager, logger }) => {
const createDataCollector = ({ eventManager }) => {
return {
commands: {
sendEvent: {
documentationUri: "https://adobe.ly/2r0uUjh",
optionsValidator: options => {
return validateUserEventOptions({ options, logger });
return validateUserEventOptions({ options });
},
run: options => {
const {
Expand Down
10 changes: 2 additions & 8 deletions src/components/DataCollector/validateUserEventOptions.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ import { validateIdentityMap } from "../../utils";
/**
* Verifies user provided event options.
* @param {*} options The user event options to validate
* @param {*} logger
* @returns {*} Validated options
*/
export default ({ options, logger }) => {
export default ({ options }) => {
const eventOptionsValidator = objectOf({
type: string(),
xdm: objectOf({
Expand All @@ -30,10 +29,5 @@ export default ({ options, logger }) => {
decisionScopes: arrayOf(string()),
datasetId: string()
}).required();
const validatedOptions = eventOptionsValidator(options);
const { type, xdm } = validatedOptions;
if (xdm && !xdm.eventType && !type) {
logger.warn("No type or xdm.eventType specified.");
}
return validatedOptions;
return eventOptionsValidator(options);
};
5 changes: 1 addition & 4 deletions test/unit/specs/components/DataCollector/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { noop } from "../../../../../src/utils";

describe("Event Command", () => {
let event;
let logger;
let eventManager;
let sendEventCommand;
beforeEach(() => {
Expand All @@ -25,7 +24,6 @@ describe("Event Command", () => {
"mergeXdm",
"mergeMeta"
]);
logger = jasmine.createSpyObj("logger", ["warn"]);

eventManager = {
createEvent() {
Expand All @@ -40,8 +38,7 @@ describe("Event Command", () => {
};

const dataCollector = createDataCollector({
eventManager,
logger
eventManager
});
sendEventCommand = dataCollector.commands.sendEvent;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,42 +56,4 @@ describe("DataCollector::validateUserEventOptions", () => {
}).toThrowError();
});
});
it("logs warning when event type is required and missing", () => {
const options = { xdm: { test: "" } };
const logger = {
warn: jasmine.createSpy()
};
validateUserEventOptions({ options, logger });
expect(logger.warn).toHaveBeenCalledWith(
"No type or xdm.eventType specified."
);
});
it("does not throw errors when event options are valid", () => {
[
{},
{ xdm: { eventType: "test" } },
{ type: "test", xdm: { test: "" } },
{ renderDecisions: true },
{ data: { test: "" } },
{ renderDecisions: true, data: { test: "" } },
{ decisionScopes: ["test"] },
{ datasetId: "12432ewfr12" },
{
xdm: {
eventType: "test",
identityMap: {
namespace1: [
{ id: "123", primary: true, authenticatedState: "authenticated" },
{ id: "3" }
],
namespace2: [{ id: "23", authenticatedState: "ambiguous" }]
}
}
}
].forEach(options => {
expect(() => {
validateUserEventOptions({ options });
}).not.toThrowError();
});
});
});