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.

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

PFM-5072: added changes to redirect to mdms-v2 #441

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ search.pagesize.default=100

#mdms urls
egov.mdms.host=https://dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#----------------------------- FLYWAY CONFIGURATIONS ------------------------------#
spring.flyway.url=jdbc:postgresql://localhost:5432/billingnew
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ server.port=8088
management.endpoints.web.base-path=/

mdms.service.host=https://dev.digit.org/
mdms.service.search.uri=egov-mdms-service/v1/_search
mdms.service.search.uri=mdms-v2/v1/_search

id.timezone=IST
sequence.format=%04d
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mdms.roles.filter=[?(@.code IN [$code])]
mdms.roles.masterName=roles
mdms.roles.moduleName=ACCESSCONTROL-ROLES
mdms.host=https://dev.digit.org
mdms.path=/egov-mdms-service/v1/_search
mdms.path=/mdms-v2/v1/_search
citizen.login.password.otp.enabled=true
employee.login.password.otp.enabled=false
citizen.login.password.otp.fixed.value=123456
Expand Down Expand Up @@ -62,7 +62,7 @@ egov.enc.encrypt.endpoint=/egov-enc-service/crypto/v1/_encrypt
egov.enc.decrypt.endpoint=/egov-enc-service/crypto/v1/_decrypt
#----------------MDMS config---------------------#
egov.mdms.host=https://dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search
egov.state.level.tenant.id=pb
#-----------Kafka Audit Topic Name------------#
kafka.topic.audit=audit_data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void before() {

server = MockRestServiceServer.bindTo(restTemplate).build();

server.expect(once(), requestTo("http://localhost:8094/egov-mdms-service/v1/_search"))
server.expect(once(), requestTo("http://localhost:8094/mdms-v2/v1/_search"))
.andExpect(method(HttpMethod.POST))
.andRespond(withSuccess(new Resources().getFileContents("roleSearchValidatedResponse.json"),
MediaType.APPLICATION_JSON_UTF8));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mdms.roles.filter=[?(@.code IN [$code])]
mdms.roles.masterName=roles
mdms.roles.moduleName=ACCESSCONTROL-ROLES
mdms.host=http://localhost:8094
mdms.path=/egov-mdms-service/v1/_search
mdms.path=/mdms-v2/v1/_search
citizen.login.password.otp.enabled=true
employee.login.password.otp.enabled=true
citizen.login.password.otp.fixed.value=123456
Expand All @@ -51,7 +51,7 @@ max.invalid.login.attempts=5
kafka.config.bootstrap_server_config=localhost:9092
kafka.topic.audit=AuditData
egov.mdms.host=https://dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search
egov.state.level.tenant.id=pb
egov.enc.host=http://localhost:1234
egov.enc.encrypt.endpoint=/egov-enc-service/crypto/v1/_encrypt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ egov.idgen.challanNum.format=CB-CH-[cy:yyyy-MM-dd]-[SEQ_EG_TL_APL]

#mdms urls
egov.mdms.host=https://13.71.65.215.nip.io/
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

egov.billingservice.host=http://localhost:8081
egov.bill.gen.endpoint=/billing-service/bill/v2/_fetchbill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ egov.idgen.challanNum.format=EB-[fy:yyyy-yy]-[SEQ_EG_ECHALLAN_EXPENSE]

#mdms urls
egov.mdms.host=http://localhost:8094
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#challan Calculator
egov.echallan.calculator.host=http://localhost:8078
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ app.timezone=UTC

#external module configs
egov.mdms.host=https://dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#egov.localisation.host=http://egov-localization:8080
egov.localisation.host=https://dev.digit.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ egov.services.common_workflows_service.searchpath=/egov-common-workflows/tasks/_

# MDMS SERVICE PATH
egov.services.egov_mdms.hostname=https://dev.digit.org/
egov.services.egov_mdms.searchpath=egov-mdms-service/v1/_search
egov.services.egov_mdms.searchpath=mdms-v2/v1/_search

# ERP SERVICE PATH
egov.services.eis_service.hostname=https://dev.digit.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ egov.ifix.refernce.adapter.host=http://ifix-reference-adapter.egov:8080/
egov.ifix.refernce.adapter.push.endpoint=ifix-reference-adapter/events/v1/_push
#mdms urls
egov.mdms.host=http://localhost:8089
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#Billing service

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ egov.localization.fallback.locale=en_IN

#mdms urls
egov.mdms.host=https://dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

# billing service
egbs.host=http://billing-service:8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ egov.hrms.search.path=/_search
#mdms urls
egov.mdms.host=http://localhost:8094
#dev
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search
#local
#egov.mdms.search.endpoint=/egov-mdms-service-test/v1/_search
#Pagination
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ egov.meterservice.createmeterconnection=save-ws-meter

#mdms urls
egov.mdms.host=http://localhost:8094/
egov.mdms.search.endpoint=egov-mdms-service/v1/_search
egov.mdms.search.endpoint=mdms-v2/v1/_search

# KAFKA SERVER CONFIGURATIONS
kafka.config.bootstrap_server_config=localhost:9092
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ egov.property.searchendpoint=property-services/property/_search

#mdms urls
egov.mdms.host=http://localhost:8094/
egov.mdms.search.endpoint=egov-mdms-service/v1/_search
egov.mdms.search.endpoint=mdms-v2/v1/_search

# KAFKA SERVER CONFIGURATIONS
kafka.config.bootstrap_server_config=localhost:9092
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ egov.property.searchendpoint=property-services/property/_search

#mdms urls
egov.mdms.host=http://localhost:8094/
egov.mdms.search.endpoint=egov-mdms-service/v1/_search
egov.mdms.search.endpoint=mdms-v2/v1/_search

# KAFKA SERVER CONFIGURATIONS
kafka.config.bootstrap_server_config=localhost:9092
Expand Down