Skip to content

Commit

Permalink
Merge pull request #13 from catenax-ng/1.1.0-RC
Browse files Browse the repository at this point in the history
[Draft] Preparing 1.1.0 release
  • Loading branch information
mkanal authored Feb 8, 2023
2 parents 71be8a0 + 32fd602 commit a06b374
Show file tree
Hide file tree
Showing 13 changed files with 82 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/sonar-scan.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: "Sonar Cloud Analyze"
on:
workflow_dispatch:
push:
branches:
- main
Expand Down Expand Up @@ -33,4 +34,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION }}
SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY }}
run: ./gradlew build sonarqube --info
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ sonarqube {

val commonsCodecVersion = "1.15"
val commonsIoVersion = "2.11.0"
val groovyVersion = "4.0.7"
val groovyVersion = "4.0.8"
val spockBomVersion = "2.3-groovy-4.0"
val springfoxVersion = "3.0.0"
val feignVersion = "12.1"
Expand Down Expand Up @@ -132,7 +132,7 @@ dependencies {
implementation("org.postgresql:postgresql")
implementation("org.flywaydb:flyway-core")

implementation("com.auth0:java-jwt:4.2.1")
implementation("com.auth0:java-jwt:4.2.2")
implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")

implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
Expand Down
2 changes: 1 addition & 1 deletion charts/product-traceability-foss-backend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
condition: pgadmin4.enabled
- name: irs-helm
repository: https://catenax-ng.github.io/tx-item-relationship-service
version: 4.1.0
version: 4.2.1
condition: irs-helm.enabled
- name: irs-edc-consumer
repository: https://catenax-ng.github.io/tx-item-relationship-service
Expand Down
2 changes: 1 addition & 1 deletion charts/product-traceability-foss-backend/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pgadmin4:
password: "<path:traceability-foss/data/dev/database#pgadminPassword>"
variables:
- name: PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED
value: "false"
value: "False"
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion charts/product-traceability-foss-backend/values-int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pgadmin4:
password: "<path:traceability-foss/data/int/database#pgadminPassword>"
variables:
- name: PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED
value: "false"
value: "False"
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion charts/product-traceability-foss-backend/values-pen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pgadmin4:
password: <path:traceability-foss/data/pen/database#pgadminPassword>
variables:
- name: PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED
value: "false"
value: "False"
resources:
limits:
cpu: 1000m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ pgadmin4:
password: "<path:traceability-foss/data/dev/database#pgadminPassword>"
variables:
- name: PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED
value: "false"
value: "False"
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion charts/product-traceability-foss-backend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace: product-traceability-foss
replicaCount: 1

image:
repository: ghcr.io/catenax-ng/product-traceability-foss-backend
repository: ghcr.io/catenax-ng/tx-traceability-foss-backend
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "{{ .Chart.AppVersion }}"
Expand Down
67 changes: 67 additions & 0 deletions docs/src/docs/user/user-manual.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ Navigates to the own manufactured parts and batches list view.
=== Other parts
Navigates to the supplied with parts and batches list view.

=== Quality investigation
Navigates to the inbox and outgoing notifications.

=== Administration
Only applicable for the admin user role. Possibility to check the network status based on logfiles and will provide access to configuration possibilities for the application.

Expand Down Expand Up @@ -64,6 +67,11 @@ Detailed information on the IDs for the manufactured part/batch.
==== Customer data
Information about the identifiers at the customer for the respective part/batch.

==== Investigation for components
Select one or multiple child components/parts/batches that are build into your part. Selection will enable you to create a quality investigation (notification) to your supplier. The quality investigation will be added to a queue (queued & requested inbox) and not directly be send to the supplier.

Once the quality investigation is created you will get a pop-up and can directly navigate to the inbox for further action.

== Other parts
List view of the supplied with parts and batches (Supplier parts).
Gives detailed information on the assets registered in the Digital Twin Registry of Catena-X for the supplier companies. This includes data that is ingested based on the aspect model AssemblyPartRelationship of the child parts for Use Case Traceability aspect models: SerialPartTypization, Batch.
Expand All @@ -82,3 +90,62 @@ Detailed information on the IDs for the supplier part/batch.

==== Customer data
Information about the identifiers at the customer (in this case own company) for the respective part/batch.

=== Supplier parts select / Quality Investigation
Select one or multiple child components/parts/batches that are build into your part. Selection will enable you to create a quality investigation (notification) to your supplier. The quality investigation will be added to a queue (queued & requested inbox) and not directly be send to the supplier.

Once the quality investigation is created you will get a pop-up and can directly navigate to the inbox for further action.

== Quality investigation
Inbox for received quality investigations and "Queued & Requested" inbox for outgoing draft as well as already sent notifications.

image:../../images/arc42/user-guide/notification-drafts.png[] Received notifications.

Notifications in the context of quality investigations received by a customer. Those notifications specify a defect or request to investigate on a specific part / batch on your side and give feedback to the customer.

image:../../images/arc42/user-guide/notification-send.png[] Queued & Requested notifications.

Notifications in the context of quality investigations that are in queued/draft status or already requested/sent to the supplier. Those notifications specify a defect or request to investigate on a specific part / batch on your suppliers side and give feedback back to you.

* Queued status: Quality investigation is created but not yet released.
* Requested status: Quality investigation is sent to the supplier.

=== Quality investigation status
Following status for a quality investigation (notification) are possible.

|===
|Status |Description

|Queued
|A quality investigation that was created by a user but not yet send to the receiver.

|Requested
|Created quality investigation that is already sent to the receiver.

|Cancelled
|Created quality investigation that is not yet send to the receiver and got cancelled on sender side before doing so. It is no longer valid / necessary.

|Received
|Received notification from a sender which needs to be investigated.

|Acknowledged
|The receiver acknowledged to work on the received inquiry.

|Accepted
|The receiver accepted the inquiry. Issue on part/batch detected.

|Declined
|The receiver declined the inquiry. No issue on part/batch detected.

|Closed
|The sender closed the quality investigation and no further handling with it is possible.
|===

=== Quality investigation status flow
Notifications always have a status. The transition from one status to a subsequent status is described in the below state model.

The Sender can change the status to closed from any status. The receiver can never change the status to closed.

The legend in the below state diagram describes who can set the status. One exception to this rule: the transition from status SENT to status RECEIVED is done automatically once the sender receives the Http status code 201.

image::../../images/arc42/user-guide/notificationstatemodel.png[Notification state model]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/main/resources/application-int.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ feign:

edc:
callback-urls: http://tracex-irs:8181/internal/endpoint-data-reference
bpn-provider-url-mappings:
"BPNL00000003CSGV": "https://edc.apps.int.ocp.cx.dps.oncite.cloud"
"BPNL00000003AZQP": "https://sapse-7a219546-de.int.cx.dih-cloud.com"
"BPNL00000003CML1": "https://tracex-consumer-controlplane.dev.demo.catena-x.net"

0 comments on commit a06b374

Please sign in to comment.