BENCH-56: Bench 56 v2

.env

@@ -0,0 +1,5 @@
+COMPOSE_PROJECT_NAME=answer-king-rest-api
+MYSQLDB_ROOT_PASSWORD=
+MYSQLDB_DATABASE=answer_king
+MYSQLDB_USER=test_user
+MYSQLDB_PASSWORD=

.github/dependabot.yml

@@ -0,0 +1,34 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    target-branch: "main"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "09:00"
+      timezone: "Europe/London"
+    open-pull-requests-limit: 10
+    labels:
+      - "Dependabot"
+    commit-message:
+      prefix: "(fix) update"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "main"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "09:00"
+      timezone: "Europe/London"
+    open-pull-requests-limit: 10
+    labels:
+      - "Dependabot"
+    commit-message:
+      prefix: "(fix) update"

.github/workflows/approve_dependabot_pr.yml

@@ -0,0 +1,27 @@
+
+name: Approve dependabot pr
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.5
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Approve pr
+        run: gh pr review --approve "$PR_URL"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_URL: ${{ github.event.pull_request.html_url }}

.github/workflows/build_docker_package.yml

@@ -0,0 +1,64 @@
+name: Docker Image Pipeline
+on:
+  workflow_run:
+    workflows: ["Integration and code analysis"]
+    branches:
+      - main
+      - master
+      - develop
+    types:
+      - completed
+
+env:
+  REGISTRY: ghcr.io/answerconsulting/answerking-java
+  IMAGE_NAME: answer-king-rest-api_app #${{ github.repository }}
+
+jobs:
+  on-success:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+          cache: 'maven'
+
+      - name: Build with Maven
+        run: mvn install -DskipTests
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build using docker-compose template
+        run: docker-compose build
+
+      - name: List Docker images
+        run: docker images
+
+      # - name: Push images
+      #  run: docker-compose push #--ignore-push-failures
+
+      - name: Tag docker image
+        run: docker tag answer-king-rest-api_app ghcr.io/answerconsulting/answerking-java/answer-king-rest-api_app:latest
+
+      - name: Push images
+        run: docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

.github/workflows/build_integration_and_code_analysis.yml

@@ -0,0 +1,80 @@
+name: Integration and code analysis
+on:
+  workflow_dispatch: null
+  push:
+    branches:
+      - main
+      - master
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+    schedule:
+      - cron: '* 5 * * *'
+jobs:
+  Sonar-Cloud:
+    name: Static Code Analysis - Sonar Cloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+          cache: 'maven'
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build and analyze
+        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=answer-king-rest-api
+
+  Build-Test:
+    name: Integration Test
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+          cache: 'maven'
+
+      - name: Build with Maven
+        run: mvn install -DskipTests
+
+      - name: Run tests with Maven
+        run: mvn test
+
+      - name: Run code coverage report
+        run: mvn jacoco:report
+
+      - name: Run code coverage check
+        run: mvn clean verify
+
+      - name: Publish test coverage results
+        id: jacoco_reporter
+        uses: PavanMudigonda/jacoco-reporter@v4.6
+        with:
+          coverage_results_path: 'target/site/jacoco/jacoco.xml'
+          coverage_report_title: 'Test coverage results'
+          coverage_report_name: 'Test coverage results'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,5 +1,4 @@
-FROM openjdk:17-jdk-alpine
-MAINTAINER benjamin.hession@answerdigital.com
+FROM amazoncorretto:17
 COPY target/answer-king-rest-api-0.0.1.jar answerking-0.0.1.jar
 ADD ./src/main/resources/application.yaml application.yaml
 ENTRYPOINT ["java","-D--spring.config.location=classpath:file:/application-yaml","-jar","/answerking-0.0.1.jar"]

README.md

@@ -1,7 +1,7 @@
 # Answer King REST API
 
-The Answer King REST API is the backend for a fast food business. It allows items and categories to be created and 
-orders to be placed. An item can be included in multiple categories.
+The Answer King REST API is the backend for a fast food business. It allows products and categories to be created and 
+orders to be placed. A product can be included in multiple categories.
 
 ## Docker
 
@@ -26,7 +26,7 @@ and execute the following commands:
 
 [Docker Compose](https://docs.docker.com/compose/install/)
 
-[JDK 17](https://adoptium.net/)
+[AMAZON CORRETTO 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html)
 
 ## Maven 
 
@@ -52,7 +52,7 @@ If Maven isn't installed on your system, the Maven Wrapper can be used by using
 
 ### Prerequisites
 
-[JDK 17](https://adoptium.net/)
+[AMAZON CORRETTO 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html)
 
 ## MySQL
 

checkstyle.xml

@@ -4,5 +4,43 @@
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
+    <module name="TreeWalker">
+        <module name="AvoidStarImport"/>
+        <module name="ConstantName"/>
+        <module name="EmptyBlock"/>
+        <module name="FinalClass"/>
+        <module name="MutableException"/>
+        <module name="FinalLocalVariable"/>
+        <module name="NoFinalizer"/>
+        <module name="FinalParameters" />
+        <module name="IllegalImport"/>
+        <module name="UnusedImports"/>
+        <module name="ConstantName"/>
+        <module name="EmptyBlock"/>
+        <module name="EmptyCatchBlock"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowMultipleEmptyLines" value="false"/>
+            <property name="allowNoEmptyLineBetweenFields" value="false"/>
+            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+        </module>
+        <module name="EmptyStatement"/>
+        <module name="Indentation"/>
+        <module name="TodoComment"/>
+        <module name="GenericWhitespace"/>
+        <module name="MethodParamPad"/>
+        <module name="MethodName"/>
+        <module name="ConstantName"/>
+        <module name="LeftCurly"/>
+    </module>
+    <module name="FileLength">
+        <property name="max" value="1000"/>
+    </module>
+    <module name="LineLength">
+        <property name="fileExtensions" value="java"/>
+        <property name="max" value="130"/>
+        <property name="ignorePattern"
+                  value="^( *\* *([^ ]+|\{@code .*|&lt;a href=&quot;[^&quot;]+&quot;&gt;)|(package|import) .*)$"/>
+    </module>
+    <module name="NewlineAtEndOfFile"/>
 
 </module>

docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
   mysqldb:
     container_name: mysqldb
-    image: mysql:5.7
+    image: mysql:8.0.31
     restart: unless-stopped
     env_file: ./.env
     environment:
@@ -18,14 +18,18 @@ services:
 
   app:
     container_name: rest-api
+    image: answer-king-rest-api_app
+    env_file: ./.env
     depends_on:
       - mysqldb
     build: ./.
     restart: unless-stopped
     ports:
       - "8080:8080"
+      - "5005:5005"
     environment:
       - "SPRING_PROFILES_ACTIVE=docker"
+      - "JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
     volumes:
       - .m2:/root/.m2
 volumes:

init_scripts/schema.sql

@@ -1,28 +1,29 @@
-CREATE TABLE IF NOT EXISTS item (
+CREATE TABLE IF NOT EXISTS product (
     id BIGINT NOT NULL AUTO_INCREMENT,
     name VARCHAR(255) NOT NULL,
     description VARCHAR(255) NOT NULL,
-    available BIT(1) NOT NULL,
+    retired BIT(1) NOT NULL,
     price DECIMAL(12,2) NOT NULL,
 
     PRIMARY KEY (id)
-    );
+);
 
 CREATE TABLE IF NOT EXISTS category (
     id BIGINT NOT NULL AUTO_INCREMENT,
     name VARCHAR(255),
     description VARCHAR(255) NOT NULL,
+    retired BIT(1) NOT NULL,
 
     PRIMARY KEY (id)
 );
 
-CREATE TABLE IF NOT EXISTS item_category (
+CREATE TABLE IF NOT EXISTS product_category (
     id BIGINT NOT NULL AUTO_INCREMENT,
-    item_id INT NOT NULL,
-    category_id INT NOT NULL,
+    product_id BIGINT NOT NULL,
+    category_id BIGINT NOT NULL,
 
-    PRIMARY KEY (Id),
-    FOREIGN KEY (item_id) REFERENCES item(id),
+    PRIMARY KEY (id),
+    FOREIGN KEY (product_id) REFERENCES product(id),
     FOREIGN KEY (category_id) REFERENCES category(id)
 );
 
@@ -34,15 +35,13 @@ CREATE TABLE IF NOT EXISTS `order` (
     PRIMARY KEY (id)
 );
 
-CREATE TABLE IF NOT EXISTS order_item (
+CREATE TABLE IF NOT EXISTS order_product (
     id BIGINT NOT NULL AUTO_INCREMENT,
-    order_id INT NOT NULL,
-    item_id INT NOT NULL,
+    order_id BIGINT NOT NULL,
+    product_id BIGINT NOT NULL,
     quantity INT NOT NULL,
-    PRIMARY KEY (ID),
 
+    PRIMARY KEY (id),
     FOREIGN KEY (order_id) REFERENCES `order`(id),
-    FOREIGN KEY (item_id) REFERENCES item(id)
+    FOREIGN KEY (product_id) REFERENCES product(id)
 );
-
-