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

edfe #698

Open
wants to merge 378 commits into
base: newbranch-pgr-migration-error
Choose a base branch
from
Open

edfe #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
378 commits
Select commit Hold shift + click to select a range
cc2d97b
additional check if ISCapped field exists
bhanuprakash-egov Jul 19, 2023
c968bfd
removed changes not required for HLM-2915
kanishq-egov Jul 21, 2023
f3d6ce0
Merge pull request #466 from egovernments/handling_table_charts_overa…
saiprakash-eGov Jul 21, 2023
faa5b64
Merge pull request #465 from egovernments/Disable-sms-for-org_admin-role
kavi-egov Jul 24, 2023
ccc34fd
Added changes for HLM-3092 : edge cases for acos function used in query
kanishq-egov Jul 27, 2023
7e72ca5
Added changes for HLM-3069
kanishq-egov Jul 27, 2023
3e97f8f
HLM-2915 : increase health-service-model version to 1.0.7
kanishq-egov Jul 31, 2023
d3b53f0
fixed null point issue : HLM-3092
kanishq-egov Aug 1, 2023
bd25b79
HLM-3092 : fixed address null issue due to client audit detail changes
kanishq-egov Aug 3, 2023
47217dd
added kafka topic in persister for HLM-3069
kanishq-egov Aug 4, 2023
1c7aed8
Removed throwing exception in service request client and instead thro…
shubhang-eGov Aug 4, 2023
b167e61
Updated pom.xml
shubhang-eGov Aug 4, 2023
ae5eae6
Merge pull request #470 from egovernments/PFM-4215-removed-throwing-e…
kavi-egov Aug 4, 2023
9f7d1e8
Added CHANGELOG.md
shubhang-eGov Aug 4, 2023
c04f80e
Update CHANGELOG.md
kavi-egov Aug 4, 2023
1bf7074
Merge pull request #471 from egovernments/Added-ChangeLog
kavi-egov Aug 4, 2023
29f3332
Individual service change for getting correct error code
shubhang-eGov Aug 4, 2023
3166bd1
HLM-3092: fixed bug, incorrect placement of limit in query
kanishq-egov Aug 4, 2023
ce4d90d
added swagger documentation for HLM-3069
kanishq-egov Aug 7, 2023
2d078d7
HLM-2915 : increase health-service-model version to 1.0.7
kanishq-egov Jul 31, 2023
01772ef
Removed throwing exception in service request client and instead thro…
shubhang-eGov Aug 4, 2023
97c0a1c
Updated pom.xml
shubhang-eGov Aug 4, 2023
bbff729
Added CHANGELOG.md
shubhang-eGov Aug 4, 2023
fc17cca
Update CHANGELOG.md
kavi-egov Aug 4, 2023
d3e49ee
Individual service change for getting correct error code
shubhang-eGov Aug 4, 2023
04aeb20
changed health-config-models version
kanishq-egov Aug 7, 2023
c0a98c9
Merge branch 'hlm-2915-client-audit-individual' of https://github.com…
kanishq-egov Aug 7, 2023
a3eb758
changed health-config-models version and added adverse_event migratio…
kanishq-egov Aug 7, 2023
97dd7b6
Merge branch 'hlm-3069-adverse-events-services' of https://github.com…
kanishq-egov Aug 7, 2023
e3e9cd3
changed models versions
kanishq-egov Aug 7, 2023
ef7985a
Merge pull request #473 from egovernments/PFM-4215-error-codes-cherry…
kavi-egov Aug 7, 2023
ab8c3c0
Added test cases for HLM-3069
kanishq-egov Aug 8, 2023
f49f325
added change for HLM-3069 : db type change for symptoms
kanishq-egov Aug 8, 2023
5bc1909
removing non-relavent test case for HLM-3069
kanishq-egov Aug 9, 2023
4b222e3
HLM-3069 : missing bulk request consumer added
kanishq-egov Aug 9, 2023
39832f3
PFM-4292-fixed User lastname is set to null
shubhang-eGov Aug 9, 2023
6c6afa0
PFM-4292-fixed User lastname is set to null
shubhang-eGov Aug 9, 2023
0f6e001
Added changed logic for delete api for HLM-3069
kanishq-egov Aug 10, 2023
db34cc3
Update build-config.yml
kavi-egov Aug 12, 2023
f74fa03
Create codacy.yml
kavi-egov Aug 15, 2023
bb7db4d
Update codacy.yml
kavi-egov Aug 15, 2023
c9c79cc
Merge pull request #476 from egovernments/PFM-4292-Username-null-appe…
kavi-egov Aug 16, 2023
5cad388
Removed Not Required migration files from HLM-2915 changes
kanishq-egov Aug 23, 2023
8ca46ca
updated-db-migration-for-transgender
SumelRattan-eGov May 26, 2023
b0e166f
[hlm-2915]: Added clientAuditDetails
jayantp-egov Jun 16, 2023
e4edb7e
[hlm-2915]: Created migrations and added client audit details.
shivab-egov Jun 30, 2023
81bead5
removed changes not required for HLM-2915
kanishq-egov Jul 21, 2023
4b0c427
HLM-2915 : increase health-service-model version to 1.0.7
kanishq-egov Jul 31, 2023
d928b37
Removed Not Required migration files from HLM-2915 changes
kanishq-egov Aug 23, 2023
abf16cd
Merge branch 'hlm-2915-client-audit-individual' of https://github.com…
kanishq-egov Aug 23, 2023
20a94f0
HLM-2915: Added clientCreatedBy and clientLastModifiedBy
kanishq-egov Aug 30, 2023
f473183
Merge pull request #460 from egovernments/hlm-2915-client-audit-indiv…
kavi-egov Aug 30, 2023
a34d620
HLM-3069 : add mandatory to clientreferenceId
kanishq-egov Sep 1, 2023
b6a7073
fixing address fields position in row mapper
vishal-egov Sep 1, 2023
6b07134
Update FacilityRowMapper.java
kavi-egov Sep 2, 2023
b3f7069
Update HouseholdRowMapper.java
kavi-egov Sep 2, 2023
aaa7e57
Update ProjectTaskRowMapper.java
kavi-egov Sep 2, 2023
00692e6
Update FacilityRepository.java
kavi-egov Sep 2, 2023
6fcd2af
Update FacilityRowMapper.java
kavi-egov Sep 2, 2023
04113c5
Update HouseholdRowMapper.java
kavi-egov Sep 2, 2023
faefa31
Update HouseholdRepository.java
kavi-egov Sep 2, 2023
0f078af
Update ProjectTaskRowMapper.java
kavi-egov Sep 2, 2023
cfc45c5
Update ProjectTaskRepository.java
kavi-egov Sep 2, 2023
d4e0747
HLM-3069 : Changes as per code review comments : moved adverse events…
kanishq-egov Sep 6, 2023
7b2e492
HLM-3069 : changed version to 1.0.8 in health-services-models
kanishq-egov Sep 6, 2023
61c2529
HLM-3069 : moved adverse event changes to new module adrm
kanishq-egov Sep 12, 2023
db66e4f
HLM-3069 : addded project service in application.properties
kanishq-egov Sep 12, 2023
fb7fe76
HLM-3069 : copied changes from HLM-2915 for health-services-models ch…
kanishq-egov Sep 12, 2023
70e7334
Merge pull request #493 from egovernments/client-audit-details-addres…
kanishq-egov Sep 13, 2023
b2176c1
HLM-3069 : changes in adverse event test, refactor adverse event code…
kanishq-egov Sep 18, 2023
d700104
HLM-3069: HLM-4007 bug fixes
kanishq-egov Sep 20, 2023
ea43860
HLM-3069: added adverse event specs
kanishq-egov Sep 20, 2023
9820662
HLM-3069: dockerfile, migration.sh, adrm persister added, new fields …
kanishq-egov Sep 21, 2023
4941796
HLM-3069: updated AdrmConfiguration.java
kanishq-egov Sep 22, 2023
8a5c715
HLM-3069: updated AdverseEventConsumer.java
kanishq-egov Sep 22, 2023
aa00845
HLM-3069: bug fixes
kanishq-egov Sep 22, 2023
30bb090
HLM-3069: added limit parameter for project beneficiary search call
kanishq-egov Sep 25, 2023
e20d9da
HLM-3376: Added changes for referral management
kanishq-egov Sep 25, 2023
d3bfc7f
HLM-3069: updated build.config.yml
kanishq-egov Sep 25, 2023
cdbdcc1
HLM-3376: Added Validators, updated Referral.java
kanishq-egov Sep 25, 2023
62a3b7a
HLM-3376: changed contract yaml and rowmapper
kanishq-egov Sep 27, 2023
6a2985e
HLM-3069: changed module name to referral management
kanishq-egov Sep 27, 2023
51cd6f6
HLM-3069: changed module name to referral management
kanishq-egov Sep 27, 2023
898af19
HLM-3376: Added changes for referral management
kanishq-egov Sep 25, 2023
006f5c6
HLM-3376: Added Validators, updated Referral.java
kanishq-egov Sep 25, 2023
38fb1e0
HLM-3376: changed contract yaml and rowmapper
kanishq-egov Sep 27, 2023
b4536ec
HLM-3376: changed module to referral management
kanishq-egov Sep 27, 2023
b529280
HLM-3376: added db migration script, rename for referral-management m…
kanishq-egov Sep 28, 2023
cc45e4e
HLM-3069: adverse event renamed to side effect
kanishq-egov Sep 28, 2023
7eb928f
HLM-3069: changed servlet context
kanishq-egov Sep 28, 2023
cdf8f1a
HLM-3069: updated build-config.yml renamed adrm to referralmanagement
kanishq-egov Sep 28, 2023
d4adc4a
Merge pull request #501 from egovernments/HLM-3069-ad-build-config
kavi-egov Sep 28, 2023
4569f0d
HLM-3069: adverse event renamed to side effect
kanishq-egov Sep 28, 2023
57f121f
HLM-3376: Added changes for referral management
kanishq-egov Sep 25, 2023
2d132e9
HLM-3376: Added Validators, updated Referral.java
kanishq-egov Sep 25, 2023
cad8957
HLM-3069: changed module name to referral management
kanishq-egov Sep 27, 2023
4c4d673
HLM-3376: Added changes for referral management
kanishq-egov Sep 25, 2023
e9cbdb7
HLM-3376: changed module to referral management
kanishq-egov Sep 27, 2023
bbed040
HLM-3376: import fix
kanishq-egov Sep 29, 2023
082ae4a
HLM-3376: refactor code
kanishq-egov Sep 29, 2023
2413625
HLM-3376: updated contract file
kanishq-egov Sep 29, 2023
543a8c9
HLM-3069: update referral-management.yml
kanishq-egov Sep 29, 2023
6b81aed
HLM-3069: update referral-management.yml
kanishq-egov Sep 29, 2023
7a09386
HLM-3376, 3069: side_effect change to side-effect, removed '/referral…
kanishq-egov Oct 4, 2023
401e009
HLM-3376: deleted test file for referral
kanishq-egov Oct 4, 2023
24d1243
stock exchange between parties enabled
kavi-egov Oct 5, 2023
6952272
stock exchange between parties enabled
kavi-egov Oct 5, 2023
1efcba9
stock user service fix
kavi-egov Oct 5, 2023
d29b8ac
stock migration
kavi-egov Oct 5, 2023
e818dc4
HLM-3376,HLM-3069: updated the api spec contract for referralmanagement
kanishq-egov Oct 5, 2023
c472740
Merge branch 'hlm-3069-adverse-events-services' into hlm-3376-referra…
kanishq-egov Oct 5, 2023
6271f6a
Merge pull request #500 from egovernments/hlm-3376-referral-managemen…
kanishq-egov Oct 5, 2023
7f81006
Merge branch 'stock-transfer-parties-HLM-3372' into hlm-3069-adverse-…
kavi-egov Oct 5, 2023
286e02b
Merge pull request #508 from egovernments/hlm-3069-adverse-events-ser…
kavi-egov Oct 5, 2023
3e87903
Merge branch 'dev' into hlm-3092-proximity-based-search
kanishq-egov Oct 6, 2023
710b275
HLM-3092 : changes as per code review comments
kanishq-egov Oct 9, 2023
3567fde
HLM-3092: added collectionutils isempty check
kanishq-egov Oct 9, 2023
d24231c
HLM-3092: updated HouseholdRepository.java and IndividualRepository.j…
kanishq-egov Oct 9, 2023
cbb45b6
Merge branch 'stock-transfer-parties-HLM-3372' into stock-tansfer-par…
kavi-egov Oct 9, 2023
ea799e6
Merge pull request #510 from egovernments/stock-tansfer-parties-update
kavi-egov Oct 10, 2023
81e2fe7
staff id fix
kavi-egov Oct 12, 2023
7ac7912
Merge pull request #513 from egovernments/staff-id-fix
kavi-egov Oct 12, 2023
ff75376
project ampping error
kavi-egov Oct 12, 2023
c931776
HLM-3073: changes extracted from hlm-3073 feature branch, to be merge…
kanishq-egov Oct 12, 2023
a1b3e6e
HLM-3073: removed non required classes
kanishq-egov Oct 12, 2023
902e40a
facility validator skip for staff only exchange
kavi-egov Oct 12, 2023
96047ee
HLM-3073: renamed validator, validating only when project task resour…
kanishq-egov Oct 13, 2023
6a7bd41
HLM-3073: task model update, removed not null from resources
kanishq-egov Oct 13, 2023
b85611e
HLM-3069: updated side_effect table
kanishq-egov Oct 13, 2023
41b3572
HLM-3069: removed not null for projectbeneficiary client reference id
kanishq-egov Oct 13, 2023
c3b617f
Merge pull request #516 from egovernments/hlm-3069-side-effect-table-…
kavi-egov Oct 13, 2023
3d3dba2
HLM-3073: updated the pom.xml for project
kanishq-egov Oct 13, 2023
a0e237d
HLM-3073: updated code comments
kanishq-egov Oct 13, 2023
3253fad
Merge pull request #515 from egovernments/hlm-3073-reviewcomments
kavi-egov Oct 13, 2023
b080b1b
HLM-3073: added resources null check for PtProductVariantIdValidator.…
kanishq-egov Oct 13, 2023
259bb7d
HLM-3073: null check for task resource
kanishq-egov Oct 13, 2023
f305b21
HLM-3073: code formatting
kanishq-egov Oct 13, 2023
131cd75
Merge pull request #517 from egovernments/hlm-3073-reviewcomments
kanishq-egov Oct 13, 2023
fc6ddc5
hlm-3073: side effect table fix
kanishq-egov Oct 13, 2023
58a866d
Merge pull request #518 from egovernments/hlm-3073-side-effect-ddl
kanishq-egov Oct 13, 2023
dffb40b
HLM-3069: side effect code comments, code refactor
kanishq-egov Oct 15, 2023
c715159
Merge pull request #520 from egovernments/hlm-3069-reviewcomments
kavi-egov Oct 15, 2023
83a51d5
updated health models version
kanishq-egov Oct 15, 2023
c7f68e4
Merge pull request #521 from egovernments/hlm-3069-reviewcomments
kanishq-egov Oct 15, 2023
9d058b2
Merge pull request #522 from egovernments/stock-transfer-parties-HLM-…
kavi-egov Oct 16, 2023
1430239
Merge pull request #523 from egovernments/dev
kavi-egov Oct 16, 2023
794109b
HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and projec…
kanishq-egov Oct 17, 2023
4b09e7a
referralmanagement version 1.0.0-beta, added changelog, localsetup
kanishq-egov Oct 17, 2023
847fe12
Update CHANGELOG.md
kavi-egov Oct 18, 2023
736e951
Update CHANGELOG.md
kavi-egov Oct 18, 2023
fdd6c67
Update CHANGELOG.md
kavi-egov Oct 18, 2023
e49ec54
Update CHANGELOG.md
kavi-egov Oct 18, 2023
351fdf3
Merge pull request #527 from egovernments/project-stock-version-chang…
kavi-egov Oct 18, 2023
649e0ab
Merge branch 'dev' into hlm-3092-proximity-based-search
kavi-egov Oct 18, 2023
2972691
Merge pull request #467 from egovernments/hlm-3092-proximity-based-se…
kavi-egov Oct 18, 2023
336dce5
household version increased from 1.1.0 to 1.1.1-beta and individual v…
kanishq-egov Oct 18, 2023
069d842
updated health-campaign-models dependency in individual, household
kanishq-egov Oct 18, 2023
eeca8a8
Merge pull request #529 from egovernments/version-change-individual-h…
kavi-egov Oct 18, 2023
d0943ed
Merge pull request #528 from egovernments/dev
kavi-egov Oct 19, 2023
8f587ab
HLM-3069: null project beneficiary validation error fix
kanishq-egov Oct 25, 2023
8c56d30
HLM-3069: added comments and splitted validation condition
kanishq-egov Oct 25, 2023
9eb7d53
Merge pull request #535 from egovernments/hlm-3069-pbeneficiary-patch
kavi-egov Oct 26, 2023
0ea563b
Dev to master (#550)
kanishq-egov Nov 2, 2023
ffc4130
Dev to master with project beneficiary tag and downsync (#560)
kanishq-egov Nov 9, 2023
1ed1d89
Dev (#564)
kavi-egov Nov 9, 2023
f665729
Dev (#567)
kavi-egov Nov 9, 2023
2576451
Dev to master for voucher tag, downsync (#572)
kanishq-egov Nov 14, 2023
b78923b
Dev to master : beneficiary tag bug fix, downsync pagination fix (#576)
kanishq-egov Nov 15, 2023
e08bcef
updated the stock version in pom.xml (#580)
kanishq-egov Nov 21, 2023
c8b28ff
added er diagram for household, referral, individual, stock registry …
kanishq-egov Nov 22, 2023
8b47c41
removed migration service (#585)
kavi-egov Nov 26, 2023
5f091cc
Added health-project, health-individual, health-pgr-services
kanishq-egov Dec 12, 2023
274d829
Merge pull request #589 from egovernments/health-namespace-unified-en…
kanishq-egov Dec 12, 2023
5ed17e9
adding attendance build config
vishal-egov Dec 12, 2023
ab931d8
adding attendance module
vishal-egov Dec 12, 2023
c49488f
Merge pull request #590 from egovernments/attendance-build-config
vishal-egov Dec 13, 2023
9342718
HLM-4496: added build config for health attendance service (#592)
kanishq-egov Dec 18, 2023
d73e094
HLM-4894 moving hrms code from DIGIT-Dev branc health-moz-dev
Priyanka-eGov Feb 7, 2024
0d83b46
HLM-4894 moving hrms code from DIGIT-Dev branc health-moz-dev
Priyanka-eGov Feb 7, 2024
81f720e
Merge pull request #629 from egovernments/health-hrms-buildconfig
kanishq-egov Feb 7, 2024
c62f733
Update build-config.yml : Added health-hrms entry
Priyanka-eGov Feb 8, 2024
05c8d42
Merge pull request #631 from egovernments/Priyanka-eGov-patch-1
kanishq-egov Feb 8, 2024
48a843e
Household transformer index for geoPoint
amitverma-egov Feb 15, 2024
e9c1ffe
household topic name updated
amitverma-egov Feb 15, 2024
3f93a5d
added household urls
amitverma-egov Feb 16, 2024
fedf35c
code refactoring and cleanup
amitverma-egov Feb 16, 2024
c266c49
add geoPoint field to task
amitverma-egov Feb 16, 2024
f59eb74
Merge pull request #643 from amitverma-egov/household-transformer-amp…
kanishq-egov Feb 19, 2024
eac4d30
Revert "Household transformer amp demo"
kanishq-egov Feb 19, 2024
1c034e3
Merge pull request #645 from egovernments/revert-643-household-transf…
kanishq-egov Feb 21, 2024
69baa20
dev to master - 28-02-24 (#654)
kanishq-egov Feb 28, 2024
ac8c591
Dev to master - March 04, 2024 (#664)
kanishq-egov Mar 4, 2024
c3f0d88
Update build-config.yml (#665)
kanishq-egov Mar 4, 2024
0b1ea32
HLM-5143 adding plan-service to build config (#672)
Priyanka-eGov Mar 8, 2024
53f866d
HLM-5143 adding different Dockerfile for Java 17
Priyanka-eGov Mar 13, 2024
15c87e8
HLM-5143 removing start.sh
Priyanka-eGov Mar 13, 2024
4950875
Merge pull request #676 from egovernments/HLM-5143-dockerfile
shashwat-egov Mar 13, 2024
31e7188
Update CODEOWNERS
kavi-egov Apr 8, 2024
bf76359
Merge pull request #701 from egovernments/kavi-egov-patch-1
aaradhya-egov Apr 8, 2024
b79a788
Update CODEOWNERS
kavi-egov Apr 8, 2024
cfc4bd0
Merge pull request #703 from egovernments/kavi-egov-patch-2
aaradhya-egov Apr 8, 2024
2170eb7
HLM-5361: updated build-config.yml (#708)
kanishq-egov Apr 15, 2024
b9385cf
Adding auth proxy build config to master (#710)
shashwat-egov Apr 16, 2024
e8788ce
HLM-5542: added household for both java 8 and java 17 (#725)
kanishq-egov May 3, 2024
6cc6491
HLM-5700 adding changes for resource-estimation-service in build conf…
Priyanka-eGov May 10, 2024
44c3260
Create .coderabbit.yaml
kavi-egov May 15, 2024
d521e07
Merge pull request #739 from egovernments/kavi-egov-patch-5
sathishp-eGov May 15, 2024
5010573
HLM-5539: updated build config (#745)
kanishq-egov May 23, 2024
364329f
Dev --> Master for HCM v1.4 (#751)
kanishq-egov May 29, 2024
8822717
Campaign merged (#738)
jagankumar-egov May 29, 2024
b98dd54
Delete .vscode directory (#754)
jagankumar-egov May 29, 2024
41a7328
Delete edcr/service/egov/egov-edcr-extract/src/test/resources directo…
jagankumar-egov May 30, 2024
b7a63ee
Health Campaign Service - Build Config update for master build using …
kanishq-egov May 30, 2024
e8d6558
HLM Individual search failed on userid based search fixed (#758)
kanishq-egov May 30, 2024
3c88770
Fixes of admin console v0.1 (#759)
jagankumar-egov May 30, 2024
a4c94e3
Admin console, user password logic updated (#760)
jagankumar-egov May 31, 2024
564c7d8
HLM Health-HRMS bug fix, user was set to null in hrms update as the t…
kanishq-egov Jun 4, 2024
3d000ed
HLM-6185: Added null check for the project task resources list (#767)
kanishq-egov Jun 14, 2024
3e8a3ec
microplan-ui (#782)
siddhant-nawale-egov Jun 20, 2024
6caaf27
Admin console Improved performance, sheets freezed, implemented cachi…
jagankumar-egov Jun 20, 2024
00a7acc
Master flyway imageupdate (#794)
kanishq-egov Jun 20, 2024
5389381
Adding plan-service folder for master merge (#783)
Priyanka-eGov Jun 24, 2024
1dca6ee
Microplan UI (#793)
siddhant-nawale-egov Jun 24, 2024
c720e8d
Adding resource-estimation-service folder for master merge (#784)
Priyanka-eGov Jun 27, 2024
9374c37
commit changelog,localsetup,readme (#797)
devdatta-egov Jun 27, 2024
90dd4d2
Resource service read me from master (#801)
devdatta-egov Jun 27, 2024
8b6bfaa
fixed target upload flow in french locale as it was causing error wi…
nitish-egov Jul 2, 2024
0d98691
Resource estimation service - regex fix (#803)
Priyanka-eGov Jul 3, 2024
eda2028
updated generate different tab logic if there is no different tab the…
nitish-egov Jul 3, 2024
0a99f06
Master flyway imageupdate - after impel pull (#808)
kanishq-egov Jul 8, 2024
8208b6f
hcm v1.5 : dev to master (#855)
kanishq-egov Aug 12, 2024
1ea8b5b
v0.2 admin console merge to master (#849)
nitish-egov Aug 12, 2024
1b1a1d8
mdms config to be taken from devops (#853)
nitish-egov Aug 13, 2024
e3d5238
HLM service request, updated DataTypeEnum (#872)
kanishq-egov Aug 29, 2024
a0e7142
Service request changelog 1.5 (#875)
kanishq-egov Aug 30, 2024
df5b6c9
HCMPRE-424: fixed hrms call from pgr-service
kanishq-egov Sep 9, 2024
1aedebd
HCMPRE-424: updated as per code review comments
kanishq-egov Sep 9, 2024
0fb2c71
Merge pull request #883 from egovernments/hcmpre-424-hrms-fix
sathishp-eGov Sep 9, 2024
1222369
Create branch-name-validator (#960)
kavi-egov Oct 11, 2024
08df5e7
Update branch-name-validator
kavi-egov Oct 11, 2024
11a5800
Rename branch-name-validator to branch-name-validator.yml
kavi-egov Oct 11, 2024
e68c5fb
Merge pull request #965 from egovernments/HCMPRE-0071-feature-name-ms…
sathishp-eGov Oct 11, 2024
1ad04ee
Added census-service in build-config (#990)
tanishi-egov Oct 17, 2024
d4fd0c9
[HCMPRE-658] Refractor resource-estimation-service to resource-genera…
palak-egov Oct 24, 2024
c9f5d73
HCM Admin Console v0.3 Release code changes (#1082)
jagankumar-egov Dec 9, 2024
fd9a00f
HCMPRE-1635 Microplanning v0.1 master merge (#1271)
Priyanka-eGov Dec 12, 2024
8072220
Admin Console & microplanning Patch fixes on project factory (#1276)
jagankumar-egov Dec 12, 2024
3f860f8
Dev (#1235)
naveen-egov Dec 13, 2024
717aeac
Moving PlanValidator and PlanEnricher to respective folders. (#1280)
Priyanka-eGov Dec 13, 2024
9dbb1d7
fixed import issues (#1281)
shashwat-egov Dec 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 15 additions & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
language: "en-US"
early_access: false
reviews:
profile: "assertive"
request_changes_workflow: true
high_level_summary: true
poem: true
review_status: true
collapse_walkthrough: false
auto_review:
enabled: true
drafts: false
chat:
auto_reply: true
36 changes: 36 additions & 0 deletions .github/workflows/branch-name-validator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Enforce Branch Naming Convention

on:
push:
branches:
- "*"
pull_request:
branches:
- "*"

jobs:
branch-name-check:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Enforce branch naming convention
run: |
# Get the branch name
branch_name=$(echo "${GITHUB_REF#refs/heads/}")

# Define the branch name pattern
branch_regex="^(master|develop|(HCMPRE|HCMPOST|HCMSUB)-[0-9]{3,}-[a-zA-Z0-9-]+)$"

# Check if the branch name matches the pattern
if [[ ! "$branch_name" =~ $branch_regex ]]; then
echo "Branch name '$branch_name' does not follow the required naming convention."
echo "Branch names must follow the pattern: (HCMPRE|HCMPOST|HCMSUB)-123-description"
exit 1
fi

- name: Success message
run: |
branch_name=$(echo "${GITHUB_REF#refs/heads/}")
echo "Branch name '$branch_name' follows the required naming convention: 'master', 'develop', or (HCMPRE|HCMPOST|HCMSUB)-123-description"
61 changes: 61 additions & 0 deletions .github/workflows/codacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# This workflow checks out code, performs a Codacy security scan
# and integrates the results with the
# GitHub Advanced Security code scanning feature. For more information on
# the Codacy security scan action usage and parameters, see
# https://github.com/codacy/codacy-analysis-cli-action.
# For more information on Codacy Analysis CLI in general, see
# https://github.com/codacy/codacy-analysis-cli.

name: Codacy Security Scan

on:
push:
branches: [ "master", "master|hlm-[0-9]+.*", "dev" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master", "dev" ]
schedule:
- cron: '30 13 * * 1'

permissions:
contents: read

jobs:
codacy-security-scan:
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
name: Codacy Security Scan
runs-on: ubuntu-latest
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v3

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
verbose: true
output: results.sarif
format: sarif
# Adjust severity of non-security issues
gh-code-scanning-compat: true
# Force 0 exit code to allow SARIF file generation
# This will handover control about PR rejection to the GitHub side
max-allowed-issues: 2147483647

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: results.sarif
72 changes: 72 additions & 0 deletions .github/workflows/publishProjectFactory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Project Factory Service Test Builder

on:
push:
branches:
- "console"
- "master"
paths:
- 'health-services/project-factory/**'
pull_request:
branches:
- "console"
- "master"

jobs:
build:
runs-on: ubuntu-latest

steps:
# Step 1: Checkout the repository
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Fetch all history for tags and branches

# Step 2: Set up environment variables
- name: Set up environment variables
id: env
run: |
echo "ACTION_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV

# Step 3: Build the service Docker image
- name: Build the service Docker image
id: docker_build
working-directory: ./health-services/project-factory
run: |
IMAGE_TAG=egovio/project-factory:${{ env.ACTION_NUMBER }}
docker build . \
--file Dockerfile \
--tag $IMAGE_TAG
echo "::set-output name=image_name::$IMAGE_TAG"
echo "Service Docker image built successfully"

# Step 4: Build the database migration Docker image
- name: Build the DB migration Docker image
id: docker_db_build
working-directory: ./health-services/project-factory/migration
run: |
IMAGE_TAG=egovio/project-factory-db:${{ env.ACTION_NUMBER }}
docker build . \
--file Dockerfile \
--tag $IMAGE_TAG
echo "::set-output name=db_image_name::$IMAGE_TAG"
echo "DB migration Docker image built successfully"

node_build:
runs-on: ubuntu-latest

steps:
# Step 1: Checkout the repository
- uses: actions/checkout@v3

# Step 2: Set up Node.js environment
- uses: actions/setup-node@v2
with:
node-version: 20

# Step 3: Install dependencies and build for production
- name: Install dependencies and build
working-directory: ./health-services/project-factory
run: |
yarn install
yarn build
85 changes: 84 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,88 @@
.DS_Store
frontend/micro-ui-internals/node_modules/*
.idea
index.lock
/health-services/stock/stock.iml
# Ignore target directories
**/target/

# Ignore IDE-specific files
*.iml
*.classpath
*.project
*.settings/

# Ignore gitignore files
**/.gitignore

# Ignore compiled binaries and libraries
*.jar
*.war
*.ear
bin/

# Ignore system-specific files
.DS_Store
Thumbs.db
# Ignore target directories
**/target/

# Ignore IDE-specific files
*.iml
*.classpath
*.project
*.settings/

# Ignore gitignore files
**/.gitignore

# Ignore compiled binaries and libraries
*.jar
*.war
*.ear

# Ignore system-specific files
.DS_Store
Thumbs.db
# Ignore target directories
**/target/

# Ignore IDE-specific files
*.iml
*.classpath
*.project
*.settings/

# Ignore gitignore files
**/.gitignore

# Ignore compiled binaries and libraries
*.jar
*.war
*.ear

# Ignore system-specific files
.DS_Store
Thumbs.db
# Ignore target directories
**/target/

# Ignore IDE-specific files
*.iml
*.classpath
*.project
*.settings/

# Ignore gitignore files
**/.gitignore

# Ignore compiled binaries and libraries
*.jar
*.war
*.ear

# Ignore system-specific files
.DS_Store
Thumbs.db

utilities/project-factory/node_modules/*
frontend/micro-ui/web/micro-ui-internals/node_modules/*
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"type": "node",
"request": "attach",
"name": "Attach to Remote",
"address": "localhost",
"port": 9229,
"localRoot": "${workspaceFolder}",
"remoteRoot": "/app"
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.inlineSuggest.showToolbar": "onHover"
}
4 changes: 2 additions & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* @kavi-egov @sathishp-eGov



health-services/project-factory/ @jagankumar-egov
34 changes: 34 additions & 0 deletions build/17/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

FROM egovio/amazoncorretto:17-alpine3.19 AS build
# FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build
#FROM ghcr.io/egovernments/alpine-maven-builder-jdk-8:1-master-na-6036091e AS build
ARG WORK_DIR
WORKDIR /app

# Install Maven
RUN apk add --no-cache maven

# copy the project files
COPY ${WORK_DIR}/pom.xml ./pom.xml
COPY build/maven/start.sh ./start.sh

# not useful for stateless builds
# RUN mvn -B dependency:go-offline

COPY ${WORK_DIR}/src ./src
RUN mvn -B -f /app/pom.xml package


# Create runtime image
#FROM egovio/8-openjdk-alpine
#FROM ghcr.io/egovernments/8-openjdk-alpine:latest
FROM egovio/amazoncorretto:17-alpine3.19


WORKDIR /opt/egov

COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/

RUN chmod +x /opt/egov/start.sh

CMD ["/opt/egov/start.sh"]
Loading
Loading