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.

Sign up for GitHub

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

fix #OBS-I479 ingestion batch structure fix #305

Merged
merged 1 commit into from
Jan 9, 2025
Merged

fix #OBS-I479 ingestion batch structure fix #305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions api-service/src/controllers/DataIngestion/DataIngestionController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,34 @@ const dataIn = async (req: Request, res: Response) => {
logger.error({ apiId, message: `Dataset with id ${datasetId} not found in live table`, code: "DATASET_NOT_FOUND" })
return ResponseHandler.errorResponse(errorObject.datasetNotFound, req, res);
}
const { entry_topic, dataset_config, api_version } = dataset
const { entry_topic, dataset_config, extraction_config, api_version } = dataset
const entryTopic = api_version !== "v2" ? _.get(dataset_config, "entry_topic") : entry_topic
if (!entryTopic) {
logger.error({ apiId, message: "Entry topic not found", code: "TOPIC_NOT_FOUND" })
return ResponseHandler.errorResponse(errorObject.topicNotFound, req, res);
}
await send(addMetadataToEvents(datasetId, requestBody), entryTopic)
await send(addMetadataToEvents(datasetId, requestBody, extraction_config), entryTopic)
ResponseHandler.successResponse(req, res, { status: 200, data: { message: "Data ingested successfully" } });

}

const addMetadataToEvents = (datasetId: string, payload: any) => {
const addMetadataToEvents = (datasetId: string, payload: any, extraction_config: any) => {
const validData = _.get(payload, "data");
const now = Date.now();
const mid = _.get(payload, "params.msgid");
const source = { id: "api.data.in", version: config?.version, entry_source: "api" };
const obsrvMeta = { syncts: now, flags: {}, timespans: {}, error: {}, source: source };
if (Array.isArray(validData)) {
const payloadRef = validData.map((event: any) => {
const payload = {
event,
const extraction_key: string = _.get(extraction_config, "extraction_key", 'events');
const dedup_key: string = _.get(extraction_config, "dedup_config.dedup_key", 'id');
const payload: any = {
"obsrv_meta": obsrvMeta,
"dataset": datasetId,
"msgid": mid
}
};
payload[extraction_key] = validData;
payload[dedup_key] = mid
return payload;
})
return payloadRef;
}
else {
return ({
Expand Down
Loading