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

stable application to main branch(Do not merge) #12

Merged
merged 129 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
a566c7d
feat: add gradle files and compose file code
bhautik-sakhiya Nov 21, 2024
a2cbf02
feat: add gradle files
bhautik-sakhiya Nov 21, 2024
2485b33
Merge pull request #6 from smartSenseSolutions/add-gradle-and-docker
dilipdhankecha2530 Nov 21, 2024
9a001cd
feat: create query catalog logic
bhautik-sakhiya Nov 21, 2024
049070d
feat: handle edc operations
dilipdhankecha2530 Nov 21, 2024
b437da2
feat: add endpoints and swagger config
bhautik-sakhiya Nov 21, 2024
22a94f9
feat: update ddl auto to none
dilipdhankecha2530 Nov 21, 2024
89e20bc
feat: update migration files
dilipdhankecha2530 Nov 21, 2024
a6a1999
feat: sent message with EDC
dilipdhankecha2530 Nov 21, 2024
4faa327
feat: remove unused api
bhautik-sakhiya Nov 21, 2024
7d46415
feat: Sending message through EDC and persist all IDS in in memory st…
dilipdhankecha2530 Nov 21, 2024
b1f1a31
Merge remote-tracking branch 'origin/dev' into dev
dilipdhankecha2530 Nov 21, 2024
b992f2c
feat: fix log sonar
dilipdhankecha2530 Nov 21, 2024
1e28bb5
feat: Add config endpoint
dilipdhankecha2530 Nov 21, 2024
28153d3
chore: api prefix removed
nitin-vavdiya Nov 21, 2024
5fd3382
feat: add env variable and api docs
bhautik-sakhiya Nov 21, 2024
87c656a
fix: remove unused configs
dilipdhankecha2530 Nov 21, 2024
ed70245
feat: config, get BPN and add BPN api integrated
nitin-vavdiya Nov 21, 2024
485fb94
feat: add conflict exception and handler
bhautik-sakhiya Nov 21, 2024
522f23a
Merge remote-tracking branch 'origin/dev' into dev
bhautik-sakhiya Nov 21, 2024
494d693
feat: add bpn API
nitin-vavdiya Nov 22, 2024
15f3d1a
feat: refactor conflict exception
bhautik-sakhiya Nov 22, 2024
d741daa
Merge remote-tracking branch 'origin/dev' into dev
bhautik-sakhiya Nov 22, 2024
9b35614
docs: deployment doc added
nitin-vavdiya Nov 22, 2024
7504f88
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 22, 2024
307ae4c
docs: initial data config added
nitin-vavdiya Nov 22, 2024
83ff33b
feat: update get partners response
bhautik-sakhiya Nov 22, 2024
b6c2229
Merge remote-tracking branch 'origin/dev' into dev
bhautik-sakhiya Nov 22, 2024
f48cecf
fix: add docs folders
dilipdhankecha2530 Nov 22, 2024
b3106e6
docs: deployment doc updated
nitin-vavdiya Nov 22, 2024
ba8677c
feat: check config and user provided bpn
bhautik-sakhiya Nov 22, 2024
21b059d
feat: chat history API
nitin-vavdiya Nov 22, 2024
a10a8ed
fix: scroll issue
nitin-vavdiya Nov 22, 2024
f140ba6
feat: send chat message API
nitin-vavdiya Nov 22, 2024
4860adf
feat: add db to store edc details and chat details and impl storing l…
bhautik-sakhiya Nov 22, 2024
5a2a37d
feat: validation added
nitin-vavdiya Nov 22, 2024
448a245
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 22, 2024
7052911
feat: create chat in message receive api
bhautik-sakhiya Nov 22, 2024
09574eb
Merge remote-tracking branch 'origin/dev' into dev
bhautik-sakhiya Nov 22, 2024
18a858d
feat: create asset, policy and contract def on app start
bhautik-sakhiya Nov 22, 2024
002e480
feat: use concat instead of format method and provide default app host
bhautik-sakhiya Nov 22, 2024
b45ea43
fix: timeout
nitin-vavdiya Nov 22, 2024
e74f062
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 22, 2024
d04930b
feat: change datatype of error_details to text
bhautik-sakhiya Nov 22, 2024
6923176
build: add docker compose file to up the whole EDC stack
dilipdhankecha2530 Nov 22, 2024
bfa57c7
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
dilipdhankecha2530 Nov 22, 2024
bf2db00
feat: refactor edc process state logic
bhautik-sakhiya Nov 22, 2024
8d3a509
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 22, 2024
8cd7174
feat: create wallet script added
nitin-vavdiya Nov 22, 2024
eb428a5
docs: basic doc started
nitin-vavdiya Nov 25, 2024
9cad0fa
docs: doc updated
nitin-vavdiya Nov 25, 2024
a0f386b
feat: add logic to get chat history in api response
bhautik-sakhiya Nov 25, 2024
fbac8d6
fix asset response type from String to Object
smartjigar Nov 25, 2024
3185d01
Merge remote-tracking branch 'origin/dev' into dev
smartjigar Nov 25, 2024
399728f
fix: create wallet script
nitin-vavdiya Nov 25, 2024
01db9ae
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 25, 2024
beffd8c
feat: add enum and return messageStatus in chat history
bhautik-sakhiya Nov 25, 2024
31b0e57
docs: README updated
nitin-vavdiya Nov 25, 2024
ef7ffcc
feat: fix chat history linked with edc issue
bhautik-sakhiya Nov 25, 2024
dd64d5b
fix: query changes for chat history
nitin-vavdiya Nov 25, 2024
bae26ae
feat: display error if message is failed
nitin-vavdiya Nov 25, 2024
211bfa0
chore: unused method removed
nitin-vavdiya Nov 25, 2024
66e1f19
socker integration and conflict resolved
smartjigar Nov 25, 2024
45455c6
Socket integration.
smartjigar Nov 25, 2024
e8531e9
Socket integration.
smartjigar Nov 25, 2024
d2a9304
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
smartjigar Nov 25, 2024
a06f17a
fix: duplicate msg push issue resolved amd config added for producer …
smartjigar Nov 25, 2024
182d50e
docs: add readme for backend section
neha-puraswani Nov 25, 2024
576edbe
fix: wallet creation issue
nitin-vavdiya Nov 25, 2024
d847f02
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 25, 2024
1ba6e2a
fix: add local docker image to handle the EDC operations
dilipdhankecha2530 Nov 25, 2024
c131364
missed msg change and costmatic update.
smartjigar Nov 26, 2024
efe5352
Merge remote-tracking branch 'origin/dev' into dev
smartjigar Nov 26, 2024
98f5de9
docs: UI application doc updated
nitin-vavdiya Nov 26, 2024
d450c7d
feat: change db design and update logic in sendApi method
bhautik-sakhiya Nov 26, 2024
13c3bce
update condition one status and color coding.
smartjigar Nov 26, 2024
e392f5f
fix: color issue
nitin-vavdiya Nov 26, 2024
71437ec
docs: java doc updated
nitin-vavdiya Nov 27, 2024
76941a9
chore: local docker deployment for EDC 0.7.7
dilipdhankecha2530 Nov 27, 2024
d8f5bd9
chore: local docker deployment for EDC 0.7.7
dilipdhankecha2530 Nov 27, 2024
444a39a
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
neha-puraswani Nov 27, 2024
78fabff
docs: config changes and doc added docker-compose file
nitin-vavdiya Nov 27, 2024
14de6ea
docs: local deployment file updated
nitin-vavdiya Nov 27, 2024
288dd9a
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
neha-puraswani Nov 27, 2024
fe0ec29
docs: README updated
nitin-vavdiya Nov 27, 2024
47648ec
docs: Update readme content
neha-puraswani Nov 27, 2024
ec5dad4
docs: Update readme content
neha-puraswani Nov 27, 2024
11a16dd
Merge pull request #9 from smartSenseSolutions/docs-backend-app-docs
nitin-vavdiya Nov 27, 2024
28c6871
docs: Update DB tables information
neha-puraswani Nov 27, 2024
3a3ce52
fix: handle duplicate entry in edc db
bhautik-sakhiya Nov 27, 2024
2394462
fix: remove thread sleep call
bhautik-sakhiya Nov 27, 2024
6e58959
fix: add thread sleep call in transfer process
bhautik-sakhiya Nov 27, 2024
24e5eae
build: add backend and frontend dockerfile
dilipdhankecha2530 Nov 27, 2024
ca18c45
update technical doc.
smartjigar Nov 27, 2024
c741f0d
Merge remote-tracking branch 'origin/dev' into dev
smartjigar Nov 27, 2024
41eee14
update technical doc.
smartjigar Nov 27, 2024
f1fbfbd
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
smartjigar Nov 27, 2024
8b97e75
update technical doc.
smartjigar Nov 27, 2024
c0b2a4e
Merge pull request #10 from smartSenseSolutions/docs-backend-app-docs
smartjigar Nov 27, 2024
d2ba478
build: add migration script which managed by flyway to migrate the ED…
dilipdhankecha2530 Nov 27, 2024
f83063a
feat: add socket call after sender process is done
bhautik-sakhiya Nov 28, 2024
f00418d
docs: doc updated to set smartSense and Catena-X
nitin-vavdiya Nov 28, 2024
ae5fc40
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
nitin-vavdiya Nov 28, 2024
b22ad2c
build: update docker compose file to use the proper naming convention…
dilipdhankecha2530 Nov 28, 2024
015e9a4
build: resolve merge conflict
dilipdhankecha2530 Nov 28, 2024
47f9ed8
docs: add deployment documentation
dilipdhankecha2530 Nov 28, 2024
3b80fa6
fix: update action in socket call and add event listner call
bhautik-sakhiya Nov 28, 2024
ecf10ec
build: handle bp registration in docker deployment
dilipdhankecha2530 Nov 28, 2024
8c86d9a
feat: update message status
nitin-vavdiya Nov 28, 2024
bf77197
fix: timestamp issue
nitin-vavdiya Nov 28, 2024
4d4da3a
fix: send error message
nitin-vavdiya Nov 28, 2024
39ae30c
docs: copyright added in all files
nitin-vavdiya Nov 28, 2024
58df908
chore: database port change
nitin-vavdiya Nov 28, 2024
24c6bef
docs: typo
nitin-vavdiya Nov 28, 2024
ad1c85d
build: refactor the deployment documentation
dilipdhankecha2530 Nov 28, 2024
cb0ebdb
docs: update doc
nitin-vavdiya Nov 28, 2024
ebfc85e
docs: authors added
nitin-vavdiya Nov 28, 2024
9499b2d
feat: workflow file added
nitin-vavdiya Nov 29, 2024
c9ffda1
style: style improvements
khushbooshah7 Nov 29, 2024
9b7d124
Merge branch 'dev' of github.com:smartSenseSolutions/edc-chat-applica…
khushbooshah7 Nov 29, 2024
a8c8959
style: style improvements
khushbooshah7 Nov 29, 2024
8d58b96
docs: Update AUTHORS.md
neha-puraswani Nov 29, 2024
3c63b42
fix: css
nitin-vavdiya Nov 29, 2024
9e6e8c5
name correction
smartjigar Nov 29, 2024
4a5b18f
fix: conflict resolved
nitin-vavdiya Nov 29, 2024
81e66ad
Merge pull request #13 from smartSenseSolutions/style-improvements
nitin-vavdiya Nov 29, 2024
7a503a3
docs: update image with latest UI
dilipdhankecha2530 Nov 29, 2024
9e83827
docs: Update deployment readme
neha-puraswani Nov 29, 2024
00f2c21
Merge pull request #14 from smartSenseSolutions/decos-update-for-windows
nitin-vavdiya Nov 29, 2024
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
61 changes: 61 additions & 0 deletions .github/workflows/build_backend.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---

name: Build docker image- backend application

on:
push:
branches:
- main
# trigger events for SemVer like tags
tags:
# match e.g. 1.1.1 and 1.1.1-rc1
- '[0-9]+.[0-9]+.[0-9]+'
- '[0-9]+.[0-9]+.[0-9]+-*'
pull_request:
branches:
- main


jobs:
build-docker-images-backend:
runs-on: ubuntu-latest
permissions:
packages: write

steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

# Needed to create multi-platfrom image
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1

# Needed to create multi-platfrom image
- name: Set up QEMU
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

# Create SemVer or ref tags dependent of trigger event
- name: Docker meta
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
with:
images: |
${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
tags: |
# set latest tag for main branch
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }},event=pr
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}

- name: Build and push
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
with:
context: .
file: ./edc-chat-app-backend/Dockerfile
platforms: linux/amd64, linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
61 changes: 61 additions & 0 deletions .github/workflows/build_frontend.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---

name: Build docker image- frontend application

on:
push:
branches:
- main
# trigger events for SemVer like tags
tags:
# match e.g. 1.1.1 and 1.1.1-rc1
- '[0-9]+.[0-9]+.[0-9]+'
- '[0-9]+.[0-9]+.[0-9]+-*'
pull_request:
branches:
- main


jobs:
build-docker-images-backend:
runs-on: ubuntu-latest
permissions:
packages: write

steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

# Needed to create multi-platfrom image
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1

# Needed to create multi-platfrom image
- name: Set up QEMU
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

# Create SemVer or ref tags dependent of trigger event
- name: Docker meta
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
with:
images: |
${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
tags: |
# set latest tag for main branch
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }},event=pr
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}

- name: Build and push
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
with:
context: .
file: ./edc-chat-app-ui/Dockerfile
platforms: linux/amd64, linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
93 changes: 0 additions & 93 deletions .github/workflows/codeql.yml

This file was deleted.

79 changes: 0 additions & 79 deletions .github/workflows/snyk-security.yml

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/trufflehog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: "TruffleHog"

on:
push:
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: "0 0 * * *" # Once a day
workflow_dispatch:

permissions:
actions: read
contents: read
security-events: write
id-token: write
issues: write

jobs:
ScanSecrets:
name: Scan secrets
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0 # Ensure full clone for pull request workflows

- name: TruffleHog OSS
id: trufflehog
uses: trufflesecurity/trufflehog@8a8ef8526527dd5f5d731d8e74843c121777b82d #v3.80.2
continue-on-error: true
with:
path: ./ # Scan the entire repository
base: "${{ github.event.repository.default_branch }}" # Set base branch for comparison (pull requests)
extra_args: --filter-entropy=4 --results=verified,unknown --debug

- name: Scan Results Status
if: steps.trufflehog.outcome == 'failure'
run: exit 1 # Set workflow run to failure if TruffleHog finds secrets
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ out/
/.nb-gradle/

### VS Code ###
.vscode/
.vscode/
postgres_data
11 changes: 11 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Authors

The following people have contributed to this repository:

* [Bhautik Sakhiya](https://github.com/bhautik-sakhiya), smartSense Consulting Solutions Pvt Ltd.
* [Dilip Dhankecha](https://github.com/dilipdhankecha2530), smartSense Consulting Solutions Pvt Ltd.
* [Jigar Gadhiya](https://github.com/smartjigar), smartSense Consulting Solutions Pvt Ltd.
* [Khushboo Shah](https://github.com/khushbooshah7), smartSense Consulting Solutions Pvt Ltd.
* [Mittal Vaghela](https://github.com/mittalVaghela), smartSense Consulting Solutions Pvt Ltd.
* [Nitin Vavdiya](https://github.com/nitin-vavdiya), smartSense Consulting Solutions Pvt Ltd.
* [Neha Puraswani](https://github.com/neha-puraswani), smartSense Consulting Solutions Pvt Ltd.
Loading
Loading