Feat/docker images

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

@@ -19,22 +19,21 @@
 #   ********************************************************************************
 
 
-name: build-and-push-image-backend
+name: Build - Docker image (SemVer)
 
 on:
   push:
-    paths:
-      - 'demand-capacity-mgmt-backend/**'
-      - 'demand-capacity-mgmt-specification/**'
     branches:
-      - 'main'
+      - main
     tags:
       - 'v*.*.*'
       - 'v*.*.*-*'
+  pull_request:
+    branches:
+      - main
 
 env:
   IMAGE_NAME: 'demand-capacity-mgmt-backend'
-  REGISTRY: 'docker.io'
   IMAGE_NAMESPACE: 'tractusx'
 
 
@@ -49,46 +48,49 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Run Tests
-        run: ./demand-capacity-mgmt-backend/mvnw -B test
-
-      - name: Build
-        run: mvn -B package
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       # Create SemVer or ref tags dependent of trigger event
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}
+            ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
+          # Automatically prepare image tags; See action docs for more examples.
+          # semver patter will generate tags like these for example :1 :1.2 :1.2.3
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
-            type=semver ,pattern={{major}}
+            type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+      - name: DockerHub login
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          # Use existing DockerHub credentials present as secrets
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./build/backend/Dockerfile
-          #push: ${{ github.event_name != 'pull_request' }}
-          push: true
-          # build tag :latest
-          tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{ github.repository }}/${{ env.IMAGE_NAME }}:latest
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: |
+            ${{ steps.meta.outputs.tags }},
+            ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest
           labels: ${{ steps.meta.outputs.labels }}
+
+
+      # https://github.com/peter-evans/dockerhub-description
+      # Important step to push image description to DockerHub
+      - name: Update Docker Hub description
+        if: github.event_name != 'pull_request'
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          # readme-filepath defaults to toplevel README.md, Only necessary if you have a dedicated file with your 'Notice for docker images'
+          readme-filepath: DOCKER_NOTICE.md
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}

.gitignore

@@ -40,4 +40,8 @@ target/
 
 demand-capacity-mgmt-backend/.mvn/wrapper/maven-wrapper.jar
 .env
+keycloak/generate-secret.sh
+keycloak/init-db.sql
+keycloak/realm-export.json
 keycloak/
+

Dockerfile

@@ -4,10 +4,10 @@ USER root
 RUN microdnf install -y jq wget
 
 # Copy the scripts to the container
-COPY keycloak/generate-secret.sh /config/generate-secret.sh
+#COPY keycloak/generate-secret.sh /config/generate-secret.sh
 
 # Make the scripts executable
-RUN chmod +x /config/generate-secret.sh
+#RUN chmod +x /config/generate-secret.sh
 
 # Switch back to the jboss user
 USER jboss

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

@@ -0,0 +1,68 @@
+/*
+ * ******************************************************************************
+ * 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
+ * *******************************************************************************
+ */
+
+package org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.controllers;
+
+import eclipse.tractusx.demand_capacity_mgmt_specification.api.AddressBookApi;
+import eclipse.tractusx.demand_capacity_mgmt_specification.model.AddressBookRequest;
+import eclipse.tractusx.demand_capacity_mgmt_specification.model.AddressBookResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.AddressBookService;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+@RestController
+@AllArgsConstructor
+public class AddressBookController implements AddressBookApi {
+
+    private final AddressBookService service;
+    private HttpServletRequest request;
+
+    @Override
+    public ResponseEntity<Void> deleteAddressBook(AddressBookRequest addressBookRequest) throws Exception {
+        if(UserUtil.getUserRole(request).equals(Role.ADMIN)){
+            service.deleteRecord(addressBookRequest);
+            return ResponseEntity.status(201).build();
+        }
+        return ResponseEntity.status(401).build();
+
+    }
+
+    @Override
+    public ResponseEntity<AddressBookResponse> getAddressBook(AddressBookRequest addressBookRequest) throws Exception {
+        return ResponseEntity.status(200).body(service.getRecord(addressBookRequest));
+    }
+
+    @Override
+    public ResponseEntity<List<AddressBookResponse>> getAllAddressBooks() throws Exception {
+        return ResponseEntity.status(200).body(service.getRecords());
+    }
+
+    @Override
+    public ResponseEntity<AddressBookResponse> postAddressBook(AddressBookRequest addressBookRequest) throws Exception {
+        return ResponseEntity.status(200).body(service.postRecord(addressBookRequest));
+    }
+}

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

@@ -24,40 +24,49 @@
 
 import eclipse.tractusx.demand_capacity_mgmt_specification.api.CapacityGroupApi;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.*;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.entities.enums.Role;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CapacityGroupService;
+import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.utils.UserUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @AllArgsConstructor
 public class CapacityGroupsController implements CapacityGroupApi {
 
     private CapacityGroupService service;
+    private HttpServletRequest request;
 
     @Override
     public ResponseEntity<List<CapacityGroupDefaultViewResponse>> getCapacityGroups() {
-        List<CapacityGroupDefaultViewResponse> capacityGroupDefaultViewResponses = service.getAll();
+        String userID = UserUtil.getUserID(request);
+        Role userRole = UserUtil.getUserRole(request);
+        List<CapacityGroupDefaultViewResponse> capacityGroupDefaultViewResponses = service.getAll(userID,userRole);
         return ResponseEntity.status(HttpStatus.OK).body(capacityGroupDefaultViewResponses);
     }
 
     @Override
-    public ResponseEntity<CapacityGroupResponse> getCapacityGroupById(String capacityGroupId) {
-        CapacityGroupResponse capacityGroupResponse = service.getCapacityGroupById(capacityGroupId);
+    public ResponseEntity<SingleCapacityGroup> getCapacityGroupById(String capacityGroupId) {
+        SingleCapacityGroup capacityGroupResponse = service.getCapacityGroupById(capacityGroupId);
         return ResponseEntity.status(HttpStatus.OK).body(capacityGroupResponse);
     }
 
     @Override
     public ResponseEntity<CapacityGroupResponse> postCapacityGroup(CapacityGroupRequest capacityGroupRequest) {
-        CapacityGroupResponse capacityGroupResponse = service.createCapacityGroup(capacityGroupRequest);
+        String userID = UserUtil.getUserID(request);
+        CapacityGroupResponse capacityGroupResponse = service.createCapacityGroup(capacityGroupRequest, userID);
         return ResponseEntity.status(HttpStatus.OK).body(capacityGroupResponse);
     }
 
     @Override
     public ResponseEntity<Void> postLinkedCapacityGroupDemand(LinkCGDSRequest linkCGDSRequest) throws Exception {
-        service.linkCapacityGroupToMaterialDemand(linkCGDSRequest);
+        String userID = UserUtil.getUserID(request);
+        service.linkCapacityGroupToMaterialDemand(linkCGDSRequest, userID);
         return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
     }
 }

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

@@ -24,7 +24,6 @@
 
 import eclipse.tractusx.demand_capacity_mgmt_specification.api.CompanyApi;
 import eclipse.tractusx.demand_capacity_mgmt_specification.model.CompanyDto;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import org.eclipse.tractusx.demandcapacitymgmt.demandcapacitymgmtbackend.services.CompanyService;
@@ -43,4 +42,10 @@ public ResponseEntity<List<CompanyDto>> getCompany() throws Exception {
         List<CompanyDto> companyDtoList = companyService.getAllCompany();
         return ResponseEntity.status(HttpStatus.OK).body(companyDtoList);
     }
+
+    @Override
+    public ResponseEntity<List<CompanyDto>> getTopCompanies() throws Exception {
+        List<CompanyDto> companyDtoList = companyService.getTopCompanies();
+        return ResponseEntity.status(HttpStatus.OK).body(companyDtoList);
+    }
 }