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

feat: #OBS-I452 : list api changes to return alias name #322

Merged
merged 2 commits into from
Jan 21, 2025
Merged

feat: #OBS-I452 : list api changes to return alias name #322

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3ed6a
feat: #OBS-I452 : list api changes to return alias name
JeraldJF Jan 21, 2025
de9726c
Merge remote-tracking branch 'origin/release-1.5.0' into dataset-alia…
JeraldJF Jan 21, 2025
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
8 changes: 4 additions & 4 deletions api-service/src/controllers/DatasetList/DatasetList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const draftDatasetStatus = ["Draft", "ReadyToPublish"]
const defaultFields = ["dataset_id", "name", "type", "status", "tags", "version", "api_version", "dataset_config", "created_date", "updated_date"]

const datasetList = async (req: Request, res: Response) => {

const isRequestValid: Record<string, any> = schemaValidation(req.body, DatasetCreate)
if (!isRequestValid.isValid) {
throw obsrvError("", "DATASET_LIST_INPUT_INVALID", isRequestValid.message, "BAD_REQUEST", 400)
Expand All @@ -24,9 +24,9 @@ const datasetList = async (req: Request, res: Response) => {
const datasetBody = req.body.request;
const datasetList = await listDatasets(datasetBody)
const responseData = { data: datasetList, count: _.size(datasetList) }
logger.info({req: req.body, resmsgid: _.get(res, "resmsgid"), message: `Datasets are listed successfully with a dataset count (${_.size(datasetList)})` })
logger.info({ req: req.body, resmsgid: _.get(res, "resmsgid"), message: `Datasets are listed successfully with a dataset count (${_.size(datasetList)})` })
ResponseHandler.successResponse(req, res, { status: httpStatus.OK, data: responseData });

}

const listDatasets = async (request: Record<string, any>): Promise<Record<string, any>> => {
Expand All @@ -36,7 +36,7 @@ const listDatasets = async (request: Record<string, any>): Promise<Record<string
const status = _.isArray(datasetStatus) ? datasetStatus : _.compact([datasetStatus])
const draftFilters = _.set(_.cloneDeep(filters), "status", _.isEmpty(status) ? draftDatasetStatus : _.intersection(status, draftDatasetStatus));
const liveFilters = _.set(_.cloneDeep(filters), "status", _.isEmpty(status) ? liveDatasetStatus : _.intersection(status, liveDatasetStatus));
const liveDatasetList = await datasetService.findDatasets(liveFilters, defaultFields, [["updated_date", "DESC"]]);
const liveDatasetList = await datasetService.findDatasets(liveFilters, [...defaultFields, "alias"], [["updated_date", "DESC"]]);
const draftDatasetList = await datasetService.findDraftDatasets(draftFilters, [...defaultFields, "data_schema", "validation_config", "dedup_config", "denorm_config", "connectors_config", "version_key"], [["updated_date", "DESC"]]);
return _.compact(_.concat(liveDatasetList, draftDatasetList));
}
Expand Down
Loading