Microplan check #1
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ import { produceModifiedMessages } from "../kafka/Producer"; | |
| import { generateHierarchyList, getAllFacilities, getCampaignSearchResponse, getHierarchy } from "../api/campaignApis"; | ||
| import { getBoundarySheetData, getSheetData, createAndUploadFile, createExcelSheet, getTargetSheetData, callMdmsData, callMdmsTypeSchema, getConfigurableColumnHeadersBasedOnCampaignTypeForBoundaryManagement } from "../api/genericApis"; | ||
| import { logger } from "./logger"; | ||
| import { getConfigurableColumnHeadersBasedOnCampaignType, getDifferentTabGeneratedBasedOnConfig, getLocalizedName } from "./campaignUtils"; | ||
| import Localisation from "../controllers/localisationController/localisation.controller"; | ||
| import { executeQuery } from "./db"; | ||
| import { generatedResourceTransformer } from "./transforms/searchResponseConstructor"; | ||
|
|
@@ -18,7 +18,7 @@ import { addDataToSheet, formatWorksheet, getNewExcelWorkbook, updateFontNameToR | |
| import createAndSearch from "../config/createAndSearch"; | ||
| import { generateDynamicTargetHeaders } from "./targetUtils"; | ||
| import { buildSearchCriteria, checkAndGiveIfParentCampaignAvailable, fetchFileUrls, getCreatedResourceIds, modifyProcessedSheetData } from "./onGoingCampaignUpdateUtils"; | ||
| import { getReadMeConfigForMicroplan, getRolesForMicroplan, getUserDataFromMicroplanSheet, isMicroplanRequest, isMicroplanCampaignId, modifyBoundaryIfSourceMicroplan } from "./microplanUtils"; | ||
| const NodeCache = require("node-cache"); | ||
|
|
||
| const updateGeneratedResourceTopic = config?.kafka?.KAFKA_UPDATE_GENERATED_RESOURCE_DETAILS_TOPIC; | ||
|
|
@@ -544,7 +544,7 @@ async function getSchemaBasedOnSource(request: any, isSourceMicroplan: boolean, | |
|
|
||
| async function createFacilitySheet(request: any, allFacilities: any[], localizationMap?: { [key: string]: string }) { | ||
| const responseFromCampaignSearch = await getCampaignSearchResponse(request); | ||
| const isSourceMicroplan = await isMicroplanCampaignId(request?.query?.campaignId); | ||
| request.body.isSourceMicroplan = isSourceMicroplan; | ||
| let schema: any = await getSchemaBasedOnSource(request, isSourceMicroplan, responseFromCampaignSearch?.CampaignDetails?.[0]?.additionalDetails?.resourceDistributionStrategy); | ||
|
Comment on lines
+547
to
549
There was a problem hiding this comment. 🧹 Nitpick (assertive) Consider adding error handling for microplan campaign ID check While the implementation is correct, consider adding try-catch block to handle potential errors during the microplan campaign ID check. - const isSourceMicroplan = await isMicroplanCampaignId(request?.query?.campaignId);
+ let isSourceMicroplan = false;
+ try {
+ isSourceMicroplan = await isMicroplanCampaignId(request?.query?.campaignId);
+ } catch (error) {
+ logger.error(`Error checking microplan campaign ID: ${error}`);
+ throw error;
+ }
🧰 Tools🪛 Biome (1.9.4)[error] 549-549: This let declares a variable that is only assigned once. 'schema' is never reassigned. Safe fix: Use const instead. (lint/style/useConst) |
||
| const keys = schema?.columns; | ||
|
|
@@ -1232,7 +1232,7 @@ async function getDataFromSheetFromNormalCampaign(type: any, fileStoreId: any, t | |
|
|
||
|
|
||
| async function getDataFromSheet(request: any, fileStoreId: any, tenantId: any, createAndSearchConfig: any, optionalSheetName?: any, localizationMap?: { [key: string]: string }) { | ||
| const isSourceMicroplan = await isMicroplanCampaignId(request?.body?.ResourceDetails?.campaignId); | ||
| const type = request?.body?.ResourceDetails?.type; | ||
| if (isSourceMicroplan) { | ||
| if (type == 'user') { | ||
|
|
@@ -1431,7 +1431,7 @@ function getDifferentDistrictTabs(boundaryData: any, differentTabsBasedOnLevel: | |
| async function getConfigurableColumnHeadersFromSchemaForTargetSheet(request: any, hierarchy: any, boundaryData: any, differentTabsBasedOnLevel: any, campaignObject: any, localizationMap?: any) { | ||
| const districtIndex = hierarchy.indexOf(differentTabsBasedOnLevel); | ||
| let headers: any; | ||
| const isSourceMicroplan = await isMicroplanRequest(request); | ||
| if (isSourceMicroplan) { | ||
| logger.info(`Source is Microplan.`); | ||
| headers = getLocalizedHeaders(hierarchy, localizationMap); | ||
|
|
@@ -1450,7 +1450,7 @@ async function getMdmsDataBasedOnCampaignType(request: any, localizationMap?: an | |
| const responseFromCampaignSearch = await getCampaignSearchResponse(request); | ||
| const campaignObject = responseFromCampaignSearch?.CampaignDetails?.[0]; | ||
| let campaignType = campaignObject.projectType; | ||
| const isSourceMicroplan = await isMicroplanRequest(request); | ||
| campaignType = (isSourceMicroplan) ? `${config?.prefixForMicroplanCampaigns}-${campaignType}` : campaignType; | ||
| const mdmsResponse = await callMdmsTypeSchema(request, request?.query?.tenantId || request?.body?.ResourceDetails?.tenantId, false, request?.query?.type || request?.body?.ResourceDetails?.type, campaignType) | ||
ashish-egov marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return mdmsResponse; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Nitpick (assertive)
Consider caching the result of
isMicroplanCampaignId.The function
isMicroplanCampaignIdis called and awaited multiple times with the samecampaignId. Since thecampaignIddoes not change during the request processing, consider caching the result to reduce unnecessary asynchronous calls and improve performance.Apply this diff to cache the result:
Also applies to: 861-862, 890-890, 1017-1017, 1033-1033, 1504-1504, 1575-1575, 1644-1644, 2979-2980, 3442-3442