merge: merge test pull request

Author: snowykte0426

.github/workflows/build.yaml

@@ -12,24 +12,26 @@ jobs:
     steps:
       - name: 📂 Checkout Repository
         uses: actions/checkout@v3
-      - name: 📦 Download Artifact
-        uses: actions/download-artifact@v4
-        with:
-          path: build/libs
       - name: 🐋 Docker Build
-        run: docker build -t groom-server:test .
+        run: docker build -t task27:test .
       - name: ⏬ Install Docker Compose
         run: |
           sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           sudo chmod +x /usr/local/bin/docker-compose
           docker-compose --version
-      - name: 🐋 Docker Run
+      - name: 🐋 Docker Run (MySQL & Redis)
         run: docker-compose -f compose.yaml up -d
+      - name: ⌛ Wait for Services
+        run: sleep 30
+      - name: 🐋 Run Task.2-7 Server Container
+        run: docker run --name task27-server --network=compose_default -d -p 8080:8080 task27:test
       - name: ⌛ Wait for Application
         run: sleep 45
+      - name: 🧪 Log Trace
+        run: docker logs task27-server
       - name: 🧪 Test Application
         run: |
-          RESPONSE=$(curl -s "http://127.0.0.1:8080/health/check")
+          RESPONSE=$(curl -s "http://localhost:8080/health/check")
           if [ "$RESPONSE" != "OK" ]; then
             echo "💣 Health Check Failed"
             exit 1

Dockerfile

@@ -1 +1,22 @@
-# Dockerfile을 작성하여주세요
+FROM openjdk:21-jdk-slim AS base
+WORKDIR /app
+RUN apt-get update && apt-get install -y curl unzip zip tzdata \
+    && curl -s https://get.sdkman.io | bash \
+    && /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install gradle"
+ARG TZ=Asia/Seoul
+ENV TZ=${TZ}
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+COPY . /app
+RUN chmod +x ./gradlew
+RUN ./gradlew clean build --no-daemon
+FROM openjdk:21-jdk-slim AS stage-1
+RUN groupadd --system appgroup && useradd --system --gid appgroup appuser
+WORKDIR /app
+COPY --from=base /app/build/libs/task27-0.0.1-SNAPSHOT.jar /app/app.jar
+RUN rm -rf /app/.gradle /app/build/tmp /root/.gradle
+ENV TZ=${TZ}
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+ENV SPRING_PROFILES_ACTIVE=test
+USER appuser
+EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]

compose.yaml

@@ -12,3 +12,6 @@ services:
     image: 'redis:latest'
     ports:
       - '6380:6379'
+networks:
+  default:
+    name: compose_default

src/main/java/com/gsm/_8th/class4/backend/task27/domain/healthcheck/controller/HealthCheckController.java

@@ -1,14 +1,15 @@
 package com.gsm._8th.class4.backend.task27.domain.healthcheck.controller;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/health")
 public class HealthCheckController {
 
-    @RequestMapping("/check")
+    @GetMapping("/check")
     public ResponseEntity<String> check() {
         return ResponseEntity.ok("OK");
     }

src/main/java/com/gsm/_8th/class4/backend/task27/domain/token/service/impl/GetAllTokenServiceImpl.java

@@ -7,7 +7,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -19,8 +21,11 @@ public class GetAllTokenServiceImpl implements GetAllTokenService {
 
     @Override
     public List<Token> getAllToken() {
-        return StreamSupport.stream(tokenRepository.findAll().spliterator(), false)
+        Iterable<TokenEntity> iterable = tokenRepository.findAll();
+        return StreamSupport.stream(iterable.spliterator(), false)
+                .filter(Objects::nonNull)
                 .map(TokenEntity::toDto)
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 }

src/main/resources/application-dev.yml

@@ -0,0 +1,21 @@
+spring:
+  config:
+    activate:
+      on-profile: dev
+  datasource:
+    url: jdbc:mysql://localhost:3306/mydatabase
+    username: myuser
+    password: secret
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: create
+    show-sql: true
+    database-platform: org.hibernate.dialect.MySQLDialect
+    properties:
+      hibernate:
+        format_sql: true
+  data:
+    redis:
+      host: localhost
+      port: 6379

src/main/resources/application-test.yml

@@ -0,0 +1,21 @@
+spring:
+  config:
+    activate:
+      on-profile: test
+  datasource:
+    url: jdbc:mysql://mysql:3306/mydatabase
+    username: myuser
+    password: secret
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  data:
+    redis:
+      host: redis
+      port: 6380
+  jpa:
+    hibernate:
+      ddl-auto: create
+    show-sql: true
+    database-platform: org.hibernate.dialect.MySQLDialect
+    properties:
+      hibernate:
+        format_sql: true

src/main/resources/application.yml

@@ -1,20 +1,5 @@
 spring:
   application:
     name: task27
-  datasource:
-    url: jdbc:mysql://localhost:3306/mydatabase
-    username: myuser
-    password: secret
-    driver-class-name: com.mysql.cj.jdbc.Driver
-  jpa:
-    hibernate:
-      ddl-auto: create
-    show-sql: true
-    database-platform: org.hibernate.dialect.MySQLDialect
-    properties:
-      hibernate:
-        format_sql: true
-  data:
-    redis:
-      host: localhost
-      port: 6379
+    profiles:
+      active: ${SPRING_PROFILES_ACTIVE:dev}

src/test/java/com/gsm/_8th/class4/backend/task27/Task27ApplicationTests.java

@@ -6,8 +6,4 @@
 @SpringBootTest
 class Task27ApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
-
-}
+}