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

boundaries on which we split to be fetched from mdms #982

Merged
merged 10 commits into from
Jun 28, 2024
Merged

boundaries on which we split to be fetched from mdms #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6c22fcf
fixed target validate for different tabs not present
nitish-egov Jun 20, 2024
e850b65
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov Jun 25, 2024
a4761f6
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov Jun 26, 2024
f318ea3
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov Jun 26, 2024
57329c8
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov Jun 27, 2024
2c63c61
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov Jun 28, 2024
44c93aa
Merge remote-tracking branch 'origin/campaign' into splitOn
nitish-egov Jun 28, 2024
2c1ffe2
split boundaries fetch from mdms
nitish-egov Jun 28, 2024
668761b
updated logic to fetch split on from mdms based on campaign type
nitish-egov Jun 28, 2024
a72c1ae
fromatting
nitish-egov Jun 28, 2024
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
1 change: 1 addition & 0 deletions utilities/project-factory/src/server/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const config = {
excludeHierarchyTypeFromBoundaryCodes:false,
excludeBoundaryNameAtLastFromBoundaryCodes:false,
masterNameForSchemaOfColumnHeaders: "adminSchema",
masterNameForSplitBoundariesOn: "hierarchyConfig",
boundary: {
boundaryCode: process.env.BOUNDARY_CODE_HEADER_NAME || "HCM_ADMIN_CONSOLE_BOUNDARY_CODE",
boundaryTab: process.env.BOUNDARY_TAB_NAME || "HCM_ADMIN_CONSOLE_BOUNDARY_DATA",
Expand Down
10 changes: 9 additions & 1 deletion utilities/project-factory/src/server/utils/campaignUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1788,7 +1788,8 @@ async function getFinalValidHeadersForTargetSheetAsPerCampaignType(request: any,
async function getDifferentTabGeneratedBasedOnConfig(request: any, boundaryDataGeneratedBeforeDifferentTabSeparation: any, localizationMap?: any) {
var boundaryDataGeneratedAfterDifferentTabSeparation: any = boundaryDataGeneratedBeforeDifferentTabSeparation;
const boundaryData = await getBoundaryDataAfterGeneration(boundaryDataGeneratedBeforeDifferentTabSeparation, request, localizationMap);
const differentTabsBasedOnLevel = getLocalizedName(config?.boundary?.generateDifferentTabsOnBasisOf, localizationMap);
let differentTabsBasedOnLevel = await getBoundaryOnWhichWeSplit(request);
differentTabsBasedOnLevel = getLocalizedName(`${request?.query?.hierarchyType}_${differentTabsBasedOnLevel}`.toUpperCase(), localizationMap);
logger.info(`Boundaries are seperated based on hierarchy type ${differentTabsBasedOnLevel}`)
const isKeyOfThatTypePresent = boundaryData.some((data: any) => data.hasOwnProperty(differentTabsBasedOnLevel));
const boundaryTypeOnWhichWeSplit = boundaryData.filter((data: any) => data[differentTabsBasedOnLevel]);
Expand All @@ -1799,6 +1800,13 @@ async function getDifferentTabGeneratedBasedOnConfig(request: any, boundaryDataG
return boundaryDataGeneratedAfterDifferentTabSeparation;
}

async function getBoundaryOnWhichWeSplit(request: any) {
const mdmsResponse = await getMDMSV1Data(request, config?.values?.moduleName, config?.masterNameForSplitBoundariesOn, request?.query?.tenantId);
const responseFromCampaignSearch = await getCampaignSearchResponse(request);
const hierarchyTypeFromCampaignResponseObject = responseFromCampaignSearch?.CampaignDetails?.[0].hierarchyType;
return mdmsResponse.filter((item: any) => item.hierarchy == hierarchyTypeFromCampaignResponseObject).map((item: any) => item.splitBoundariesOn);
}




Expand Down
Loading