Merge pull request #8 from catenax-ng/feature/DCMFOSS-61

Frontend fully conected to backend

.github/workflows/veracode-pipeline.yml

@@ -18,7 +18,6 @@
 #   SPDX-License-Identifier: Apache-2.0
 #   ********************************************************************************
 
-
 name: Veracode Static Analysis Pipeline Scan
 
 on:

DEPENDENCIES_FRONTEND

@@ -300,7 +300,7 @@ npm/npmjs/-/escape-string-regexp/2.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/escape-string-regexp/4.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/escodegen/2.1.0, BSD-2-Clause AND (BSD-2-Clause AND BSD-3-Clause), approved, #9306
 npm/npmjs/-/eslint-config-react-app/7.0.1, MIT, approved, clearlydefined
-npm/npmjs/-/eslint-import-resolver-node/0.3.7, MIT, approved, clearlydefined
+npm/npmjs/-/eslint-import-resolver-node/0.3.7, MIT, approved, #9923
 npm/npmjs/-/eslint-module-utils/2.8.0, MIT, approved, #8209
 npm/npmjs/-/eslint-plugin-flowtype/8.0.3, BSD-3-Clause, approved, #2958
 npm/npmjs/-/eslint-plugin-import/2.27.5, MIT, approved, #6937
@@ -310,7 +310,7 @@ npm/npmjs/-/eslint-plugin-react-hooks/4.6.0, MIT, approved, clearlydefined
 npm/npmjs/-/eslint-plugin-react/7.32.2, MIT, approved, #7035
 npm/npmjs/-/eslint-plugin-testing-library/5.11.0, MIT, approved, clearlydefined
 npm/npmjs/-/eslint-scope/5.1.1, BSD-2-Clause, approved, clearlydefined
-npm/npmjs/-/eslint-scope/7.2.1, BSD-2-Clause, approved, clearlydefined
+npm/npmjs/-/eslint-scope/7.2.1, BSD-2-Clause, approved, #9916
 npm/npmjs/-/eslint-utils/2.1.0, MIT, approved, #2498
 npm/npmjs/-/eslint-visitor-keys/1.3.0, Apache-2.0, approved, #2501
 npm/npmjs/-/eslint-visitor-keys/2.1.0, Apache-2.0, approved, #2433
@@ -1350,7 +1350,7 @@ npm/npmjs/@babel/plugin-transform-unicode-regex/7.22.5, MIT, approved, #8929
 npm/npmjs/@babel/plugin-transform-unicode-sets-regex/7.22.5, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-2-Clause AND BSD-3-Clause, approved, #8755
 npm/npmjs/@babel/preset-env/7.22.5, MIT AND (BSD-2-Clause AND ISC AND MIT) AND BSD-2-Clause AND BSD-3-Clause, approved, #8748
 npm/npmjs/@babel/preset-flow/7.22.5, MIT, approved, #8974
-npm/npmjs/@babel/preset-modules/0.1.5, MIT, approved, clearlydefined
+npm/npmjs/@babel/preset-modules/0.1.5, MIT, approved, #9932
 npm/npmjs/@babel/preset-react/7.22.5, MIT, approved, #8987
 npm/npmjs/@babel/preset-typescript/7.22.5, MIT, approved, #9074
 npm/npmjs/@babel/register/7.22.5, MIT, approved, #8959
@@ -1379,7 +1379,7 @@ npm/npmjs/@csstools/selector-specificity/2.2.0, CC0-1.0, approved, clearlydefine
 npm/npmjs/@eslint-community/eslint-utils/4.4.0, MIT, approved, #8032
 npm/npmjs/@eslint-community/regexpp/4.5.1, MIT, approved, clearlydefined
 npm/npmjs/@eslint/eslintrc/0.4.3, MIT, approved, clearlydefined
-npm/npmjs/@eslint/eslintrc/2.1.0, MIT, approved, clearlydefined
+npm/npmjs/@eslint/eslintrc/2.1.0, MIT, approved, #9908
 npm/npmjs/@eslint/js/8.44.0, MIT, approved, clearlydefined
 npm/npmjs/@hapi/hoek/9.3.0, BSD-3-Clause AND MIT, approved, #6651
 npm/npmjs/@hapi/topo/5.1.0, BSD-3-Clause, approved, clearlydefined
@@ -1417,7 +1417,7 @@ npm/npmjs/@jridgewell/set-array/1.1.2, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/source-map/0.3.5, MIT, approved, #9304
 npm/npmjs/@jridgewell/sourcemap-codec/1.4.14, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/sourcemap-codec/1.4.15, MIT, approved, clearlydefined
-npm/npmjs/@jridgewell/trace-mapping/0.3.18, MIT, approved, clearlydefined
+npm/npmjs/@jridgewell/trace-mapping/0.3.18, MIT, approved, #9904
 npm/npmjs/@leichtgewicht/ip-codec/2.0.4, MIT, approved, clearlydefined
 npm/npmjs/@nicolo-ribaudo/eslint-scope-5-internals/5.1.1-v1, MIT, approved, clearlydefined
 npm/npmjs/@nicolo-ribaudo/semver-v6/6.3.3, ISC, approved, #9315

NOTICE.md

@@ -36,7 +36,9 @@ The project maintains the following source code repositories:
 
 This project leverages the following third party content.
 
-See DEPENDENCIES_FRONTEND, DEPENDENCIES_BACKEND and DEPENDENCIES_SPECIFICATION  files.
+
+See DEPENDENCIES_BACKEND, DEPENDENCIES_FRONTEND and DEPENDENCIES_SPECIFICATION file.
+
 
 ## Cryptography
 

demand-capacity-mgmt-backend/src/main/java/org/eclipse/tractusx/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);
     }
 }

demand-capacity-mgmt-backend/src/main/java/org/eclipse/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);
     }
 }

demand-capacity-mgmt-backend/src/main/java/org/eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/controllers/WeekBasedCapacityGroupController.java

@@ -37,25 +37,11 @@ public class WeekBasedCapacityGroupController implements WeekBasedCapacityGroupA
 
     private final WeekBasedCapacityGroupService weekBasedCapacityGroupService;
 
-    /*  @Override
+    @Override
     public ResponseEntity<Void> postWeekBasedCapacityGroup(
         List<WeekBasedCapacityGroupRequest> weekBasedCapacityGroupRequest
     ) {
         weekBasedCapacityGroupService.createWeekBasedCapacityGroup(weekBasedCapacityGroupRequest);
         return ResponseEntity.status(HttpStatus.OK).build();
-    }*/
-
-    /*public ResponseEntity<Void> postWeekBasedCapacityGroup(
-        List<WeekBasedCapacityGroupRequest> weekBasedCapacityGroupRequest
-    ) throws Exception {
-        weekBasedCapacityGroupService.createWeekBasedCapacityGroup(weekBasedCapacityGroupRequest);
-        return ResponseEntity.status(HttpStatus.OK).build();
-    }*/
-
-    @Override
-    public ResponseEntity<Void> postWeekBasedCapacityGroup(
-        List<WeekBasedCapacityGroupRequest> weekBasedCapacityGroupRequest
-    ) throws Exception {
-        return null;
     }
 }