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

Jump to bottom

Nmsupgrade #751

Open
wants to merge 389 commits into
base: nmsupgrade-2.0
Choose a base branch
from
Open

Nmsupgrade #751

wants to merge 389 commits into from

Conversation

gudipatiharitha
Copy link
Contributor

No description provided.

gudipatiharitha and others added 30 commits June 28, 2018 13:59
@gudipatiharitha
Merge branch 'master' into bug_connecting_unconnected_mother_child_Wi…
1cf8e01 
…th_same_number
@gudipatiharitha
Merge pull request #721 from motech-implementations/bug_connecting_un…
0295999 
…connected_mother_child_With_same_number

Update for correction of updation of unconnected mother-child combo w…
@sree21go
Merge remote-tracking branch 'origin/master' into feature_nic_new_loc…
b387c14 
…ations

# Conflicts:
#	kilkari/src/main/java/org/motechproject/nms/kilkari/utils/ObjectListCleaner.java
#	region/src/main/java/org/motechproject/nms/region/service/impl/LocationServiceImpl.java
@sree21go
Merge branch 'feature_nic_new_locations' of https://github.com/motech…
f32c0cd 
…-implementations/nms into feature_nic_new_locations
@sree21go
Fixed Function calls in bulk child rejections (Caused by faulty merge)
88233ab
@gudipatiharitha
Merge pull request #719 from motech-implementations/feature_nic_new_l…
38ce72f 
…ocations

Feature nic new locations
@VishnuVimal
bumping up the version number to 1.0.37
88e9875
@sree21go
Merge branch 'feature_nic_new_locations' into location_mapping_restru…
3f3e74c 
…cture
@sree21go
Fixed Null Pointer Exception Caused by Null TalukaId and Fixed commen…
69941db 
…ts in Fill HealthBlocks method
@sree21go
Bug Fix: Mother rejection reason saving as null instead of MOBILE_NUM…
1bd82db 
…BER_ALREADY_SUBSCRIBED
@gudipatiharitha
Merge pull request #722 from motech-implementations/feature_nic_new_l…
25b72d7 
…ocations

feature_nic_new_locations
@VishnuVimal
adding Taluka and health block services till saving to db
d73c52c
@VishnuVimal
Merge branch 'master' of https://github.com/motech-implementations/nms …
4e390d3 
…into Web_service_locations_mcts_rch
@sree21go
Merge branch 'feature_nic_new_locations' into location_mapping_restru…
30e2daf 
…cture
@sree21go
Merge branch 'location_mapping_restructure' into Web_service_location…
12ca157 
…s_mcts_rch
@VishnuVimal
Merge branch 'Web_service_locations_mcts_rch' of https://github.com/m…
93f89dd 
…otech-implementations/nms into Web_service_locations_mcts_rch
@sudheer93
Code for bulk insert for CDR processing
39668b6
@sree21go
Added LocationEnum and mapped all Location string literals to enum
d842157
@sudheer93
Added logger statements and minor performance improvements
f691d09
@VishnuVimal
Merge branch 'Web_service_locations_mcts_rch' of https://github.com/m…
4a571aa 
…otech-implementations/nms into Web_service_locations_mcts_rch
@sree21go
Changed Taluka_Id cell processor to String from Long
06e2645
@VishnuVimal
Web services for Talukas, HB and THB
0401ba7
@VishnuVimal
Merge branch 'Web_service_locations_mcts_rch' of https://github.com/m…
a45e620 
…otech-implementations/nms into Web_service_locations_mcts_rch
@sree21go
Improved performance for reading location xml
f4d24f7
@sudheer93
refactored variables in create locations work flow
8a5b06e
@sree21go
Fixed Null Location ids in beneficiaries issue
bf6311c
@sudheer93
handling null pointer exception and xml file reading issue for no rec…
20f0042 
…ords
@sudheer93
Merge remote-tracking branch 'origin/feature_nic_new_locations' into …
d7e036a 
…feature_nic_new_locations
@sree21go
Fixed healthfacility id and healthsubfacility id null for healthblock…
43e582b 
…s related to multiple talukas issue
@sree21go
Fixed Reflections issue caused by unrelated healthfacilityId - helath…
1d56413 
…subfacilityId in beneficiary record
gudipatiharitha and others added 28 commits November 22, 2018 23:39
@gudipatiharitha
Debug statements csv import
8ca7471
@gudipatiharitha
Debug statements csv import
390cc7b
@atishbeehyv123
Merge remote-tracking branch 'remotes/origin/testAllPITOnUpgrade' int…
38d591c 
…o nmsupgrade

# Conflicts:
#	testing/src/test/java/org/motechproject/nms/testing/it/kilkari/RchBeneficiaryImportServiceBundleIT.java
@gudipatiharitha
Obd "language" detached error
c8ec71d
@gudipatiharitha
Added exception to LOGGER.error
7d93a2f
@gudipatiharitha
Obd error after completion in ImiController
d18db9d
@gudipatiharitha
Obd error after completion in ImiController
a80f2fa
@gudipatiharitha
Obd error while generation in ImiController
01f2e85
@gudipatiharitha
Obd error while generation in ImiController
8dee54c
@gudipatiharitha
readded maxFetchDepth
82181f5
@atishbeehyv123
Merge branch 'nmsupgrade' of https://github.com/motech-implementation…
c78a3bb 
…s/nms into nmsupgrade
@atishbeehyv123
Fixed PITs timeout
4652b9e
@atishbeehyv123
Fix for CDR
896c55a
@gudipatiharitha
Removed all refrences to findByNumber in subscriberDataservice which …
54ab57e 
…is causing IndexOutOfBounds

Changed Set to HashSet in Subscriber and Circle and changed maxDepthFetch=1 in Subscriber to fix some PITs
@atishbeehyv123
Added logger to SmsNotificationServiceImpl
e45e233
@beehyvmanoja
Written_PITS_for_Bugs
8d728ea
@beehyvmanoja
Revert "Written_PITS_for_Bugs"
8fec70e 
This reverts commit 791b560
@beehyvmanoja
Revert "Written_PITS_for_Bugs"
824d6e7 
This reverts commit 791b560
@gudipatiharitha
Merge pull request #766 from motech-implementations/nms_bug_pit
605a393 
Written_PITS_For_Bugs
@atishbeehyv123
Fixed UserController PITs
e57e7fe
@gudipatiharitha
Merge pull request #768 from motech-implementations/PITFixesDev
4ad5b7e 
Pit fixes dev
@atishbeehyv123
Fixed PIT for MobileAcademyControllerIT
35d3129
@gudipatiharitha
debug statemetnts to test time taken for delete subscription
840af24
@gudipatiharitha
Merge remote-tracking branch 'origin/nmsupgrade' into nmsupgrade
425b8a4
@atishbeehyv123
Fixed API tests.
7c740d9
@gudipatiharitha
Fixed test cases
d6dc4f4
@gudipatiharitha
Removing retriveall methods unused.
9e83ca7
@atishbeehyv123
Fixed PIT named testForSubscriberAbsent for MCTS And RCH Beneficiary.
863a433
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dannyroberts dannyroberts dannyroberts approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.