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

DB migration script cleanup for census #1196

Open
wants to merge 488 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
488 commits
Select commit Hold shift + click to select a range
316c17f
HCMPRE-492 removing validateBoundaryCode from update
Priyanka-eGov Oct 18, 2024
1984d25
Merge branch 'microplanning-dev' into HCMPRE-492-changes
Priyanka-eGov Oct 18, 2024
45e3547
changed facilityAssigned type
tanishi-egov Oct 18, 2024
b8b4bdf
modified validation
tanishi-egov Oct 18, 2024
9e14269
HCMPRE-492 passing employeeId in PlanEmployeeAssignmentSearchCriteria…
Priyanka-eGov Oct 18, 2024
c934853
Merge pull request #985 from egovernments/HCMPRE-492-changes
shashwat-egov Oct 19, 2024
c03c610
HCMPRE-492 fixing boundary ancestral migration script
Priyanka-eGov Oct 19, 2024
8b549e0
HCMPRE-492 fixing boundary ancestral migration script
Priyanka-eGov Oct 19, 2024
93110f6
Merge pull request #1012 from egovernments/census-test
tanishi-egov Oct 19, 2024
81088a0
Added workflow for census
tanishi-egov Oct 19, 2024
981e2df
Merge branch 'HCMPRE-711' of https://github.com/egovernments/health-c…
tanishi-egov Oct 19, 2024
9465185
Added code to ensure that only active employee assignments are returned
shashwat-egov Oct 19, 2024
53eb8fc
Added workflow for census
tanishi-egov Oct 19, 2024
a8d6714
pull from microplanning-dev
tanishi-egov Oct 19, 2024
7fd7142
pull from microplanning-dev
tanishi-egov Oct 19, 2024
f5144e8
Merge pull request #1013 from egovernments/plan-employee-search-fix
shashwat-egov Oct 19, 2024
828f60b
Added status count for plan
tanishi-egov Oct 19, 2024
ab3bd1d
Added status count for plan
tanishi-egov Oct 19, 2024
434ffb3
removed assignee search in statusCount enrichment
tanishi-egov Oct 19, 2024
fcbf416
Merge branch 'HCMPRE-711' of https://github.com/egovernments/health-c…
tanishi-egov Oct 19, 2024
252863f
Merge branch 'HCMPRE-711' of https://github.com/egovernments/health-c…
tanishi-egov Oct 19, 2024
d594a07
removed assignee search in statusCount enrichment
tanishi-egov Oct 19, 2024
0598e3e
modified plan status count query builder
tanishi-egov Oct 19, 2024
aefc39c
added duplicate record validation for plan facility
tanishi-egov Oct 19, 2024
7c24d74
enabled partnerAssignmentValidation for census
tanishi-egov Oct 21, 2024
07b5484
Added flag to fetch unique assignments
shashwat-egov Oct 21, 2024
160954e
Merge pull request #1017 from egovernments/unique-assignments
shashwat-egov Oct 21, 2024
8648d0a
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Oct 21, 2024
85ce68c
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Oct 21, 2024
3e756cc
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Oct 21, 2024
c1268a4
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Oct 21, 2024
8b00937
Removing validateResources method from PlanValidator
Priyanka-eGov Oct 21, 2024
554e20d
// enriching boundary ancestral path for incoming plan request from t…
Priyanka-eGov Oct 21, 2024
479a2f6
census consumer for enriching facilityId
tanishi-egov Oct 21, 2024
d411f5d
modified plan count query
tanishi-egov Oct 21, 2024
ae1be52
Added pagination
tanishi-egov Oct 21, 2024
7193076
Merge pull request #1014 from egovernments/HCMPRE-861
shashwat-egov Oct 21, 2024
161d40d
adding validateResources, validating only when plan configuration id …
Priyanka-eGov Oct 21, 2024
b7c3a79
Merge pull request #1020 from egovernments/remove-validateResources
shashwat-egov Oct 21, 2024
465a5d8
Added planConfigName enrichment
tanishi-egov Oct 21, 2024
abf8063
Adding bulk plan update API
shashwat-egov Oct 21, 2024
db1fa68
Integrated Census service in plan Service
tanishi-egov Oct 21, 2024
c8441f8
Updated name of arguments in bulk update API
shashwat-egov Oct 22, 2024
a142ff6
Updated search parameters
shashwat-egov Oct 22, 2024
249a9da
Validation before moving wf status in planConfig
tanishi-egov Oct 22, 2024
edf5af7
pagination
tanishi-egov Oct 22, 2024
5061065
Increasing output field's size from 64 to 256
Priyanka-eGov Oct 23, 2024
8419ab6
Merge pull request #1030 from egovernments/updateMaxSize-plan-service
shashwat-egov Oct 23, 2024
a557cd5
Bulk update api
tanishi-egov Oct 23, 2024
9dbbc92
pagination
tanishi-egov Oct 23, 2024
c2d10bf
setting assignee for bulk update api
tanishi-egov Oct 23, 2024
792874e
Merge branch 'plan-bulk-update' of https://github.com/egovernments/he…
tanishi-egov Oct 23, 2024
4b82c97
added migration script to make status nullable
tanishi-egov Oct 23, 2024
4356b86
Merge branch 'HCMPRE-582' of https://github.com/egovernments/health-c…
tanishi-egov Oct 23, 2024
85e0d94
Merge branch 'HCMPRE-711' of https://github.com/egovernments/health-c…
tanishi-egov Oct 23, 2024
4ea39f3
Merge branch 'HCMPRE-850' of https://github.com/egovernments/health-c…
tanishi-egov Oct 23, 2024
83294d8
HCMPRE-853 adding consumer for census create from resource generator …
Priyanka-eGov Oct 23, 2024
0b9db4a
Merge remote-tracking branch 'origin/HCMPRE-859' into HCMPRE-859
Priyanka-eGov Oct 23, 2024
dd47780
Merge branch 'HCMPRE-859' of https://github.com/egovernments/health-c…
tanishi-egov Oct 23, 2024
d4f2625
added resource census consumer
tanishi-egov Oct 23, 2024
61be50f
removed unused pojos
tanishi-egov Oct 23, 2024
e812def
added status in rowMapper
tanishi-egov Oct 24, 2024
269a426
Integrated business service
tanishi-egov Oct 24, 2024
d45f30c
pull from microplanning-dev
tanishi-egov Oct 24, 2024
ea553b5
changed topic for facility consumer
tanishi-egov Oct 24, 2024
3ea365e
setting assignee in rowMapper
tanishi-egov Oct 24, 2024
c88e48d
modified facilityDTO
tanishi-egov Oct 24, 2024
940fad8
Setting request info in facility catchment consumer
shashwat-egov Oct 25, 2024
df12fe4
Fixed census consumer flow
shashwat-egov Oct 25, 2024
29d0cc8
Fixed validation
shashwat-egov Oct 25, 2024
9336106
setting partner assignment validation as false when triggered throug…
Priyanka-eGov Oct 25, 2024
dc799bf
Corrected comma delimiter in POJO conversion
shashwat-egov Oct 25, 2024
c144d89
Fixed census assignment
shashwat-egov Oct 25, 2024
cda10bf
updating save as draft condition
Priyanka-eGov Oct 25, 2024
a20d0d8
Fixed census validation logic
shashwat-egov Oct 25, 2024
3186e21
HCMPRE-1078 remove validations against resourcemapping
Priyanka-eGov Oct 25, 2024
9ff48a6
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Oct 26, 2024
d44ac6f
enriched planConfigName
tanishi-egov Oct 26, 2024
2f87696
enriching initially set service boundaries in plan facility update
tanishi-egov Oct 26, 2024
10b063b
modified census facility consumer
tanishi-egov Oct 26, 2024
792ef3f
Merge branch 'microplanning-dev' into plan-bulk-update
shashwat-egov Oct 28, 2024
aef028f
Merge pull request #1023 from egovernments/plan-bulk-update
shashwat-egov Oct 28, 2024
9da23d4
Adding changes for updating plan's status count
Priyanka-eGov Oct 28, 2024
ff9b736
Adding changes for updating plan's status count
Priyanka-eGov Oct 28, 2024
f6c6fe1
modifying search criteria for status count query
Priyanka-eGov Oct 28, 2024
a688bde
Merge pull request #1039 from egovernments/save-as-draft-update
shashwat-egov Oct 28, 2024
9f3b5bd
Validating one active file on setup complete duting plan config valid…
Priyanka-eGov Oct 28, 2024
b78e56a
Merge branch 'microplanning-dev' into plan-status-count
Priyanka-eGov Oct 28, 2024
a2ed869
Merge pull request #1044 from egovernments/plan-status-count
shashwat-egov Oct 28, 2024
2ad57dc
Merge branch 'microplanning-dev' into plan-config-file-validation
Priyanka-eGov Oct 28, 2024
ed3e3b7
Merge pull request #1045 from egovernments/plan-config-file-validation
shashwat-egov Oct 29, 2024
8bfc962
HCMPRE-599 updating Plan service models
Priyanka-eGov Oct 17, 2024
ac76757
HCMPRE-599 updating Plan service models
Priyanka-eGov Oct 17, 2024
1ba9649
HCMPRE-599 changes
Priyanka-eGov Oct 19, 2024
745e570
HCMPRE-599 adding census POJOs
Priyanka-eGov Oct 21, 2024
45cd909
HCMPRE-599changes for triggering pland census records on workflow status
Priyanka-eGov Oct 23, 2024
025f8a9
HCMPRE-599 app.prop changes for resource generator service
Priyanka-eGov Oct 23, 2024
6870fc5
Renaming resource-estimation-service to resource-generator
Priyanka-eGov Oct 24, 2024
e916112
HCMPRE-1078 enrichment of resource mapping
Priyanka-eGov Oct 25, 2024
2c48808
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Oct 30, 2024
d87cf04
HCMPRE-1122 changing processing logic
Priyanka-eGov Oct 30, 2024
bc9c88c
HCMPRE-1122 changing processing logic
Priyanka-eGov Oct 30, 2024
b175339
HCMPRE-1122 updating operation related validations
Priyanka-eGov Oct 30, 2024
fcfa864
HCMPRE-1122 adding method comments
Priyanka-eGov Oct 30, 2024
5f054be
Merge pull request #1049 from egovernments/HCMPRE-1122
shashwat-egov Oct 30, 2024
c4f7442
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 4, 2024
f39cc99
enhancement in facilityCatchmentConsumer
tanishi-egov Nov 4, 2024
436988b
enhancement in facilityCatchmentConsumer
tanishi-egov Nov 4, 2024
2e1d910
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 4, 2024
1bb2466
removing catchement topic that was added before
tanishi-egov Nov 4, 2024
ed1210c
Merge pull request #1050 from egovernments/HCMPRE-599
shashwat-egov Nov 4, 2024
f124fa4
added wf validation for approving estimations
tanishi-egov Nov 4, 2024
f05af66
added wf validation for approving estimations
tanishi-egov Nov 4, 2024
0900576
adding additionalDetails as string while preparing rows for batchUpdate
tanishi-egov Nov 4, 2024
2728fa8
adding additionalDetails as string while preparing rows for batchUpdate
tanishi-egov Nov 4, 2024
fdb326a
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 4, 2024
799abba
HCMPRE-1094 changes for facility mapping create trigger on workflow
Priyanka-eGov Nov 4, 2024
67f438e
reverting the change in census-bulk-api
tanishi-egov Nov 4, 2024
98d8405
parsing additional details in bulk update api
tanishi-egov Nov 4, 2024
be358a3
Merge pull request #1041 from egovernments/HCMPRE-1091
shashwat-egov Nov 4, 2024
0397c21
Added plan config name in plan employee's and plan facility's search …
tanishi-egov Nov 4, 2024
4502f83
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 4, 2024
38f8123
Bypassing validations for operations when source is CUSTOM
Priyanka-eGov Nov 4, 2024
aeea479
added workflow validations
tanishi-egov Nov 4, 2024
cd3bcb8
removing unused service constants
tanishi-egov Nov 5, 2024
a52710d
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 5, 2024
0033a75
Merge pull request #1053 from egovernments/custom-formula-validation
shashwat-egov Nov 5, 2024
d762db7
Changes for triggering plan-facility mapping
Priyanka-eGov Nov 5, 2024
f25c1b4
adding project factory data create host
Priyanka-eGov Nov 5, 2024
1e9737d
handling case for empty areaCodes in search criteria
tanishi-egov Nov 5, 2024
16979ab
Merge pull request #1055 from egovernments/census-feature
tanishi-egov Nov 5, 2024
3323816
pull from microplanning-dev
tanishi-egov Nov 5, 2024
d6462f8
handling case for empty areaCodes in search criteria
tanishi-egov Nov 5, 2024
482ebf4
adding project factory data create host
Priyanka-eGov Nov 5, 2024
4d90389
Adding facility create trigger status
Priyanka-eGov Nov 5, 2024
acf1d25
Merge pull request #1057 from egovernments/HCMPRE-1094
shashwat-egov Nov 5, 2024
1c238a0
Adding additionalField table in census
tanishi-egov Nov 5, 2024
ec429c9
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 5, 2024
aa8b784
adding plan config name in plan employee and plan facility pojo
tanishi-egov Nov 5, 2024
8159e91
Adding additionalField table in census
tanishi-egov Nov 6, 2024
0efeb33
implemented partial search in plan config name
tanishi-egov Nov 6, 2024
ad2df79
Merge pull request #1026 from egovernments/HCMPRE-864
shashwat-egov Nov 6, 2024
7cad5f0
Merge pull request #1060 from egovernments/HCMPRE-1148
shashwat-egov Nov 6, 2024
675126e
Changing datatype of value
tanishi-egov Nov 6, 2024
96a3b9e
HCMPRE-1162 enrich additionalfieldForCensus
Priyanka-eGov Nov 6, 2024
6f2d6ff
HCMPRE-1162 enrich additionalfieldForCensus
Priyanka-eGov Nov 6, 2024
5912cfc
Merge pull request #1067 from egovernments/enrich-additional-fields
shashwat-egov Nov 7, 2024
9f9faf6
Merge pull request #1063 from egovernments/feature-census
shashwat-egov Nov 7, 2024
d6624c0
updated query builder for census
tanishi-egov Nov 8, 2024
f6ed213
handling null pointer exception on updating additional details
tanishi-egov Nov 8, 2024
af3a206
Changes to allow assumption values in input
Priyanka-eGov Nov 8, 2024
832daba
Removing older method for getting input value
Priyanka-eGov Nov 11, 2024
543934b
Making editable false for uploaded additional field during census create
Priyanka-eGov Nov 11, 2024
d4b3e17
Merge pull request #1087 from egovernments/HCMPRE-1213
shashwat-egov Nov 11, 2024
9d78cd6
HCMPRE-853 removing lat long fields from additional field overridekeys
Priyanka-eGov Nov 11, 2024
53b976b
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 11, 2024
b73e048
Changes for adding execution order for operations
Priyanka-eGov Nov 11, 2024
10025ff
Changes for adding execution order for operations
Priyanka-eGov Nov 11, 2024
d8e6d0c
Merge pull request #991 from egovernments/HCMPRE-860
shashwat-egov Nov 11, 2024
36e2a10
Merge pull request #1085 from egovernments/formula-validations
shashwat-egov Nov 11, 2024
670383b
Adding facilityName column and enriching servingPop
tanishi-egov Nov 12, 2024
cfc21d2
HCMPRE-853 added chnages for census search and fetching boundarycodes…
Priyanka-eGov Nov 8, 2024
ab09e8f
HCMPRE-853 changes for updating file with approved census data
Priyanka-eGov Nov 11, 2024
214b333
HCMPRE-853 adding logs
Priyanka-eGov Nov 11, 2024
752a8d7
pull from microplanning-dev
tanishi-egov Nov 12, 2024
cee6a61
pull from microplanning-dev
tanishi-egov Nov 12, 2024
d9635ee
HCMPRE-853 integrating with project factory with updated resources
Priyanka-eGov Nov 12, 2024
78d293e
Merge pull request #1098 from egovernments/HCMPRE-1154
shashwat-egov Nov 12, 2024
27456b9
modification in wf-service
tanishi-egov Nov 12, 2024
d919258
workflow auto-assignee issue
tanishi-egov Nov 12, 2024
4a9213b
Merge pull request #1101 from egovernments/microplan-wf
shashwat-egov Nov 12, 2024
a5e44f3
HCMPRE-853 commenting project factory integration
Priyanka-eGov Nov 12, 2024
024c4a7
adding pagination for plan-employee api
tanishi-egov Nov 12, 2024
0e9e0fe
Merge pull request #1097 from egovernments/HCMPRE-853-dev
shashwat-egov Nov 12, 2024
ce4e484
changed the data type of BigDecimal
tanishi-egov Nov 12, 2024
475e690
HCMPRE-1282 changes for updating estimates into plan
Priyanka-eGov Nov 12, 2024
85c9826
HCMPRE-1282 app.prop changes
Priyanka-eGov Nov 12, 2024
949f898
Merge pull request #1102 from egovernments/microplan-feature
shashwat-egov Nov 13, 2024
04c537c
Adding case for when celltype is formula.
Priyanka-eGov Nov 13, 2024
d896b7b
enriching additional details with additional field key-value
tanishi-egov Nov 13, 2024
4b07cbc
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 14, 2024
a1acecd
modified orderBy clause
tanishi-egov Nov 14, 2024
96ee7e5
made changes in order by clause
tanishi-egov Nov 14, 2024
d7bf017
added facilityType
tanishi-egov Nov 14, 2024
e1cb018
pull from microplanning-dev
tanishi-egov Nov 14, 2024
9fb0a36
pull from microplanning-dev
tanishi-egov Nov 14, 2024
996e5ee
making fuzzy search cAse-insenSItive
tanishi-egov Nov 14, 2024
cd2aed6
making fuzzy search cAse-insenSItive
tanishi-egov Nov 15, 2024
6389b32
Merge pull request #1024 from egovernments/HCMPRE-958
shashwat-egov Nov 15, 2024
d63133b
making fuzzy search cAse-insenSItive
tanishi-egov Nov 15, 2024
53ac20d
pull from microplanning-dev
tanishi-egov Nov 15, 2024
702d825
pull from microplanning-dev
tanishi-egov Nov 15, 2024
0f26de0
pull from microplanning-dev
tanishi-egov Nov 15, 2024
9c47c8b
modified pagination
tanishi-egov Nov 15, 2024
c0ed5cc
HCMPRE-1282 changes for updating approved plans into file for campaig…
Priyanka-eGov Nov 15, 2024
c6191d3
added planConfigStatus in search criteria
tanishi-egov Nov 15, 2024
34ce67c
HCMPRE-1282 changes for updating approved plans into file for campaig…
Priyanka-eGov Nov 15, 2024
5e53637
Merge branch 'microplanning-dev' into HCMPRE-1282
Priyanka-eGov Nov 15, 2024
d2802e8
Merge pull request #1117 from egovernments/cell-type-formula-fix
shashwat-egov Nov 15, 2024
a8693ad
Merge pull request #1131 from egovernments/HCMPRE-1282
shashwat-egov Nov 15, 2024
62a7b8b
Merge branch 'microplanning-dev' into HCMPRE-771
Priyanka-eGov Nov 18, 2024
856953c
HCMPRE-771 merging multiple alter table migration scripts into create…
Priyanka-eGov Nov 18, 2024
e62c3ee
Adding workflow restricted roles in census
tanishi-egov Nov 18, 2024
0336082
Adding workflow restricted roles in census
tanishi-egov Nov 18, 2024
a34c9c8
Merge pull request #1118 from egovernments/census-feature
shashwat-egov Nov 18, 2024
59e6c9d
Fixing limit and adding check for empty row
Priyanka-eGov Nov 18, 2024
2d61b9a
Merge pull request #1139 from egovernments/limit-fix
shashwat-egov Nov 18, 2024
db113ac
Fixing limit and adding check for empty row
Priyanka-eGov Nov 18, 2024
54b4a5f
added ranked query for plan employee assignment
tanishi-egov Nov 18, 2024
766044b
added ranked query for plan employee assignment
tanishi-egov Nov 18, 2024
fce9801
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 18, 2024
79e408d
Merge pull request #945 from egovernments/HCMPRE-771
shashwat-egov Nov 19, 2024
8208ae2
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 19, 2024
e84d7e3
HCMPRE-1300 DB migration script cleanup
Priyanka-eGov Nov 19, 2024
e085bdf
adding plan bulk update topic
tanishi-egov Nov 19, 2024
cb2189e
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 19, 2024
3fb8b86
Merge pull request #1143 from egovernments/HCMPRE-1299
Priyanka-eGov Nov 19, 2024
c4bcb45
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 19, 2024
dbd5ba9
Merge pull request #1121 from egovernments/microplan-feature-2
shashwat-egov Nov 19, 2024
c2f5d44
Merge pull request #1142 from egovernments/HCMPRE-1300
shashwat-egov Nov 19, 2024
2e5f760
Merge pull request #1136 from egovernments/census-feature-2
shashwat-egov Nov 19, 2024
357e4cd
Adding facility name in census additional details
tanishi-egov Nov 19, 2024
7a2234b
Wf auto assignment to multiple people
tanishi-egov Nov 20, 2024
cb49592
Wf auto assignment to multiple people
tanishi-egov Nov 20, 2024
da3d1f8
Adding boundaryTypeHierarchy Pojos and search endpoint
tanishi-egov Nov 22, 2024
20f416b
enriching jurisdiction mapping in census
tanishi-egov Nov 22, 2024
05bf581
changing jurisdictionMapping from jsonIgnore to jsonProperty
tanishi-egov Nov 22, 2024
357ad76
optimizing the enrichment functions and adding comments
tanishi-egov Nov 22, 2024
f0a4db8
handling null pointer exception
tanishi-egov Nov 25, 2024
46c7405
Wf auto assignment to multiple people
tanishi-egov Nov 25, 2024
efb99ef
Set last modified time on update call
tanishi-egov Nov 25, 2024
d6650e4
enriching serving population with sum of confirmed target population …
tanishi-egov Nov 25, 2024
f5e828f
modifying Wf for send back actions
tanishi-egov Nov 25, 2024
f5e580f
enriching jurisdiction mapping in plan
tanishi-egov Nov 25, 2024
44302a1
setting assignees separetly for send back actions
tanishi-egov Nov 26, 2024
24e446f
Changing assignee column to Text in db
tanishi-egov Nov 26, 2024
5acd255
Changing assignee column to Text in db
tanishi-egov Nov 26, 2024
a5197ba
Merge pull request #1149 from egovernments/HCMPRE-1296-plan
shashwat-egov Nov 26, 2024
57d4581
Merge pull request #1148 from egovernments/HCMPRE-1296
shashwat-egov Nov 26, 2024
acd0a58
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 26, 2024
356c258
Merge branch 'microplanning-dev' of https://github.com/egovernments/h…
tanishi-egov Nov 26, 2024
54f491f
Merge branch 'census-bulk-api' of https://github.com/egovernments/hea…
tanishi-egov Nov 26, 2024
24ead58
Merge pull request #1171 from egovernments/HCMPRE-1306-plan
shashwat-egov Nov 26, 2024
22021d1
Merge pull request #1159 from egovernments/HCMPRE-1306
shashwat-egov Nov 26, 2024
6341168
Merge pull request #1167 from egovernments/HCMPRE-1297
shashwat-egov Nov 26, 2024
0c83ff6
Merge branch 'microplanning-dev' into census-bulk-api
Priyanka-eGov Nov 26, 2024
742f4b0
enriching jurisdiction mapping
tanishi-egov Nov 26, 2024
3d00d07
enriching jurisdiction mapping
tanishi-egov Nov 27, 2024
4906886
Merge pull request #1181 from egovernments/census-feature
shashwat-egov Nov 27, 2024
7e96d34
DB migration script cleanup
tanishi-egov Nov 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
13 changes: 10 additions & 3 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,22 @@ config:
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/plan-service/src/main/resources/db"
image-name: "plan-service-db"
- name: "builds/health-campaign-services/health-services/resource-estimation-service"
- name: "builds/health-campaign-services/health-services/resource-generator"
build:
- work-dir: "health-services/resource-estimation-service"
image-name: "resource-estimation-service"
- work-dir: "health-services/resource-generator"
image-name: "resource-generator"
dockerfile: "build/17/maven/Dockerfile"
- name: "builds/health-campaign-services/analytics/auth-proxy"
build:
- work-dir: "analytics/auth-proxy"
image-name: "auth-proxy"
- name: "builds/health-campaign-services/health-services/census-service"
build:
- work-dir: "health-services/census-service"
image-name: "census-service"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/census-service/src/main/resources/db"
image-name: "census-service-db"

# frontend
- name: builds/health-campaign-services/frontend/workbench-ui
Expand Down
18 changes: 18 additions & 0 deletions health-services/census-service/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Swagger generated server

Spring Boot Server


## Overview
This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.
This is an example of building a swagger-enabled server in Java using the SpringBoot framework.

The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox)

Start your server as an simple java application

You can view the api documentation in swagger-ui by pointing to
http://localhost:8080/

Change default port value in application.properties
141 changes: 141 additions & 0 deletions health-services/census-service/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.egov</groupId>
<artifactId>census-serivce</artifactId>
<packaging>jar</packaging>
<name>census-serivce</name>
<version>1.0.0</version>
<properties>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.2</version>
</parent>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-models</artifactId>
<version>1.0.21-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>9.22.3</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.18</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.2.8</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.0</version>
</dependency>
<!-- Egov dependencies -->
<dependency>
<groupId>org.egov.services</groupId>
<artifactId>tracer</artifactId>
<version>2.9.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.egov.services</groupId>-->
<!-- <artifactId>digit-models</artifactId>-->
<!-- <version>1.0.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.egov</groupId>
<artifactId>mdms-client</artifactId>
<version>2.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
</dependencies>
<repositories>
<repository>
<id>repo.egovernments.org</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>repo.egovernments.org.snapshots</id>
<name>eGov ERP Releases Repository</name>
<url>https://nexus-repo.egovernments.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>repo.egovernments.org.public</id>
<name>eGov Public Repository Group</name>
<url>https://nexus-repo.egovernments.org/nexus/content/groups/public/</url>
</repository>
<repository>
<id>repo.digit.org</id>
<name>eGov DIGIT Releases Repository</name>
<url>https://nexus-repo.digit.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
</project>
20 changes: 20 additions & 0 deletions health-services/census-service/src/main/java/digit/Main.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package digit;


import org.egov.tracer.config.TracerConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;

@Import({ TracerConfiguration.class })
@SpringBootApplication
@ComponentScan(basePackages = { "digit", "digit.web.controllers" , "digit.config"})
public class Main {


public static void main(String[] args) throws Exception {
SpringApplication.run(Main.class, args);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package digit.config;

import lombok.*;
import org.egov.tracer.config.TracerConfiguration;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Component;

import java.util.List;

@Component
@Data
@Import({TracerConfiguration.class})
@NoArgsConstructor
@AllArgsConstructor
@Setter
@Getter
public class Configuration {

// Allowed roles for census
@Value("#{${allowed.census.roles}}")
private List<String> allowedCensusRoles;

@Value("#{${workflow.restricted.roles}}")
private List<String> workflowRestrictedRoles;

// Persister Topic
@Value("${census.create.topic}")
private String censusCreateTopic;

@Value("${census.update.topic}")
private String censusUpdateTopic;

@Value("${census.bulk.update.topic}")
private String censusBulkUpdateTopic;

@Value("${plan.facility.update.topic}")
private String planFcailityUpdateTopic;

// Boundary Service
@Value("${egov.boundary.service.host}")
private String boundaryServiceHost;

@Value("${egov.boundary.relationship.search.endpoint}")
private String boundaryRelationshipSearchEndpoint;

@Value("${egov.boundary.hierarchy.search.endpoint}")
private String boundaryHierarchySearchEndpoint;

// Plan Service
@Value("${egov.plan.service.host}")
private String planServiceHost;

@Value("${egov.plan.employee.assignment.search.endpoint}")
private String planEmployeeAssignmentSearchEndpoint;

//Workflow
@Value("${egov.workflow.host}")
private String wfHost;

@Value("${egov.workflow.transition.path}")
private String wfTransitionPath;

@Value("${egov.business.service.search.endpoint}")
private String businessServiceSearchEndpoint;

@Value("${workflow.initiate.action}")
private List<String> wfInitiateActions;

@Value("${workflow.intermediate.action}")
private List<String> wfIntermediateActions;

@Value("${workflow.send.back.actions}")
private List<String> wfSendBackActions;

//SMSNotification
@Value("${egov.sms.notification.topic}")
private String smsNotificationTopic;

//Pagination
@Value("${census.default.offset}")
private Integer defaultOffset;

@Value("${census.default.limit}")
private Integer defaultLimit;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package digit.config;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;

import java.util.TimeZone;

import jakarta.annotation.PostConstruct;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.egov.tracer.config.TracerConfiguration;


@Import({TracerConfiguration.class})
public class MainConfiguration {

@Value("${app.timezone}")
private String timeZone;

@PostConstruct
public void initialize() {
TimeZone.setDefault(TimeZone.getTimeZone(timeZone));
}

@Bean
public ObjectMapper objectMapper() {
return new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES).setTimeZone(TimeZone.getTimeZone(timeZone));
}

@Bean
@Autowired
public MappingJackson2HttpMessageConverter jacksonConverter(ObjectMapper objectMapper) {
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setObjectMapper(objectMapper);
return converter;
}
}
Loading