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

Order process documentation #1075

Open
wants to merge 123 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
81c3ff6
Structure docs folder
hnd14 Sep 11, 2024
3414b42
First draft for readme
hnd14 Sep 11, 2024
faeb8dd
Rename NextJs to Storefront in diagrams
hnd14 Sep 11, 2024
bb2d853
Delete unused image
hnd14 Sep 11, 2024
d4de77b
Small change in sequence diagrams
hnd14 Sep 13, 2024
b86f0e6
Add stock keeping and cart deleting steps
hnd14 Sep 13, 2024
359622e
Fix: fix to correct api endpoints
hnd14 Sep 13, 2024
71ab961
Feat: add Order state diagrams
hnd14 Sep 13, 2024
3d7ccf4
Feat: Add state diagram to README
hnd14 Sep 13, 2024
2890581
Fix: small fix for order state diagram
hnd14 Sep 13, 2024
c2252df
Fix: rename status to reflect the correct name in the code
hnd14 Sep 13, 2024
25e0519
Add numbering for order flow
hnd14 Sep 13, 2024
e40db98
Feat: Add numbering for create checkout diagram
hnd14 Sep 13, 2024
7d828fa
Feat: add Checkout states diagram
hnd14 Sep 13, 2024
7bf34a3
Feat: update README file
hnd14 Sep 13, 2024
25ad3bc
#1008 order process: checkout flow
nashtech-vietvuhoang1 Sep 17, 2024
37d5776
Update checkout sequence diagram (#1046)
hnd14 Sep 17, 2024
4b9b334
Add Diagram explanation to README
hnd14 Sep 18, 2024
4e36654
Update Checkout and Order States
nashtech-vietvuhoang1 Sep 18, 2024
b8004b6
Update Checkout Process
nashtech-vietvuhoang1 Sep 18, 2024
0d6836d
Update order process design readme to match the updated design
hnd14 Sep 19, 2024
e25c708
Payment Flow
nashtech-vietvuhoang1 Sep 19, 2024
ad51287
Merge branch 'docs/1008-payment-process' into docs/1008-order-process
nashtech-vietvuhoang1 Sep 19, 2024
4b59e2b
Update Readme for paymentflow
nashtech-vietvuhoang1 Sep 19, 2024
e55d5b6
Update Stock before payment
nashtech-vietvuhoang1 Sep 20, 2024
76abd7d
Support COD on payment flow
nashtech-vietvuhoang1 Sep 23, 2024
2db8b26
[1008] update payment flow for async
nashtech-vietvuhoang1 Sep 23, 2024
b3fe5e4
Update order flow design README
hnd14 Sep 24, 2024
9672cf1
Update flow
nashtech-vietvuhoang1 Sep 24, 2024
f72ba2b
Break payment flow down into smaller phases
hnd14 Sep 24, 2024
972e8a1
Format README.md
hnd14 Sep 25, 2024
c28f7b6
Update overview diagram, move delete card to after order placement, …
hnd14 Sep 25, 2024
e68f30a
Update promocode usage flow, update README text
hnd14 Sep 25, 2024
1285ca7
Update Shopping Cart when Order is placed already
nashtech-vietvuhoang1 Sep 26, 2024
c0f2beb
Add README for payment paypal
hnd14 Sep 24, 2024
86a41c2
README first revison
hnd14 Sep 26, 2024
97d3382
Update to simplify diagrams for promocode application
hnd14 Sep 26, 2024
918f985
Simplify payment flow
hnd14 Sep 26, 2024
b3c63cf
Update developer-guidelines.md for elasticsearch (#1085)
HnKnA Sep 27, 2024
5acee04
#1083 Allow users to select items to checkout (#1096)
mochacr0 Sep 27, 2024
d7916b6
[Common library] Config common library for reuse test class and test …
khanhduzz Sep 30, 2024
eb1a97f
#1022 - Automation test (#1092)
chinhduongthi Sep 30, 2024
f43f566
Optimize elasticsearch & Add more search criteria (#1088)
minhtranq-nashtechglobal Sep 30, 2024
4bfb2a0
#1037 - The quantity doesn't increase if the same product code (#1081)
duylv27 Sep 30, 2024
10df82e
#1064 [BACKOFFICE] [Bugs] Product Variations - select product variant…
nashtech-tuannguyenhuu1 Sep 30, 2024
e56bd85
Update backoffice-ci.yaml (#1109)
thiennn Sep 30, 2024
e5da0c4
#882 Create a shared project (#1089)
nashtech-huyphamphu Oct 1, 2024
6683b5e
config common library for test in some modules (#1098)
khanhduzz Oct 1, 2024
f78dd5c
#1064 [BACKOFFICE] [Bugs] Product Variations - distinct options (#1114)
nashtech-tuannguyenhuu1 Oct 1, 2024
8e8de52
#1008 add detail design
nashtech-vietvuhoang1 Oct 2, 2024
9b3e7d2
#1064 [BACKOFFICE] [Bugs] Product Variations - delete options (#1118)
nashtech-tuannguyenhuu1 Oct 2, 2024
0e1a516
Config IT to integrate with common-library (#1113)
khanhduzz Oct 2, 2024
be4d1af
#1086 [BACKOFFICE] [Bugs] Product Attributes - Product List View - Re…
VanCongBang Oct 2, 2024
9082c17
#1120 fix bug cannot logout (#1122)
nguyenvanhadncntt Oct 3, 2024
649ef91
#1099 Add to cart (#1124)
mochacr0 Oct 4, 2024
266be55
#1112[Search] Re-configure search filter (#1125)
HnKnA Oct 7, 2024
9520500
#882 create a shared project (#1123)
nashtech-huyphamphu Oct 8, 2024
d4ed2a8
Remove old option values before update products (#1097)
NhatTranMinh15 Oct 8, 2024
b190def
#1126 add weight and dimension for product (#1132)
nguyenvanhadncntt Oct 8, 2024
20e163e
#1128 [BACKOFFICE] [Bugs] Add some boxes in the homepage of the backo…
nashtech-tuannguyenhuu1 Oct 8, 2024
aca4fd2
revert moving cart API to order module (#1136)
mochacr0 Oct 8, 2024
e647ccb
#793 Upgrade to next.js 14 (#1143)
danhnguyenv1 Oct 9, 2024
ec366a1
[Share project] refactor common config and exception handler in webho…
khanhduzz Oct 9, 2024
cfad76d
#1099 Move add cart item API to cart module (#1141)
mochacr0 Oct 9, 2024
679631c
#1133 - [Promotion] Fix bug duplicate option, validate date, show isA…
LoanNguyenT5 Oct 10, 2024
ee4267a
#882 Create a shared project (#1152)
nashtech-huyphamphu Oct 10, 2024
6809952
Update Payment flow
nashtech-vietvuhoang1 Oct 10, 2024
fb2249d
#1155 fix bug wrong price mapping to get product API response (#1156)
nguyenvanhadncntt Oct 10, 2024
a91a139
#1099 Implement update & get cart items APIs (#1153)
mochacr0 Oct 11, 2024
faf4a83
#1128 [BACKOFFICE] [Bugs] Add some boxes in the homepage of the backo…
nashtech-tuannguyenhuu1 Oct 11, 2024
1420c85
#1128 [BACKOFFICE] [Bugs] Fixing for handle exception (#1160)
nashtech-tuannguyenhuu1 Oct 11, 2024
baf7e28
#1102 - Embedding-based product similarity search (#1139)
duylv27 Oct 11, 2024
ff4d73e
config elastic search IT with common library (#1154)
khanhduzz Oct 14, 2024
cb6b212
#1099 Implement bulk delete cart items & delete single item APIs (#1165)
mochacr0 Oct 14, 2024
eeaf29a
Authentication and session handling in BFF doesn't work in cluster mo…
khanhtrand Oct 14, 2024
8b4c8f9
#1184 Apply promotion discount on cart page of storefront (#1186)
nguyenvanhadncntt Oct 15, 2024
430d1d1
#1102 - Add recommendation-ci.yaml & setup deployment for recommendat…
duylv27 Oct 16, 2024
c6405a4
[Storefront] Reformat apiClientService(Done) (#1166)
HnKnA Oct 16, 2024
e831407
Issue #1142: format number input (#1194)
DinhThaiVV Oct 16, 2024
c09fd0b
#1105 process to checkout - AC1: Create API to get Product informatio…
khanhduzz Oct 17, 2024
a8cd2f4
#1099 Integrate cart UI with new APIs (#1195)
mochacr0 Oct 18, 2024
be2a354
[Storefront] Enhance to automatically fill the default shipping addre…
danhnguyenv1 Oct 18, 2024
bd4576e
#1150 [Recommendation] Adjust product detail page to show similar pro…
chinhduongthi Oct 18, 2024
6b9a4e9
create customer page (#1202)
toannguyenk Oct 21, 2024
cfcfd40
#1146 [Order] Common export csv file for basic table (#1191)
nashtech-longlevanquoc1 Oct 21, 2024
7cb0302
#1198-update-the-order-checkout-payment-tables (#1213)
nashtech-tuannguyenhuu1 Oct 21, 2024
18d0da7
#1071 - Appy retry mechanism for automation test (#1211)
chinhduongthi Oct 22, 2024
9b4083e
#1185 - Integration Test for Kafka/ElasticSearch (#1197)
duylv27 Oct 22, 2024
fdfa742
#1099 Clean up old cart API classes (#1205)
mochacr0 Oct 23, 2024
61c4f7c
#1148 - Enhance Error Handler, Serialize, Deserialize (#1182)
duylv27 Oct 23, 2024
a5cea8f
#1115 Enhance grafana http metrics panels (#1217)
mochacr0 Oct 23, 2024
92b1787
#1196 fix issue missing payment method and additional validation othe…
nguyenvanhadncntt Oct 23, 2024
de556fd
Feature/1175 delivery service (#1200)
DinhThaiVV Oct 23, 2024
7bc4ef8
#1215 - Apply promotion code in cart (#1216)
LoanNguyenT5 Oct 23, 2024
d8b6d28
#1218 - Fix product attribute mapping and backoffice UI (#1221)
khanhduzz Oct 23, 2024
9e83bcd
[Storefront] [Category] Create api to get the top n categories (#1220)
HnKnA Oct 23, 2024
12ccc8f
#1201 - [Backoffice] - Unable to add or edit Product Options due to r…
VanCongBang Oct 23, 2024
b71e60a
Fix postgres docker build fail (#1228)
khanhtrand Oct 24, 2024
9576d76
#1214 [Storefront & Backoffice] Payment was successfully processed,…
danhnguyenv1 Oct 24, 2024
da72516
Fix issue can;t update payment status for order service (#1238)
danhnguyenv1 Oct 28, 2024
5e44987
#1234 update MediaType import (#1240)
mochacr0 Oct 28, 2024
225337b
Update product sync (#1241)
toannguyenk Oct 29, 2024
df23875
Configure UI for keyword suggestions search (#1229)
HnKnA Oct 29, 2024
54c7bf2
Update payment methods to Checkout Object (#1242)
nashtech-huyphamphu Oct 29, 2024
89b05fe
#1234 - Update dependencies to recent latest version (#1235)
nashtech-diepnguyenngoc1 Oct 30, 2024
0a49d70
#1206 product: Allow admin to add multiple values for option (#1244)
nguyenvanhadncntt Oct 30, 2024
ddef30e
[BackOffice][Add/Edit product] Should validate length > width (#1245)
toannguyenk Oct 31, 2024
f3de565
Feature/1003 payment provider (#1243)
khanhtrand Oct 31, 2024
fd49ac9
Add validate vs dirty check to price field (#1250)
HnKnA Oct 31, 2024
9e9e80f
#1199 - Add UT for recommendation service (#1207)
duylv27 Nov 1, 2024
c8b3afc
#1174: Apply promotion code when checkout (#1247)
LoanNguyenT5 Nov 1, 2024
59461da
#1249: Refactor entity relationship 1-n (#1255)
nashtech-tuannguyenhuu1 Nov 1, 2024
1e78a14
fix previous commit had re-added payment-paypal service (#1258)
thiennn Nov 4, 2024
af2c942
#1135 - Revise helm charts and update k8s deployment (#1256)
nashtech-diepnguyenngoc1 Nov 4, 2024
7bcc8a6
Catch average star error in product detail page (#1253)
HnKnA Nov 5, 2024
db997a9
Integration test for recommendation. (#1257)
chinhduongthi Nov 6, 2024
8a93fb3
disable warning react-hooks/exhaustive-deps (#1265)
toannguyenk Nov 8, 2024
d95476f
#1135 - Revise helm charts and update k8s deployment (#1266)
nashtech-diepnguyenngoc1 Nov 11, 2024
197d6f4
#1227 - Handling hard delete data from Sample Data (#1252)
duylv27 Nov 11, 2024
978b380
#1183 Feat: Modal for selecting the display-type of Product Option an…
khanhduzz Nov 14, 2024
7f3f85f
edit and delete customer (#1262)
toannguyenk Nov 18, 2024
3962000
Merge branch 'docs/1008-order-process' of https://github.com/nashtech…
khanhduzz Nov 18, 2024
3bf0dc2
merge with main and add checkout-api flow
khanhduzz Nov 18, 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
  •  
  •  
  •  
11 changes: 10 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ PROMETHEUS_SERVICE_PORT=9090
PROMETHEUS_SERVICE_HOST=prometheus
PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}

# Redis
SPRING_DATA_REDIS_HOST=redis
SPRING_DATA_REDIS_PORT=6379

# *******************************************************
# Environment Variables are injected to the microservices
Expand All @@ -78,6 +81,7 @@ YAS_SERVICES_PROMOTION=http://promotion/promotion
YAS_SERVICES_INVENTORY=http://inventory/inventory
YAS_SERVICES_RATING=http://rating/rating
YAS_SERVICES_SAMPLE_DATA=http://sampledata/sampledata
YAS_SERVICES_RECOMMENDATION=http://recommendation/recommendation
SERVER_PORT=80

# Swagger UI
Expand All @@ -88,4 +92,9 @@ COMPOSE_FILE=docker-compose.yml:docker-compose.search.yml:docker-compose.o11y.ym

# Additional configuration
YAS_PRICE_INCLUDES_TAX=false
YAS_CURRENCY_UNIT=VND
YAS_CURRENCY_UNIT=VND

# OpenAI Config
SPRING_AI_AZURE_OPENAI_API_KEY=
SPRING_AI_AZURE_OPENAI_ENDPOINT=
SPRING_AI_AZURE_OPENAI_EMBEDDING_OPTIONS_MODEL=
2 changes: 1 addition & 1 deletion .github/workflows/backoffice-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
working-directory: backoffice
- run: npx prettier --check .
working-directory: backoffice
- run: npm audit
- run: npm audit --omit=dev
continue-on-error: true
working-directory: backoffice
- name: Run Trivy vulnerability scanner
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/media-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl media -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f media -Dcheckstyle.output.file=media-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl media -am -Dcheckstyle.output.file=media-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/media-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f media
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/order-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl order -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -pl order -am -Dcheckstyle.output.file=order-checkstyle-result.xml
Expand All @@ -35,8 +37,6 @@ jobs:
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/order-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f order
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/payment-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl payment -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -pl payment -am -Dcheckstyle.output.file=payment-checkstyle-result.xml
Expand All @@ -35,8 +37,6 @@ jobs:
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/payment-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f payment
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/payment-paypal-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl payment-paypal -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f payment-paypal -Dcheckstyle.output.file=payment-paypal-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl payment-paypal -am -Dcheckstyle.output.file=payment-paypal-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/payment-paypal-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f payment-paypal
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/promotion-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl promotion -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f promotion -Dcheckstyle.output.file=promotion-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl promotion -am -Dcheckstyle.output.file=promotion-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/promotion-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f promotion
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rating-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl rating -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f rating -Dcheckstyle.output.file=rating-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl rating -am -Dcheckstyle.output.file=rating-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/rating-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f rating
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
90 changes: 90 additions & 0 deletions .github/workflows/recommendation-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: recommendation service ci

on:
push:
branches: ["main"]
paths:
- "recommendation/**"
- ".github/workflows/actions/action.yaml"
- ".github/workflows/recommendation-ci.yaml"
- "pom.xml"
pull_request:
branches: ["main"]
paths:
- "recommendation/**"
- ".github/workflows/actions/action.yaml"
- ".github/workflows/recommendation-ci.yaml"
- "pom.xml"
workflow_dispatch:

jobs:
Build:
runs-on: ubuntu-latest
env:
FROM_ORIGINAL_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.ref == 'refs/heads/main' }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl recommendation -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -pl recommendation -am -Dcheckstyle.output.file=recommendation-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/recommendation-checkstyle-result.xml'
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
with:
name: Recommendation-Service-Unit-Test-Results
path: "recommendation/**/*-reports/TEST*.xml"
reporter: java-junit
- name: Analyze with sonar cloud
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -f recommendation
- name: OWASP Dependency Check
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: dependency-check/Dependency-Check_Action@main
env:
JAVA_HOME: /opt/jdk
with:
project: 'yas'
path: '.'
format: 'HTML'
- name: Upload OWASP Dependency Check results
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: actions/upload-artifact@master
with:
name: OWASP Dependency Check Report
path: ${{github.workspace}}/reports
- name: Add coverage report to PR
uses: madrapps/[email protected]
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
with:
paths: ${{github.workspace}}/recommendation/target/site/jacoco/jacoco.xml
token: ${{secrets.GITHUB_TOKEN}}
min-coverage-overall: 80
min-coverage-changed-files: 60
title: 'Recommendation Coverage Report'
update-comment: true
- name: Log in to the Container registry
if: ${{ github.ref == 'refs/heads/main' }}
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push Docker images
if: ${{ github.ref == 'refs/heads/main' }}
uses: docker/build-push-action@v6
with:
context: ./recommendation
push: true
tags: ghcr.io/nashtech-garage/yas-recommendation:latest
6 changes: 3 additions & 3 deletions .github/workflows/sampledata-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl sampledata -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f sampledata -Dcheckstyle.output.file=sampledata-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl sampledata -am -Dcheckstyle.output.file=sampledata-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/sampledata-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f sampledata
- name: Analyze with sonar cloud
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/search-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl search -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f search -Dcheckstyle.output.file=search-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl search -am -Dcheckstyle.output.file=search-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/search-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f search
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/storefront-bff-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl storefront-bff -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f storefront-bff -Dcheckstyle.output.file=storefront-bff-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl storefront-bff -am -Dcheckstyle.output.file=storefront-bff-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/storefront-bff-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f storefront-bff
- name: Analyze with sonar cloud
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tax-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl tax -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f tax -Dcheckstyle.output.file=tax-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl tax -am -Dcheckstyle.output.file=tax-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/tax-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f tax
- name: Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/webhook-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: ./.github/workflows/actions
- name: Run Maven Build Command
run: mvn clean install -pl webhook -am
- name: Run Maven Checkstyle
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
run: mvn checkstyle:checkstyle -f webhook -Dcheckstyle.output.file=webhook-checkstyle-result.xml
run: mvn checkstyle:checkstyle -pl webhook -am -Dcheckstyle.output.file=webhook-checkstyle-result.xml
- name: Upload Checkstyle Result
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' }}
uses: jwgmeligmeyling/checkstyle-github-action@master
with:
path: '**/webhook-checkstyle-result.xml'
- name: Run Maven Verify
run: mvn clean verify -f webhook
- name: Unit Test Results
uses: dorny/test-reporter@v1
if: ${{ env.FROM_ORIGINAL_REPOSITORY == 'true' && (success() || failure()) }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ hs_err_pid*
.settings*
.vscode
*.iml
out
out/**
*.bkp
7 changes: 1 addition & 6 deletions automation-ui/automation-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<version>${revision}</version>
</parent>
<artifactId>automation-base</artifactId>
<packaging>jar</packaging>

<properties>
<sonar.organization>nashtech-garage</sonar.organization>
Expand All @@ -21,34 +22,28 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-testng</artifactId>
<version>${cucumber-testng.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-spring</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

Expand Down
Loading
Loading