Skip to content

Commit a2afc08

Browse files
authored
Merge pull request #104 from RupalSingla/master
igm 2.0 review
2 parents 5cffd86 + a501873 commit a2afc08

File tree

6 files changed

+613
-3
lines changed

6 files changed

+613
-3
lines changed

constants/index.ts

+20
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,26 @@ export const IGMApiSequence = {
385385
LSP_ON_ISSUE_STATUS: 'lsp_on_issue_status',
386386
}
387387

388+
export const IGM2Flows ={
389+
FLOW_1: 'FLOW_1',
390+
FLOW_2: 'FLOW_2',
391+
FLOW_3: 'FLOW_3',
392+
}
393+
export const IGM2Sequence = {
394+
"ISSUE_1": "issue_1",
395+
"ON_ISSUE_1": "on_issue_1",
396+
"ON_ISSUE_2": "on_issue_2",
397+
"ISSUE_2": "issue_2",
398+
"ON_ISSUE_3": "on_issue_3",
399+
"ON_ISSUE_4": "on_issue_4",
400+
"ISSUE_3": "issue_3",
401+
"ON_ISSUE_5": "on_issue_5",
402+
"ON_ISSUE_6": "on_issue_6",
403+
"ISSUE_4": "issue_4",
404+
"ON_ISSUE_7": "on_issue_7",
405+
"ISSUE_5": "issue_5",
406+
}
407+
388408
export const RSFapiSequence = {
389409
RECEIVER_RECON: 'receiver_recon',
390410
ON_RECEIVER_RECON: 'on_receiver_recon',

controller/validate/helper.ts

+17-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import _ from 'lodash'
22
import { sign, hash } from '../../shared/crypto'
33
import { logger } from '../../shared/logger'
44
import { DOMAIN, ERROR_MESSAGE } from '../../shared/types'
5-
import { IGMvalidateLogs, validateLogs, RSFvalidateLogs, RSFvalidateLogsV2 } from '../../shared/validateLogs'
5+
import { IGMvalidateLogs, validateLogs, RSFvalidateLogs, RSFvalidateLogsV2, IGMvalidateLogs2 } from '../../shared/validateLogs'
66
import { validateLogsForFIS12 } from '../../shared/Actions/FIS12Actions'
77
import { validateLogsForMobility } from '../../shared/Actions/mobilityActions'
88
import { validateLogsForMetro } from '../../shared/Actions/metroActions'
@@ -190,13 +190,29 @@ const validateIGM = async (payload: string, version: string) => {
190190
}
191191

192192
break
193+
case '2.0.0':
194+
response = IGMvalidateLogs2(payload)
195+
196+
if (_.isEmpty(response)) {
197+
success = true
198+
message = ERROR_MESSAGE.LOG_VERIFICATION_SUCCESSFUL
199+
}
200+
201+
break
202+
193203
default:
194204
message = ERROR_MESSAGE.LOG_VERIFICATION_INVALID_VERSION
195205
logger.warn('Invalid Version!!')
196206
}
197207

208+
209+
198210
return { response, success, message }
199211
}
212+
213+
214+
215+
200216
const validateRSF = async (payload: string, version: string) => {
201217
logger.info('Entering validateRSF function')
202218
let response

controller/validate/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const controller = {
5656
const { response, success, message } = await helper.validateIGM(payload, version)
5757
result = { response, success, message }
5858
break
59-
case DOMAIN.RSF:
59+
case DOMAIN.RSF:
6060
{
6161
const { response, success, message } = await helper.validateRSF(payload, version)
6262
result = { response, success, message }

shared/validateLogs.ts

+86-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import _ from 'lodash'
22
import { dropDB, setValue } from '../shared/dao'
33
import { logger } from './logger'
4-
import { ApiSequence, retailDomains, IGMApiSequence, RSFapiSequence, RSF_v2_apiSequence } from '../constants'
4+
import { ApiSequence, retailDomains, IGMApiSequence,IGM2Sequence, RSFapiSequence, RSF_v2_apiSequence } from '../constants'
55
import { validateSchema, isObjectEmpty } from '../utils'
66
import { checkOnsearchFullCatalogRefresh } from '../utils/Retail/RET11_onSearch/onSearch'
77
import { checkSelect } from '../utils/Retail/Select/select'
@@ -49,6 +49,8 @@ import checkRsfReport from '../utils/RSF/RSF_v2/report'
4949
import checkRsfOnReport from '../utils/RSF/RSF_v2/on_report'
5050
import checkRsfRecon from '../utils/RSF/RSF_v2/recon'
5151
import checkRsfOnRecon from '../utils/RSF/RSF_v2/on_recon'
52+
import checkIssueV2 from 'utils/igm/igm2/issue'
53+
import checkOnIssueV2 from 'utils/igm/igm2/on_issue'
5254

5355
export const validateLogs = async (data: any, domain: string, flow: string) => {
5456
const msgIdSet = new Set()
@@ -408,6 +410,89 @@ export const IGMvalidateLogs = (data: any) => {
408410
}
409411
}
410412

413+
export const IGMvalidateLogs2 = (data: any) => {
414+
let logReport: any = {}
415+
416+
417+
try {
418+
dropDB()
419+
} catch (error) {
420+
logger.error('!!Error while removing LMDB', error)
421+
}
422+
423+
try {
424+
if (data[IGM2Sequence.ISSUE_1]) {
425+
const issue_1 = checkIssueV2(data[IGM2Sequence.ISSUE_1])
426+
427+
if (!_.isEmpty(issue_1)) {
428+
logReport = { ...logReport, [IGM2Sequence.ISSUE_1]: issue_1 }
429+
}
430+
}
431+
432+
if (data[IGM2Sequence.ON_ISSUE_1]) {
433+
const on_issue_1 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_1],IGM2Sequence.ON_ISSUE_1)
434+
435+
if (!_.isEmpty(on_issue_1)) {
436+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_1]: on_issue_1 }
437+
}
438+
}
439+
440+
if(data[IGM2Sequence.ON_ISSUE_2]){
441+
const on_issue_2 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_2],IGM2Sequence.ON_ISSUE_2 )
442+
443+
if (!_.isEmpty(on_issue_2)) {
444+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_1]: on_issue_2 }
445+
}
446+
}
447+
448+
if(data[IGM2Sequence.ISSUE_2]){
449+
const on_issue_2 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_2],IGM2Sequence.ISSUE_2 )
450+
451+
if (!_.isEmpty(on_issue_2)) {
452+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_1]: on_issue_2 }
453+
}
454+
}
455+
456+
if (data[IGM2Sequence.ON_ISSUE_3]) {
457+
const on_issue_3 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_3],IGM2Sequence.ON_ISSUE_3)
458+
459+
if (!_.isEmpty(on_issue_3)) {
460+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_3]: on_issue_3 }
461+
}
462+
}
463+
464+
if(data[IGM2Sequence.ON_ISSUE_4]){
465+
const ON_ISSUE_4 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_4],IGM2Sequence.ISSUE_4 )
466+
467+
if (!_.isEmpty(ON_ISSUE_4)) {
468+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_4]: ON_ISSUE_4}
469+
}
470+
}
471+
472+
if(data[IGM2Sequence.ISSUE_3]){
473+
const ISSUE_3 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_3],IGM2Sequence.ISSUE_3 )
474+
475+
if (!_.isEmpty(ISSUE_3)) {
476+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_1]: ISSUE_3 }
477+
}
478+
}
479+
480+
if(data[IGM2Sequence.ON_ISSUE_5]){
481+
const on_issue_5 = checkOnIssueV2(data[IGM2Sequence.ON_ISSUE_5],IGM2Sequence.ON_ISSUE_5 )
482+
483+
if (!_.isEmpty(on_issue_5)) {
484+
logReport = { ...logReport, [IGM2Sequence.ON_ISSUE_5]: on_issue_5 }
485+
}
486+
}
487+
488+
logger.info(logReport, 'Report Generated Successfully!!')
489+
return logReport
490+
} catch (error: any) {
491+
logger.error(error.message)
492+
return error.message
493+
}
494+
}
495+
411496
export const RSFvalidateLogs = (data: any) => {
412497
let logReport: any = {}
413498

0 commit comments

Comments
 (0)