Merge pull request #66 from eclipse-tractusx/consortia-cleanup

Consortia cleanup

.env

@@ -0,0 +1,42 @@
+# *******************************************************************************
+# Copyright (c) 2023 BMW AG
+# Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#   See the NOTICE file(s) distributed with this work for additional
+#   information regarding copyright ownership.
+#
+#   This program and the accompanying materials are made available under the
+#   terms of the Apache License, Version 2.0 which is available at
+#   https://www.apache.org/licenses/LICENSE-2.0.
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+#   SPDX-License-Identifier: Apache-2.0
+#   ********************************************************************************
+
+VAULT_ADDR=
+VAULT_TOKEN=
+SECRET_PATH=
+DB_VENDOR=
+DB_ADDR=
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+POSTGRES_DB=
+POSTGRES_PORT=
+KEYCLOAK_PORT=
+KEYCLOAK_USER=
+KEYCLOAK_PASSWORD=
+KEYCLOAK_ADDRESS=
+KEYCLOAK_REALM=
+
+BASE_URL=
+API_KEY=
+
+TOKEN_ENDPOINT=
+CLIENT_ID=
+CLIENT_SECRET=
+GRANT_TYPE=

.github/workflows/build-backend.yml

@@ -68,7 +68,7 @@ jobs:
 #          restore-keys: ${{ runner.os }}-m2
 #
 #      - name: Build and analyze
-#        env:
+#        .env:
 #          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
 #          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=catenax-ng_tx-demand-capacity-mgmt-backend
+#        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=eclipse-tractusx_demand-capacity-mgmt-backend

.github/workflows/build-frontend.yml

@@ -42,9 +42,9 @@ jobs:
       - name: Install Dependencies
         run: |
           cd ./demand-capacity-mgmt-frontend 
-          yarn
+          npm install --save --legacy-peer-deps
 
       - name: Build Library and Portal
         run: |
           cd ./demand-capacity-mgmt-frontend 
-          yarn build
+          npm run build

.github/workflows/build-master-backend.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ ..env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -90,5 +90,5 @@ jobs:
           #push: ${{ github.event_name != 'pull_request' }}
           push: true
           # build tag :latest
-          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest
+          tags: ${{ steps.meta.outputs.tags }}, ${{ ..env.REGISTRY }}/${{ github.repository }}/${{ ..env.IMAGE_NAME }}:latest
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-master-frontend.yml

@@ -73,7 +73,7 @@ jobs:
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ .env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -83,5 +83,5 @@ jobs:
           context: .
           file: ./build/frontend/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest
+          tags: ${{ steps.meta.outputs.tags }}, ${{ .env.REGISTRY }}/${{ github.repository }}/${{ .env.IMAGE_NAME }}:latest
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -39,5 +39,11 @@ target/
 .idea/*
 
 demand-capacity-mgmt-backend/.mvn/wrapper/maven-wrapper.jar
-.env
+
+keycloak/generate-secret.sh
+keycloak/init-db.sql
+keycloak/realm-export.json
 keycloak/
+node_modules/
+
+charts/edc/chart/edc.dcm.aes.key

CHANGELOG.md

@@ -0,0 +1,96 @@
+# Changelog
+
+The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+All notable changes to this project will be documented in this file see also the overarching [`CHANGELOG.md`](https://eclipse-tractusx.github.io/changelog) for Tractus-X releases.
+
+## [Unreleased]
+
+### Application Endpoints Implemented:
+
+#### User Management:
+- Create year report: POST /year/report
+- Post alerts: POST /alerts
+- Retrieve alerts: GET /alerts
+- Trigger alerts: POST /triggeredAlerts
+- Retrieve triggered alerts: GET /triggeredAlerts
+- Retrieve user details: GET /user
+- Update user details: PUT /user
+
+#### Logging History:
+- Log events: POST /loggingHistory
+- Retrieve logs: GET /loggingHistory
+- Delete logs: DELETE /loggingHistory
+- Filter logs: GET /loggingHistory/filterLogs
+- Delete specific log: DELETE /loggingHistory/{log_id}
+- Archive logs: POST /loggingHistory/archivedLog
+- Retrieve archived logs: GET /loggingHistory/archivedLog
+- Delete archived log: DELETE /loggingHistory/archivedLog
+- Delete specific archived log: DELETE /loggingHistory/archivedLog/{log_id}
+
+#### Favorites:
+- Retrieve favorite material demands: GET /loggingHistory/favoriteMaterialDemands
+- Retrieve favorite capacity groups: GET /loggingHistory/favoriteCapacityGroups
+- Retrieve favorite items: GET /favorite
+- Add item to favorites: POST /favorite
+- Remove item from favorites: DELETE /favorite
+
+#### Address Book:
+- Retrieve address book: GET /addressBook
+- Add contact to address book: POST /addressBook
+- Delete contact from address book: DELETE /addressBook
+- Query address book: GET /addressBook/query
+- Update contact details: PUT /addressBook/{address_book_id}
+
+#### Statuses:
+- Create status: POST /statuses
+- Retrieve statuses: GET /statuses
+- Update status: PUT /statuses
+
+#### Demand Management:
+- Post demand: POST /demand
+- Retrieve demand: GET /demand
+- Retrieve demand series: GET /demand/series/{material_demand_id}
+- Retrieve all demand series: GET /demand/series
+- Create demand series: POST /demand/series
+- Unlink demand series: POST /demand/series/unlink
+- Retrieve specific demand: GET /demand/{demand_id}
+- Update specific demand: PUT /demand/{demand_id}
+- Delete specific demand: DELETE /demand/{demand_id}
+
+#### Capacity Group Management:
+- Link capacity group: POST /capacityGroup/link
+- Retrieve all capacity groups: GET /capacityGroup
+- Create capacity group: POST /capacityGroup
+- Retrieve specific capacity group: GET /capacityGroup/{capacityGroup_id}
+- Retrieve week-based capacity groups: GET /weekbasedcapacitygroup
+- Create week-based capacity group: POST /weekbasedcapacitygroup
+- Update week-based capacity group: PUT /weekbasedcapacitygroup/{weekBasedCapacity_id}
+- Update week-based material demand: PUT /weekBasedMaterialDemand/{weekBasedMaterialDemand_id}
+- Retrieve week-based material demand: GET /weekBasedMaterialDemand
+
+### Additional Configurations and Connections:
+
+#### Keycloak Configuration:
+- Set up Keycloak for user authentication and authorization
+
+#### Front-end Pages:
+- Designed and implemented front-end pages:
+  - Login page
+  - Dashboard page
+  - Reports page
+  - Alerts page
+  - User profile page
+  - Address book page
+  - Statuses page
+  - Favorites page
+
+#### Backend-Frontend Connection:
+- Established connection between backend and frontend:
+  - Integrated API endpoints with front-end components
+  - Implemented data fetching and updating functionalities
+  - Ensured secure communication and data transfer
+
+#### Testing:
+- Implemented front-end and back-end tests to ensure functionality and reliability
+- All tests passing without errors