Merge branch 'main' into feat/DCMFOSS-60

eclipse-tractusx · Aug 25, 2023 · 425466f · 425466f
2 parents 74c7eac + 3c12ae7
commit 425466f
Show file tree

Hide file tree

Showing 74 changed files with 3,057 additions and 1,327 deletions.
diff --git a/.github/workflows/veracode-pipeline.yml b/.github/workflows/veracode-pipeline.yml
@@ -18,7 +18,6 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ********************************************************************************
 
-
 name: Veracode Static Analysis Pipeline Scan
 
 on:

diff --git a/DEPENDECIES_BACKEND → DEPENDENCIES_BACKEND b/DEPENDECIES_BACKEND → DEPENDENCIES_BACKEND
@@ -44,7 +44,7 @@ maven/mavencentral/org.glassfish.jaxb/txw2/2.3.7, BSD-3-Clause, approved, ee4j.j
 maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.hdrhistogram/HdrHistogram/2.1.12, BSD-2-Clause OR LicenseRef-Public-Domain, approved, CQ13192
 maven/mavencentral/org.hibernate.common/hibernate-commons-annotations/5.1.2.Final, LGPL-2.1-or-later, approved, CQ21943
-maven/mavencentral/org.hibernate/hibernate-core/5.6.14.Final, LGPL-2.1, restricted, clearlydefined
+maven/mavencentral/org.hibernate/hibernate-core/5.6.14.Final, LGPL-2.1-or-later, approved, #1510
 maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255
 maven/mavencentral/org.jboss/jandex/2.4.2.Final, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291

diff --git a/DEPENDECIES_FRONTEND → DEPENDENCIES_FRONTEND b/DEPENDECIES_FRONTEND → DEPENDENCIES_FRONTEND
diff --git a/DEPENDENCIES_SPECIFICATION b/DEPENDENCIES_SPECIFICATION
@@ -0,0 +1,37 @@
+maven/mavencentral/ch.qos.logback/logback-classic/1.2.11, EPL-1.0, approved, CQ13636
+maven/mavencentral/ch.qos.logback/logback-core/1.2.11, EPL-1.0, approved, CQ13635
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.4, Apache-2.0, approved, #2133
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4, Apache-2.0, approved, #2134
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.8, Apache-2.0, approved, clearlydefined
+maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
+maven/mavencentral/javax.annotation/javax.annotation-api/1.3.2, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ16910
+maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302
+maven/mavencentral/org.apache.logging.log4j/log4j-api/2.17.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.17.2, Apache-2.0, approved, #2163
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.65, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.65, Apache-2.0, approved, CQ20193
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.65, Apache-2.0, approved, CQ20194
+maven/mavencentral/org.openapitools/jackson-databind-nullable/0.2.0, Apache-2.0, approved, #3294
+maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842
+maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
+maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.4, Apache-2.0, approved, #4314
+maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.4, Apache-2.0, approved, #4307
+maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.4, Apache-2.0, approved, #4327
+maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.4, Apache-2.0, approved, #4305
+maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.4, Apache-2.0, approved, #4304
+maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.4, Apache-2.0, approved, #4308
+maven/mavencentral/org.springframework.boot/spring-boot/2.7.4, Apache-2.0, approved, #4322
+maven/mavencentral/org.springframework.data/spring-data-commons/2.7.3, Apache-2.0, approved, #2768
+maven/mavencentral/org.springframework/spring-aop/5.3.23, Apache-2.0, approved, CQ23152
+maven/mavencentral/org.springframework/spring-beans/5.3.23, Apache-2.0, approved, CQ23153
+maven/mavencentral/org.springframework/spring-context/5.3.23, Apache-2.0, approved, CQ23051
+maven/mavencentral/org.springframework/spring-core/5.3.23, Apache-2.0 AND BSD-3-Clause, approved, CQ23154
+maven/mavencentral/org.springframework/spring-expression/5.3.23, Apache-2.0, approved, CQ23155
+maven/mavencentral/org.springframework/spring-jcl/5.3.23, Apache-2.0, approved, CQ23156
+maven/mavencentral/org.springframework/spring-web/5.3.23, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157
+maven/mavencentral/org.springframework/spring-webmvc/5.3.23, Apache-2.0, approved, CQ23158
+maven/mavencentral/org.yaml/snakeyaml/1.30, Apache-2.0, approved, clearlydefined
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/NOTICE.md b/NOTICE.md
@@ -36,7 +36,9 @@ The project maintains the following source code repositories:
 
 This project leverages the following third party content.
 
-See DEPENDENCIES file.
+
+See DEPENDENCIES_BACKEND, DEPENDENCIES_FRONTEND and DEPENDENCIES_SPECIFICATION file.
+
 
 ## Cryptography
 

diff --git a/...usx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/CapacityGroupController.java b/...usx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/CapacityGroupController.java
@@ -26,10 +26,10 @@
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.CapacityGroupDefaultViewResponse;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.CapacityGroupRequest;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.CapacityGroupResponse;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.MaterialDemandResponse;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CapacityGroupService;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -40,14 +40,20 @@ public class CapacityGroupController implements CapacityGroupApi {
     private final CapacityGroupService capacityGroupService;
 
     @Override
-    public ResponseEntity<List<CapacityGroupDefaultViewResponse>> getCapacityGroup() throws Exception {
-        return null;
+    public ResponseEntity<List<CapacityGroupDefaultViewResponse>> getCapacityGroup() {
+        List<CapacityGroupDefaultViewResponse> capacityGroupDefaultViewResponseList = capacityGroupService.getAll();
+        return ResponseEntity.status(HttpStatus.OK).body(capacityGroupDefaultViewResponseList);
     }
 
     @Override
-    public ResponseEntity<CapacityGroupResponse> postCapacityGroup(CapacityGroupRequest capacityGroupRequest)
-        throws Exception {
-        capacityGroupService.createCapacityGroup(capacityGroupRequest);
-        return null;
+    public ResponseEntity<CapacityGroupResponse> getCapacityGroupById(String capacityGroupId) {
+        CapacityGroupResponse responseDto = capacityGroupService.getCapacityGroupById(capacityGroupId);
+        return ResponseEntity.status(HttpStatus.OK).body(responseDto);
+    }
+
+    @Override
+    public ResponseEntity<CapacityGroupResponse> postCapacityGroup(CapacityGroupRequest capacityGroupRequest) {
+        CapacityGroupResponse capacityGroupResponse = capacityGroupService.createCapacityGroup(capacityGroupRequest);
+        return ResponseEntity.status(HttpStatus.OK).body(capacityGroupResponse);
     }
 }
diff --git a/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/DemandController.java b/...e/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/DemandController.java
@@ -23,9 +23,6 @@
 package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
 
 import eclipse.tractusx.demand_capacity_mgmt_specification.api.DemandApi;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.DemandRequestDto;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.DemandRequestUpdateDto;
-import eclipse.tractusx.demand_capacity_mgmt_specification.model.DemandResponseDto;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.MaterialDemandRequest;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.MaterialDemandResponse;
 import java.util.List;
@@ -68,9 +65,9 @@ public ResponseEntity<MaterialDemandResponse> postDemand(MaterialDemandRequest m
     @Override
     public ResponseEntity<MaterialDemandResponse> updateDemandsById(
         String demandId,
-        DemandRequestUpdateDto demandRequestUpdateDto
+        MaterialDemandRequest materialDemandRequest
     ) {
-        MaterialDemandResponse responseDto = demandService.updateDemand(demandId, demandRequestUpdateDto);
+        MaterialDemandResponse responseDto = demandService.updateDemand(demandId, materialDemandRequest);
         return ResponseEntity.status(HttpStatus.OK).body(responseDto);
     }
 }