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

feat(4): openmaps #217

Merged
merged 105 commits into from
Jan 6, 2023
Merged
Show file tree
Hide file tree
Changes from 104 commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
f5e7be4
chore: updating pom
Dec 14, 2022
a0a5bfe
chore: adding commons-lang3
Dec 14, 2022
e68e552
chore: code cleanup
Dec 14, 2022
a367ca2
chore: removing dependencies
Dec 14, 2022
41448cf
chore: removing component from entity
Dec 14, 2022
198fe38
chore: removing ScopeConstant.java
Dec 14, 2022
427c5d8
chore: removing component from entity
Dec 14, 2022
53b14a8
chore: removing ScopeConstant.java
Dec 14, 2022
89ded74
Merge branch 'feat/ches' into fix/188-code-review
Dec 14, 2022
1c3598e
chore: adding lombok and refactoring
Dec 15, 2022
53621c4
Frontend(deps-dev): Bump @types/node in /frontend (#191)
dependabot[bot] Dec 14, 2022
5a97cbd
Frontend(deps-dev): Bump @typescript-eslint/eslint-plugin in /fronten…
dependabot[bot] Dec 14, 2022
7184242
Merge to main close #190: add checking duplicate api to frontend (#192)
MCatherine1994 Dec 15, 2022
05532c4
chore: code cleanup
Dec 14, 2022
5191d24
chore: removing dependencies
Dec 14, 2022
42334d9
chore: adding lombok and refactoring
Dec 15, 2022
d7649c4
chore: adding lombok and refactoring
Dec 15, 2022
019da69
chore: removing mapping
Dec 15, 2022
7f16335
chore: code cleanup
Dec 15, 2022
c5a3e8c
chore: updating gititnore
Dec 15, 2022
fe15e8a
chore: cleaning up repository
Dec 15, 2022
f9add0f
Merge branch 'main' into fix/188-code-review
paulushcgcj Dec 15, 2022
28ce411
chore: cleaning up repository
Dec 15, 2022
e23331e
chore: updating gitignore
Dec 16, 2022
8960fb9
chore: updating dependencies and cleanup
Dec 16, 2022
e3371ab
ci: updating workflow and labels
Dec 16, 2022
7aca6e4
ci: adding codechange detection
Dec 17, 2022
dce57dc
ci: fixing ci for frontend
Dec 17, 2022
666db3e
ci: limiting ci per folder
Dec 17, 2022
d5ea28c
ci: removing changes
Dec 17, 2022
c717220
ci: adding backend ci
Dec 17, 2022
b1414e1
chore: moving packages out of core
Dec 19, 2022
6fc8e4f
feat: added functional routes
Dec 20, 2022
895acb8
chore: removing old common service package
Dec 20, 2022
8320341
feat: adding common service functional api
Dec 20, 2022
31ecdb6
ci: fixing backend ci
Dec 20, 2022
07c88c9
ci: changing mvn wrapper exec mode
Dec 20, 2022
051a471
ci: updating ci configuration
Dec 22, 2022
65afea0
ci(docker): updating dockerfile
Dec 22, 2022
f4ed921
ci(docker): updating dockerfile
Dec 22, 2022
2962110
feat!: removing oracle data.
Dec 22, 2022
61e5f89
chore: commenting out class for now
Dec 22, 2022
09c837c
feat: reworking commons host email
Dec 22, 2022
819cda2
chore: updating yml configurations
Dec 22, 2022
e7d55d8
test: adding more test cases
Dec 22, 2022
118cf20
ci: updating backend ci
Dec 23, 2022
3460d9d
feat: updating functional routing
Dec 28, 2022
fb2929d
chore: removing old orgbook code
Dec 28, 2022
fd94d7f
feat: adding orgbook endpoint
Dec 28, 2022
f3f53a6
chore: code cleanup
Dec 28, 2022
8d29e79
chore: commenting out postgres code
Dec 28, 2022
fa8afe8
feat: updating to boot 3.0.1
Dec 28, 2022
c870fa1
test: adding tests to orgbook endpoint
Dec 28, 2022
7bd038a
chore: updating configuration and npe
Dec 28, 2022
7601f57
chore: removing fsa postgres client data
Dec 29, 2022
305e9d0
chore: updating orgbook route swagger
Dec 29, 2022
a740d24
chore: removing old postgres code
Dec 29, 2022
ceb142e
feat: fsa client implementation from postgres
Dec 29, 2022
bebc362
feat: moving to r2dbc and flyway
Dec 29, 2022
9ebca7d
test: adding fsa client test
Dec 29, 2022
7f16176
ci(docker): updating dockerfile
Dec 29, 2022
026e693
ci(mvnw): updating ci
Dec 29, 2022
dd8e7b2
ci(mvnw): updating ci
Dec 29, 2022
ece1102
ci(mvnw): updating ci
Dec 29, 2022
d4028a8
ci(docker): testing out release
Dec 29, 2022
a94c755
Merge branch 'main' into feat/postgres
paulushcgcj Dec 30, 2022
827b473
Merge branch 'main' into feat/postgres
paulushcgcj Dec 30, 2022
6b7914e
chore: updated path to nrs
Jan 2, 2023
0f7f2c7
chore: moved webclient to config
Jan 2, 2023
3ddeb0c
chore: updated routing
Jan 2, 2023
801e1a7
ci: updating test command parameter
Jan 2, 2023
75562be
ci: removing sonar parameter
Jan 2, 2023
ceb89a3
ci: changing parameters for sonar
Jan 2, 2023
d0f97ef
chore: removing unused constants
Jan 2, 2023
7dd6bde
ci: updating deployment
Jan 2, 2023
20e0ed3
chore: code smell cleanup
Jan 2, 2023
2cb82d6
chore: code smell cleanup
Jan 2, 2023
69a8110
fix: fixing app parameter naming
Jan 2, 2023
4e99de7
chore: changing parameter from URI to String
Jan 2, 2023
c34f151
ci(openshift): fixing health probe
Jan 3, 2023
8afcda3
ci(openshift): updating health probe
Jan 3, 2023
4d1c27c
chore: renaming fsa package to client
Jan 3, 2023
63fcb0e
ci: updating deploy action version
Jan 3, 2023
525b406
ci: updating deploy health endpoint
Jan 4, 2023
98d1f1a
chore: moving date to be a parameter on client
Jan 4, 2023
a382379
chore: updating compose file
Jan 4, 2023
afca01b
ci: removing be-tests workflow
Jan 4, 2023
ea99fbc
chore: re-adding db init script
Jan 4, 2023
23a9020
chore: updating client query
Jan 4, 2023
43f09bc
chore: code cleanup
Jan 4, 2023
bc15b9b
Merge branch 'main' into feat/postgres
paulushcgcj Jan 4, 2023
968fdd9
chore: updating gitignore
Jan 4, 2023
b6cddcc
chore: fixing naming convention
Jan 4, 2023
c122191
chore: removing old openmaps code
Jan 3, 2023
599ac6b
feat(openmaps): adding openmaps feature
Jan 3, 2023
a0704ea
chore: fixing code smell and style
Jan 3, 2023
c5b378f
doc: updating readme file
Jan 3, 2023
718b0f7
chore: fixing naming convention
Jan 5, 2023
711e5ef
fix: fixing rebase issues
Jan 5, 2023
523c301
chore: changing dtos to match naming convention
Jan 5, 2023
2609db1
docs: updating .gitignore
Jan 5, 2023
8465ffd
docs: updating readme
Jan 5, 2023
37b994d
docs: updating readme
Jan 5, 2023
e20c74d
chore(deps): removing json conflict
Jan 5, 2023
b35e919
Merge branch 'main' into feat/openmaps
mamartinezmejia Jan 6, 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
63 changes: 63 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
github_actions:
- .github/*

tests:
- backend/src/test/**/*.java
- frontend/cypress/**/*
- frontend/src/tests/**/*.spec.ts

source:
- backend/src/main/**/*.java
- frontend/src/**/*.ts

docker:
- any: ['Dockerfile','dockerfile-entrypoint.sh']

controller:
- backend/src/main/**/controller/*.java

dto:
- backend/src/main/**/dto/*.java

entity:
- backend/src/main/**/entity/*.java

repository:
- backend/src/main/**/repository/*.java

configuration:
- backend/src/main/**/configuration/*.java
- backend/src/main/resources/**/*
- backend/config/**/*
- frontend/tsconfig*
- frontend/vite*
- frontend/*.json

service:
- backend/src/main/**/service/*.java

frontend:
- frontend/**/*

backend:
- backend/**/*

database:
- database/**/*

dependencies:
- any: ['backend/pom.xml','frontend/package.json','package-lock.json']

documentation:
- backend/docs/**/*
- frontend/docs/**/*
- docs/**/*

java:
- backend/**/*

javascript:
- frontend/**/*

openshift:
- '**/openshift.*.yml'
67 changes: 61 additions & 6 deletions .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,63 @@ concurrency:
cancel-in-progress: true

jobs:
pr-validation:
name: Pull Request Validation
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@v3

- name: Pull request size and stability labels
uses: actions/labeler@v4
continue-on-error: true
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Conventional Label
uses: bcoe/conventional-release-labels@v1
continue-on-error: true
with:
token: ${{ secrets.GITHUB_TOKEN }}
ignored_types: '["chore","pr"]'
type_labels: '{"feat": "feature", "fix": "fix", "bug": "fix", "doc": "documentation", "ci": "ci", "chore": "chore", "breaking": "breaking", "BREAKING CHANGE": "breaking"}'

- name: Checkout branch
uses: actions/checkout@v3
with:
ref: refs/heads/${{ github.head_ref }}

- name: Conventional Changelog Update
continue-on-error: true
uses: TriPSs/conventional-changelog-action@v3
id: changelog
with:
github-token: ${{ github.token }}
output-file: 'CHANGELOG.md'
skip-version-file: 'true'
skip-commit: 'true'
git-push: 'false'
git-branch: refs/heads/${{ github.head_ref }}

- name: Checkout pr
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}

- name: Comment PR
continue-on-error: true
uses: thollander/actions-comment-pull-request@v1
if: ${{ steps.changelog.outputs.skipped == 'false' }}
with:
message: |
# Current changelog

${{ steps.changelog.outputs.clean_changelog }}
comment_includes: '# Current changelog'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pr-greeting:
name: PR Greeting
env:
Expand All @@ -32,6 +89,7 @@ jobs:
Once merged, code will be promoted and handed off to following workflow run.
[Main Merge Workflow](https://github.com/${{ github.repository }}/actions/workflows/merge-main.yml)


builds:
name: Builds
runs-on: ubuntu-22.04
Expand All @@ -49,6 +107,7 @@ jobs:
triggers: ('frontend/')
steps:
- uses: actions/checkout@v3

- uses: bcgov-nr/[email protected]
with:
package: ${{ matrix.package }}
Expand Down Expand Up @@ -101,13 +160,14 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Deploys
uses: bcgov-nr/action-deployer-openshift@v0.1.0
uses: bcgov-nr/action-deployer-openshift@v0.2.0-rc1
with:
file: backend/openshift.deploy.yml
oc_namespace: ${{ secrets.OC_NAMESPACE }}
oc_server: ${{ secrets.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
overwrite: true
health_url: health
parameters:
-p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
-p PROMOTE=${{ github.repository }}/backend:${{ github.event.number }}
Expand All @@ -118,11 +178,6 @@ jobs:
-p CHES_CLIENT_SECRET=${{ secrets.CHES_CLIENT_SECRET }}
-p CHES_TOKEN_URL='https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token'
-p CHES_API_URL='https://ches-dev.api.gov.bc.ca/api/v1'
-p ORACLEDB_USER=${{ secrets.ORACLEDB_USER }}
-p ORACLEDB_PASSWORD=${{ secrets.ORACLEDB_PASSWORD }}
-p ORACLEDB_DATABASE=${{ secrets.ORACLEDB_DATABASE }}
-p ORACLEDB_HOST=${{ secrets.ORACLEDB_HOST }}
-p ORACLEDB_SERVICENAME=${{ secrets.ORACLEDB_SERVICENAME }}

deploy-frontend:
name: Deploy Frontend
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ jobs:
- uses: bcgov-nr/[email protected]
with:
commands: |
./mvnw test
mvn -B verify -P all-tests checkstyle:checkstyle -Dcheckstyle.skip=false --file pom.xml
dir: backend
java-cache: maven
java-distribution: temurin
java-version: "17"
sonar_args: >
-Dsonar.exclusions=**/coverage/**
-Dsonar.organization=bcgov-sonarcloud
-Dsonar.projectKey=forest-client-backend
sonar_project_token: ${{ secrets.SONAR_TOKEN_BACKEND }}
Expand Down
Loading