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

Upstream Repo sync #51

Merged
merged 42 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1b2be33
API cleanup
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
27676d9
Merge branch 'PSMRI:develop' into develop
Anjana2310 Aug 11, 2023
74203ef
Merge branch 'PSMRI:develop' into develop
Anjana2310 Sep 1, 2023
dabc3e3
Renaming controller classes
Anjana2310 Sep 1, 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
a89b754
Merge remote-tracking branch 'upstream/develop' into upstream_sync
shreypatidar-beehyv Dec 11, 2023
3efd333
Added Identity-API url to get count of beneficiaries in all the prope…
shreypatidar-beehyv Dec 11, 2023
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
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


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
63 changes: 0 additions & 63 deletions .github/workflows/sast-and-package-prod.yml

This file was deleted.

55 changes: 0 additions & 55 deletions .github/workflows/sast-and-package.yml

This file was deleted.

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}}"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ Thumbs.db
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
Binary file not shown.
57 changes: 48 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,58 @@ Health and Wellness centre (HWC) is one of the comprehensive applications of AMR
## Building From Source
This microservice is built on Java, Spring boot framework and MySQL DB.

### Prerequisites
### Pre-requisites
* JDK 1.8
* Maven
* Spring Tool Suite 3 / Eclipse(2023-03)
* Maven (if not pre-installed with the editor)
* Redis-x64-3.0.504
* MySQL Workbench 8.0

$ ./mvn clean install
### Creating a build configuration in STS / Eclipse

## Installation
This service has been tested on Wildfly as the application server.
* You can copy `common_example.properties` to `common_local.properties` and edit the file accordingly. The file is under `src/main/environment` folder.
* In your editor, click on Run -> Run configuration.
* Double-click on Maven build and give a suitable name for the new configuration.
* Populate the base directory by clicking on workspace and selecting HWC-API module.
* Set goals to clean install -DENV_VAR=local(your choice of desired environment) and click on Apply.
* It is advisable have a personal environment properties file under src/main/environment filling out all the placeholders to avoid repetitive manual work each time you run locally.
* Click Run to run the build configuration.

### Prerequisites
* Wildfly (or any compatible app server)
* Redis
* MySQL Database
### Creating a run configuration in STS / Eclipse

* In your editor, click on Run -> Run configuration.
* Double click on Spring Boot App(in STS) / Java Application(in Eclipse) and give a suitable name for the new configuration.
* Select the project and main class and click on Apply.
* Click Run to run the configuration. Keep the Redis server open during this run.
* Once the run is complete, load http://localhost:8080/swagger-ui.html#!/

### How to Import, Build, and Run Maven Code in Visual Studio Code

1. **Install Visual Studio Code**: Download and install [Visual Studio Code](https://code.visualstudio.com/) from the official website.

2. **Install Java**: Ensure you have the Java Development Kit (JDK 1.8) installed on your computer. You can download it from the [Oracle website](https://www.oracle.com/java/technologies/javase-downloads.html) or use an open-source JDK like [OpenJDK](https://adoptopenjdk.net/).

3. **Install Maven**: Make sure you have Apache Maven installed on your system. Download it from the [Apache Maven website](https://maven.apache.org/download.cgi).

4. **Install Visual Studio Code Extensions**:
- **Java Extension Pack**: Open Visual Studio Code, go to the Extensions view by clicking on the Extensions icon in the Activity Bar, and search for "Java Extension Pack." Install it to get Java support and Maven integration.

5. **Open the Project in Visual Studio Code**:
- Launch Visual Studio Code.
- Use the **File > Open Folder** option to open your Maven project folder.

6. **Configure Java and Maven**:
- If not already configured, set up your Java Home and Maven Home in Visual Studio Code.
- Go to **File > Preferences > Settings**, search for "Java Home" and "Maven Home," and specify the paths to your JDK and Maven installations.

7. **Build and Run**:
- To build and run your Maven project, open the integrated terminal in Visual Studio Code (**Terminal > New Terminal**).
- Navigate to your project directory using the `cd` command.
- Use Maven commands like `mvn clean install` to build your project.
- To run your Java application, use mvn spring-boot:run. Ensure the redis server is open during run.

##DB restoration
[blank_db_zip](https://psmri.github.io/PSMRI/developer-guides/technical-overview/#db-restoration)

## Integrations
* Video Consultation
Expand Down
Loading
Loading