Skip to content

Commit

Permalink
Merge of develop to master (#28)
Browse files Browse the repository at this point in the history
* removed the target directory and added gitignore

* Added  README.md file (#3)

* Create README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Crypto logic added and pom clean up (#4)

* Crypto logic added and pom clean up

1. Added the new crypto logic for database credentials
2. Cleaned up the POM file

* Github action workflow changes

* Update README.md

* updated copying, contributing, code_of_conduct and readme file (#5)

* Create COPYING

* Create CODE_OF_CONDUCT.md

* Create CONTRIBUTING.md

* Update README.md

* modified .gitignore file (#6)

* Update gitignore (#7)

* modified .gitignore file

* modified .gitignore file

* Delete Maven Build and CodeQL Analysis.yml

* Done vulnerability fix and added sonar properties in pom.xml (#8)

* Added copyright text

* Swagger changes (#11)

* Create sast-and-package-prod.yml (#12)

* Password encryption removal (#13)

* Password encryption changes

* Password encryption changes

* Password encryption removal

* Passing Environment Variable (#14)

* Workflow change (#15)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* code smell fixes

* API Cleanup (#17)

* API Cleanup

* API Cleanup

* API Cleanup

* API Cleanup

* API Cleanup

* Update sast-and-package-prod.yml (#18)

* verifyBio and generateMobileOTP api creation

* added 2 properties

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Failure to use HTTPS or SFTP URL in Maven artifact upload/download (#20)

* Update pom.xml

* Update .gitignore

* Delete bin directory

* Added Pull Request template,modified application.properties

* api creation for confirm aadhaar bio

* resolved conflicts

* Update application.properties

* resolved conflicts

* resolved conflicts

* Add CI build process

* Edit readme

* Fix readme heading

* Add local properties file to gitignore

* Source properties file path fix

* http changes

* Delete .factorypath

* removed config file

---------

Co-authored-by: Harimohan Rajamohanan <[email protected]>
Co-authored-by: Harimohan Rajamohanan <[email protected]>
Co-authored-by: SACHIT SINHA <[email protected]>
Co-authored-by: Sweta Prakash <[email protected]>
Co-authored-by: Vidyadevi Salunkhe <[email protected]>
Co-authored-by: Anjana <[email protected]>
Co-authored-by: Anjana2310 <[email protected]>
Co-authored-by: Sachit Sinha <[email protected]>
Co-authored-by: mukul <[email protected]>
Co-authored-by: ravishanigarapu <[email protected]>
Co-authored-by: swetatech24 <[email protected]>
Co-authored-by: Mithun James <[email protected]>
Co-authored-by: Burdhi. Shivani <[email protected]>
Co-authored-by: Karyamsetty Helen Grace <[email protected]>
  • Loading branch information
15 people authored Dec 14, 2023
1 parent 5bc8aac commit dfb35e9
Show file tree
Hide file tree
Showing 527 changed files with 8,588 additions and 5,238 deletions.
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


41 changes: 41 additions & 0 deletions .github/workflows/package-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Package-prod

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

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

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: FHIR-API
path: target/fhirapi-v1.0.war
41 changes: 41 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Package

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

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

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: FHIR-API
path: target/fhirapi-v1.0.war
52 changes: 0 additions & 52 deletions .github/workflows/sast-and-package.yml

This file was deleted.

52 changes: 52 additions & 0 deletions .github/workflows/sast.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
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 code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@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=test

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,7 @@ Thumbs.db
.project
.springBeans
mvnw
mvnw.cmd
mvnw.cmd
/bin
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
17 changes: 10 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,20 @@ This microservice is built on Java, Spring boot framework and MySQL DB.
### Prerequisites
* JDK 1.8
* Maven

$ ./mvn clean install

## Installation
This service has been tested on Wildfly as the application server.

### Prerequisites
* Wildfly (or any compatible app server)
* Redis
* MySQL Database

## Installation and local env setup

1. Clone the repository to your local machine.
2. Install the required dependencies and build the module using the following command:
- Execute the following command:
```
mvn clean install
```
3. You can copy `common_example.properties` to `common_local.properties` and edit the file accordingly. The file is under `src/main/environment` folder.
4. Run the spring server with local configuration `mvn spring-boot:run -DENV_VAR=local`

## Usage
All features have been exposed as REST endpoints. Refer to the SWAGGER API specification for details.
Loading

0 comments on commit dfb35e9

Please sign in to comment.