Merge pull request #90 from TTBMP/release/v0.12

Release/v0.12
TTBMP · May 29, 2021 · 1183c28 · 1183c28
2 parents f6ed320 + dd085c9
commit 1183c28
Show file tree

Hide file tree

Showing 190 changed files with 1,775 additions and 2,417 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,27 +26,28 @@ jobs:
           --health-timeout=5s
           --health-retries=3
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
       - name: Setup database
         run: |
           mysql --host 127.0.0.1 --port 3306 -uroot < ./service/persistence/src/main/resources/cinemadb.sql
           mysql --host 127.0.0.1 --port 3306 -uroot -e 'call popola();' cinemadb
       - name: Setup Java JDK
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v2.1.0
         with:
+          distribution: 'zulu'
           java-version: 11
       - name: Setup Chrome driver
-        uses: nanasess/setup-chromedriver@master
+        uses: nanasess/setup-chromedriver@v1.0.1
       - name: Cache SonarCloud packages
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v2.1.3
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -57,11 +58,11 @@ jobs:
         run: |
           ./gradlew assemble
           java -jar ./ui/web/build/libs/web.jar &
-          export DISPLAY=:99
           chromedriver --url-base=/wd/hub &
-          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          sudo Xvfb -ac $DISPLAY -screen 0 1920x1080x24 > /dev/null 2>&1 &
           ./gradlew build
           ./gradlew sonarqube
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          DISPLAY: :99
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,6 +10,6 @@ dependencies {
     implementation(project(":service:payment"))
     implementation(project(":service:persistence"))
 
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.2")
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.7.2")
     testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine")
 }
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/CinemaDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/CinemaDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/CustomerDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/CustomerDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/EmployeeDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/EmployeeDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/HallDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/HallDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/MovieDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/MovieDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ProjectionDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/SeatDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ShiftDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/ShiftDataMapper.java
diff --git a/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java b/app/src/main/java/com/ttbmp/cinehub/app/datamapper/TicketDataMapper.java