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

Mater and develop merge #86

Closed
wants to merge 153 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
96347c2
HWC POM cleanup and password encryption using crypto package (#1)
harimohanr May 30, 2023
eca8294
Swymed decoupling from HWC-API (#2)
swetatech24 May 31, 2023
596a570
Github actions workflow change (#3)
harimohanr May 31, 2023
39f7ed7
Create README.md
harimohanr May 31, 2023
fcaa0ad
Update README.md
harimohanr May 31, 2023
825b55a
Crypto utility modified to have padding for 16 byte block size (#4)
harimohanr Jun 2, 2023
3217f8d
Create CODE_OF_CONDUCT.md
harimohanr Jun 6, 2023
4b1a1aa
Create License File
harimohanr Jun 6, 2023
e55571f
Create CONTRIBUTING.md
harimohanr Jun 6, 2023
e580d08
modified .gitignore file (#5)
Vidyaaa24 Jun 9, 2023
5a0ee42
Sonarqube reported code smell fixes (#8)
harimohanr Jun 14, 2023
7c1ba9e
Added copyright information text (#9)
Anjana2310 Jun 14, 2023
f5af69f
Removed encryption logic,modified properties file,swagger changes
Anjana2310 Jun 15, 2023
a18b10c
Comments addressed
Anjana2310 Jun 15, 2023
1cec87f
Merge pull request #10 from PSMRI/pswd_enc_changes
devikasuresh20 Jun 15, 2023
2842859
password encryption changes modified
Jun 16, 2023
c30efd7
Merge pull request #11 from PSMRI/pwdencryption_test
devikasuresh20 Jun 19, 2023
40e6033
doc save, doc update, fetch case record, casesheet changes for ncd care
Jun 21, 2023
1612024
Create prod workflow (#13)
Vidyaaa24 Jun 21, 2023
9c7f782
Merge pull request #14 from PSMRI/sprint3
ravishanigarapu Jun 21, 2023
05c06c9
Update CODE_OF_CONDUCT.md
harimohanr Jun 22, 2023
315d1e9
Workflow (#15)
Anjana2310 Jun 23, 2023
b64f25c
code smell changes (#16)
swetatech24 Jun 26, 2023
4d214dc
API cleanup (#17)
Anjana2310 Jun 26, 2023
c1184b8
Remove .springBeans from version control (#18)
Anjana2310 Jun 28, 2023
2fdfb01
API cleanup (#19)
Anjana2310 Jun 28, 2023
4ac7992
Passing Environment Variable (#20)
swetatech24 Jun 28, 2023
6e08abd
Worklow change (#21)
Vidyaaa24 Jun 30, 2023
8c26de1
Code optimize (#23)
ravishanigarapu Jul 3, 2023
9a4114e
API cleanup (#25)
Anjana2310 Jul 3, 2023
0857a99
API cleanup (#26)
Anjana2310 Jul 5, 2023
af410ac
API Cleanup (#28)
swetatech24 Jul 6, 2023
93630a2
API Cleanup (#29)
swetatech24 Jul 6, 2023
32b9395
API Cleanup (#31)
swetatech24 Jul 7, 2023
1b2be33
API cleanup
Anjana2310 Jul 7, 2023
65c4375
API cleanup (#32)
Anjana2310 Jul 7, 2023
2029a5f
API clean up
Anjana2310 Jul 10, 2023
f10bdd6
Merge branch 'develop' of https://github.com/Anjana2310/HWC-API into …
Anjana2310 Jul 10, 2023
411343f
API cleanup (#33)
Anjana2310 Jul 11, 2023
d4a35bd
multivisit singleday issue file changes
Jul 11, 2023
b28769c
Merge pull request #34 from sugyanisahu/develop
devikasuresh20 Jul 12, 2023
8e59e85
changing the file path for Server forgery issue (#35)
samirparhi-dev Jul 20, 2023
8b71c28
Update sast-and-package-prod.yml (#40)
Vidyaaa24 Aug 1, 2023
08c5875
Revert to ssrf issue (#41)
samirparhi-dev Aug 1, 2023
603ca06
Updated code for SQL Injection attack
samirparhi-dev Aug 1, 2023
d801771
1.Initial hapi server setup and config.
shreypatidar-beehyv Aug 1, 2023
7f3d97e
Merge pull request #2 from beehyv/fhir_facade_BenRegistration
roopesh-beehyv Aug 1, 2023
f93a2a7
Merge pull request #42 from samirparhi-dev/develop
devikasuresh20 Aug 2, 2023
3d17722
1. BeneficiaryDTO LastName corrected to lastName.
shreypatidar-beehyv Aug 2, 2023
0495ef1
Merge branch 'PSMRI:develop' into develop
roopesh-beehyv Aug 3, 2023
8480ac3
Changed urls for Patient resource extension as required for Android app
shreypatidar-beehyv Aug 3, 2023
313d8d3
Code Refactoring for Beneficiary DTOs.
shreypatidar-beehyv Aug 7, 2023
a7bd8e8
Updated the language option for codeql setup and added maven test
sunil-beehyv Aug 7, 2023
82c7af1
Added CodeQl tool to do static code analysis on pull request
sunil-beehyv Aug 7, 2023
1ce28ca
Fetch states, districts, Taluks, Villages 4 apis (WO Auth)
babs93 Aug 8, 2023
3685d9e
Merge pull request #4 from beehyv/pipeline
roopesh-beehyv Aug 8, 2023
f4e6e09
Shifted business logic from provider to service class for Patient.
shreypatidar-beehyv Aug 8, 2023
f4ce51d
Merge pull request #6 from beehyv/benVisit_Encounter
roopesh-beehyv Aug 9, 2023
e16e976
Merge pull request #5 from beehyv/develop_clean_babs
roopesh-beehyv Aug 9, 2023
083bd0b
1. Created DTOs for visitDetails, chief complaints, adherence , vital…
shreypatidar-beehyv Aug 8, 2023
95b51ee
Merge pull request #7 from beehyv/benVisit_Encounter
roopesh-beehyv Aug 9, 2023
f183b0a
Created separate validator class for Encounter and Patient resource.
shreypatidar-beehyv Aug 9, 2023
a94d841
1. Added Model Condition resource along with extensions.
shreypatidar-beehyv Aug 9, 2023
9a8a74f
Implementing Basic reverse sync operation
babs93 Aug 11, 2023
27676d9
Merge branch 'PSMRI:develop' into develop
Anjana2310 Aug 11, 2023
bf66379
Fetosense integration (#45)
swetatech24 Aug 16, 2023
5d17d49
Merge pull request #9 from beehyv/benVisit_Encounter
roopesh-beehyv Aug 16, 2023
0f9fb8e
Fix feedbacks from PR review
babs93 Aug 16, 2023
db48522
1. Added Model Observation resource along with extensions.
shreypatidar-beehyv Aug 16, 2023
57804f8
Merge pull request #11 from beehyv/benVisit_Encounter
roopesh-beehyv Aug 17, 2023
1b3d374
Implement Reverse sync visit details of the patient
babs93 Aug 18, 2023
3426754
1. Added Model Immunization resource along with extensions.
shreypatidar-beehyv Aug 18, 2023
616d27b
Corrected URL to save covid vaccine details .
shreypatidar-beehyv Aug 18, 2023
5bf6607
Merge pull request #13 from beehyv/covidVS_Immunization_Sync
roopesh-beehyv Aug 18, 2023
b656e50
Merge pull request #10 from beehyv/develop_babs_sync
roopesh-beehyv Aug 18, 2023
59765f7
Update Implement Reverse sync visit details of the patient
babs93 Aug 18, 2023
b918fe1
Remove duplicate EncounterExt
babs93 Aug 21, 2023
b1da04c
Fix conflicts
babs93 Aug 21, 2023
28014fd
Merge pull request #12 from beehyv/reverse_sync_visit
roopesh-beehyv Aug 21, 2023
21bf17d
Merge branch 'PSMRI:develop' into develop
roopesh-beehyv Aug 22, 2023
c6e1de4
Corrected saveCovidVaccineStatus env in local.properties. Added 2 new…
shreypatidar-beehyv Aug 24, 2023
13eac91
Merge pull request #16 from beehyv/urlAdditionForPR
roopesh-beehyv Aug 24, 2023
a8271bc
fixing XSS issue.
samirparhi-dev Aug 25, 2023
cb700b3
yml file changes reverted.
shreypatidar-beehyv Aug 25, 2023
411ca9b
Merge pull request #17 from beehyv/yml-changes-revert
roopesh-beehyv Aug 25, 2023
0cabd20
Merge pull request #47 from samirparhi-dev/develop
devikasuresh20 Aug 25, 2023
0ed6d04
Merge branch 'PSMRI:develop' into develop
roopesh-beehyv Aug 25, 2023
2e701fe
Merge pull request #48 from beehyv/develop
devikasuresh20 Aug 30, 2023
74203ef
Merge branch 'PSMRI:develop' into develop
Anjana2310 Sep 1, 2023
dabc3e3
Renaming controller classes
Anjana2310 Sep 1, 2023
e1d509a
Renaming controller class (#51)
Anjana2310 Sep 1, 2023
c107f08
LGD code changes
parvesh755 Sep 1, 2023
ab8ccd3
Merge branch 'PSMRI:develop' into develop
parvesh755 Sep 1, 2023
4e105cf
LGD code changes
parvesh755 Sep 1, 2023
508d9dc
Merge branch 'develop' of https://github.com/parvesh755/HWC-API into …
parvesh755 Sep 1, 2023
3c7ee28
Delete src/main/resources/application.properties
ravishanigarapu Sep 1, 2023
bc264f7
Merge pull request #52 from parvesh755/develop
ravishanigarapu Sep 1, 2023
5e10176
props changes
ravishanigarapu Sep 4, 2023
bb6145b
props changes (#53)
ravishanigarapu Sep 4, 2023
6e10636
HWC GetbenImage API and deployment issue
ravishanigarapu Sep 4, 2023
d9d2aec
Merge pull request #54 from ravishanigarapu/develop
devikasuresh20 Sep 5, 2023
3261fe9
HWC- new serviceline changes
Sep 5, 2023
1a588ee
Merge pull request #55 from helenKaryamsetty/develop
devikasuresh20 Sep 5, 2023
a8609ab
location details - variable change
Sep 5, 2023
0b31cf9
Merge branch 'PSMRI:develop' into develop
helenKaryamsetty Sep 5, 2023
feb8fdd
Merge pull request #56 from helenKaryamsetty/develop
devikasuresh20 Sep 5, 2023
41b62aa
Location details- village name,id fetch changes
Sep 6, 2023
d8007ac
Merge pull request #57 from helenKaryamsetty/develop
ravishanigarapu Sep 6, 2023
f98d636
Changed serviceline everywhere from 4 to 9
Sep 7, 2023
753a4b9
reverted back the service ID 9 to 4
Sep 8, 2023
1321344
Merge pull request #59 from helenKaryamsetty/develop
ravishanigarapu Sep 8, 2023
d2ec60a
Merge branch 'PSMRI:develop' into develop
Anjana2310 Sep 11, 2023
d3b17b4
removing unwanted file
Anjana2310 Sep 13, 2023
89581e9
Removing unwanted file (#61)
Anjana2310 Sep 13, 2023
c5411e2
workflow changes (#62)
Vidyaaa24 Sep 13, 2023
9fa025c
workflow changes (#63)
Vidyaaa24 Sep 14, 2023
8f236e5
Revert "workflow changes (#63)" (#65)
Anjana2310 Sep 14, 2023
bf50355
Merge branch 'PSMRI:develop' into develop
Anjana2310 Sep 15, 2023
b486cbb
Delete .github/workflows/sast.yml (#66)
swetatech24 Sep 15, 2023
23617b7
Update README.md
Vidyaaa24 Sep 15, 2023
29d5b69
Create sast.yml
Vidyaaa24 Sep 15, 2023
cbd48c1
Merge branch 'PSMRI:develop' into develop
Anjana2310 Sep 15, 2023
e78c9d9
Modified common_local
Anjana2310 Sep 15, 2023
8fccf8c
Pull Request template
Anjana2310 Sep 22, 2023
b5975a2
Placeholders added in properties file
Anjana2310 Sep 22, 2023
2e5af21
Delete src/main/environment/common_local.properties
Anjana2310 Sep 22, 2023
baa9e5f
Added type of change
Anjana2310 Sep 22, 2023
a6f740f
Merge branch 'develop' of https://github.com/Anjana2310/HWC-API into …
Anjana2310 Sep 22, 2023
d738ab0
Merge pull request #67 from Anjana2310/develop
drtechie Oct 5, 2023
3a6e21d
New Serviceline API modified, UPTSU API changes
Oct 6, 2023
19e9ce3
Create CI properties, add maven resources plugin to replace env value…
drtechie Oct 6, 2023
9006507
New serviceline api modified
Oct 11, 2023
15278c7
Merge branch 'develop' into develop
ravishanigarapu Oct 11, 2023
1269f0a
Merge pull request #70 from indraniBan/develop
ravishanigarapu Oct 11, 2023
c26ff83
location mapping changes
ravishanigarapu Oct 20, 2023
621e1bf
Merge pull request #77 from ravishanigarapu/develop
devikasuresh20 Oct 20, 2023
ba0c43e
empty change (#79)
helenKaryamsetty Nov 20, 2023
7424f27
http insecure changes
Nov 24, 2023
8cc8d79
Multiple Benificiary visit-api modified for all visit category (#78)
indraniBan Nov 27, 2023
01b08e1
Merge branch 'develop' into develop
ravishanigarapu Nov 27, 2023
4280748
Merge pull request #80 from bshivani7/develop
ravishanigarapu Nov 27, 2023
0a86b08
casesheet print data issue fixed
Dec 8, 2023
220c408
Merge pull request #81 from ravishanigarapu/develop
helenKaryamsetty Dec 8, 2023
ca4e24c
new serviceline changes
Dec 11, 2023
eded26b
Merge pull request #82 from ravishanigarapu/develop
helenKaryamsetty Dec 11, 2023
b9b5a3e
empty change (#84)
helenKaryamsetty Jan 2, 2024
ffd1db6
develop to master merge (#85)
helenKaryamsetty Jan 3, 2024
c89bb92
Revert "develop to master merge (#85)" (#88)
ravishanigarapu Feb 9, 2024
aa22386
New Entities and APIs related to CHO mobile application (#83)
shreypatidar-beehyv Feb 9, 2024
1410285
Corrected patientFetosenseId variable name (#90)
devikasuresh20 Mar 7, 2024
904a66d
Van Location Details changes (#91)
devikasuresh20 Mar 19, 2024
277cd56
save doctor data-prescription save modified
May 3, 2024
315118b
Merge pull request #93 from indraniBan/develop
devikasuresh20 May 3, 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
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .factorypath

This file was deleted.

30 changes: 30 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

# Type of change

- [ ] Bug fix
- [ ] New feature
- [ ] Enhancement
- [ ] Refactoring
- [ ] Documentation
- [ ] Other ( please specify )

# How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

- [ ] Test A
- [ ] Test B

# Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] Any dependent changes have been merged and published in downstream modules


46 changes: 0 additions & 46 deletions .github/workflows/Maven Build and CodeQL.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/build-on-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Build On Pull Request
on:
pull_request:
branches: [ "master","develop" ]

jobs:
Build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}

- name: Setup JDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'
- name: Build with Maven
run: mvn clean install
42 changes: 42 additions & 0 deletions .github/workflows/package-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Package-prod

on:
push:
branches: [ "master"]
paths-ignore:
- target/**
- dist/**
pull_request:
branches: [ "master" ]
paths-ignore:
- target/**
- dist/**

env:
ENV_VAR: prod

jobs:
Package-prod:
runs-on: ubuntu-latest
steps:

- name: Checkout code
uses: actions/checkout@v3

- name: Setup JDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'

- name: Build with Maven
run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}

- name: Create WAR file
run: mvn -B package --file pom.xml

- name: Upload WAR file as artifact
uses: actions/upload-artifact@v2
with:
name: HWC-API
path: target/hwc-facility-service.war
42 changes: 42 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Package

on:
push:
branches: [ "develop"]
paths-ignore:
- target/**
- dist/**
pull_request:
branches: [ "develop" ]
paths-ignore:
- target/**
- dist/**

env:
ENV_VAR: test

jobs:
Package-test:
runs-on: ubuntu-latest
steps:

- name: Checkout code
uses: actions/checkout@v2

- name: Setup JDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'

- name: Build with Maven
run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}

- name: Build WAR file
run: mvn -B package --file pom.xml

- name: Upload WAR file as artifact
uses: actions/upload-artifact@v2
with:
name: HWC-API
path: target/hwc-facility-service.war
51 changes: 51 additions & 0 deletions .github/workflows/sast.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: "CodeQL"

on:
push:
branches: [ "develop" ]
paths-ignore:
- target/**

pull_request:
branches: [ "develop" ]
paths-ignore:
- target/**

jobs:
analyze:
name: Analyze
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'java' ]

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Setup JDK 8
uses: actions/setup-java@v2
with:
java-version: 8
distribution: 'adopt'

- name: Build with Maven
run: mvn clean install

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
/tmp
/out-tsc
/target
/logs

.factorypath

# dependencies
/node_modules

# IDEs and editors
/.idea
.springBeans
.project
.classpath
.c9/
Expand Down Expand Up @@ -42,3 +46,10 @@ testem.log
# System Files
.DS_Store
Thumbs.db

# Additional files to ignore
mvnw.cmd
.sts4-cache
mvnw

src/main/environment/common_local.properties
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.8
1 change: 0 additions & 1 deletion .sts4-cache/classpath-data.json

This file was deleted.

Loading
Loading