ci-cd test

.ebextensions/app.config

@@ -0,0 +1,12 @@
+files:
+    "/sbin/appstart" :
+        mode: "000755"
+        owner: webapp
+        group: webapp
+        content: |
+            #!/usr/bin/env bash
+            JAR_PATH=/var/app/current/application.jar
+
+            # run app
+            killall java
+            java -Dfile.encoding=UTF-8 -jar $JAR_PATH

.github/workflows/deploy.yml

@@ -0,0 +1,54 @@
+name: Deploy to ECS
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Build JAR
+        run: ./gradlew build -x test
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Login to ECR
+        uses: aws-actions/amazon-ecr-login@v1
+
+      - name: Build Docker Image
+        run: docker build -t sero-backend .
+
+      - name: Tag Docker Image
+        run: |
+          docker tag sero-backend:latest \
+          ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/sero-backend:latest
+
+      - name: Push Docker Image
+        run: |
+          docker push \
+          ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/sero-backend:latest
+
+      - name: Deploy to ECS
+        run: |
+          aws ecs update-service \
+          --cluster sero-cluster-new \
+          --service sero-task-n-service-ksz4njy2 \
+          --force-new-deployment

.platform/nginx.conf

@@ -0,0 +1,59 @@
+user                    nginx;
+error_log               /var/log/nginx/error.log warn;
+pid                     /var/run/nginx.pid;
+worker_processes        auto;
+worker_rlimit_nofile    33282;
+
+events {
+    use epoll;
+    worker_connections  1024;
+    multi_accept on;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  include       conf.d/*.conf;
+
+  map $http_upgrade $connection_upgrade {
+      default     "upgrade";
+  }
+
+  upstream springboot {
+    server 127.0.0.1:8080;   // 8080번으로 돌고 있는 백엔드 서버를 인지해라!
+    keepalive 1024;
+  }
+
+  server {
+      listen        80 default_server;
+      listen        [::]:80 default_server;
+
+      location / {
+          proxy_pass          http://springboot;
+          proxy_http_version  1.1;
+          proxy_set_header    Connection          $connection_upgrade;
+          proxy_set_header    Upgrade             $http_upgrade;
+
+          proxy_set_header    Host                $host;
+          proxy_set_header    X-Real-IP           $remote_addr;
+          proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;  // 로그분석 (어디서 유입, 차단하고 싶은 사람)
+          proxy_set_header    X-Forwarded-Proto   $scheme;
+          proxy_redirect      off;
+      }
+
+      access_log    /var/log/nginx/access.log main;
+
+      client_header_timeout 60;
+      client_body_timeout   60;
+      keepalive_timeout     60;
+      gzip                  off;
+
+      # Include the Elastic Beanstalk generated locations
+      include conf.d/elasticbeanstalk/healthd.conf;
+  }
+}

Dockerfile

@@ -0,0 +1,9 @@
+FROM eclipse-temurin:17-jre
+
+WORKDIR /app
+
+COPY build/libs/*.jar app.jar
+
+EXPOSE 8080
+
+ENTRYPOINT ["java", "-jar", "app.jar"]

Procfile

@@ -0,0 +1 @@
+web: java -jar application.jar

appspec.yml

@@ -0,0 +1,34 @@
+version: 0.0
+os: linux
+files:
+  - source: /
+    destination: /home/ec2-user/app/
+    overwrite: yes
+
+permissions:
+  - object: /
+    pattern: "**"
+    owner: ec2-user
+    group: ec2-user
+
+hooks:
+  BeforeInstall:
+    - location: scripts/stop.sh
+      timeout: 60
+      runas: ec2-user
+
+  AfterInstall:
+    - location: scripts/set-permissions.sh
+      timeout: 60
+      runas: ec2-user
+
+  ApplicationStart:
+    - location: scripts/start.sh
+      timeout: 120
+      runas: ec2-user
+
+  # ValidateService 임시 비활성화 (디버깅용)
+  # ValidateService:
+  #   - location: scripts/health-check.sh
+  #     timeout: 180
+  #     runas: ec2-user

build.gradle

@@ -27,10 +27,11 @@ repositories {
 dependencies {
     /* Spring boot */
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
     /* Mybatis */
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.5'
-
+./gradlew clean build -x test
     /* JPA */
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
@@ -39,8 +40,8 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok'
 
     /* Database */
-//    runtimeOnly 'com.mysql:mysql-connector-j'
-    runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
+    runtimeOnly 'com.mysql:mysql-connector-j'
+ //   runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 
     /* Swagger OpenAPI */
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14'
@@ -76,4 +77,14 @@ dependencies {
 
 tasks.named('test') {
     useJUnitPlatform()
+}
+
+// plain jar 생성 비활성화 (bootJar만 생성)
+jar {
+    enabled = false
+}
+
+// bootJar 파일명을 application.jar로 설정
+bootJar {
+    archiveFileName = 'application.jar'
 }

settings.gradle

@@ -1 +1,4 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+}
 rootProject.name = 'sero'

src/main/java/com/werp/sero/HealthCheckController.java

@@ -0,0 +1,14 @@
+package com.werp.sero;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HealthCheckController {
+
+    @GetMapping("/")
+    public ResponseEntity<String> health() {
+        return ResponseEntity.ok("OK");
+    }
+}

src/main/java/com/werp/sero/approval/command/application/controller/ApprovalCommandController.java

@@ -26,7 +26,7 @@ public class ApprovalCommandController {
 
     @Operation(summary = "결재 상신")
     @PostMapping(consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-    public ResponseEntity<ApprovalResponseDTO> submitForApproval(@CurrentUser final Employee employee,
+    public ResponseEntity<ApprovalResponseDTO> submitForApproval(@CurrentUser Employee employee,
                                                                  @Valid @RequestPart(name = "requestDTO") final ApprovalCreateRequestDTO requestDTO,
                                                                  @RequestPart(name = "files", required = false) final List<MultipartFile> files) {
         return ResponseEntity.ok(approvalCommandService.submitForApproval(employee, requestDTO, files));

src/main/java/com/werp/sero/approval/command/application/service/ApprovalCommandService.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 public interface ApprovalCommandService {
-    ApprovalResponseDTO submitForApproval(final Employee employee, final ApprovalCreateRequestDTO requestDTO,
+    ApprovalResponseDTO submitForApproval(Employee employee, final ApprovalCreateRequestDTO requestDTO,
                                           final List<MultipartFile> files);
 
     void approve(final Employee employee, final int approvalId, final ApprovalDecisionRequestDTO requestDTO);

src/main/java/com/werp/sero/approval/command/application/service/ApprovalCommandServiceImpl.java

@@ -53,7 +53,7 @@ public class ApprovalCommandServiceImpl implements ApprovalCommandService {
 
     @Transactional
     @Override
-    public ApprovalResponseDTO submitForApproval(final Employee employee, final ApprovalCreateRequestDTO requestDTO,
+    public ApprovalResponseDTO submitForApproval(Employee employee, final ApprovalCreateRequestDTO requestDTO,
                                                  final List<MultipartFile> files) {
         validateDuplicateApproval(requestDTO.getRefCode());
 

src/main/java/com/werp/sero/common/error/exception/BusinessException.java

@@ -15,6 +15,8 @@ public BusinessException(final ErrorCode errorCode) {
     public BusinessException(final ErrorCode errorCode, final String message) {
         super(message);
         this.errorCode = errorCode;
+
+
     }
 
 

src/main/java/com/werp/sero/config/AsyncConfig.java

@@ -7,4 +7,5 @@
 @EnableAsync
 @Configuration
 public class AsyncConfig {
+
 }

src/main/java/com/werp/sero/config/CorsConfig.java

@@ -8,13 +8,24 @@
 
 import java.util.List;
 
+//
 @Configuration
 public class CorsConfig {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
 
-        configuration.setAllowedOrigins(List.of("http://localhost:5173"));
+        configuration.setAllowedOrigins(List.of(
+                "http://localhost:5173",
+                "https://localhost:5173",
+                "http://sero-f-alb-2092902385.ap-northeast-2.elb.amazonaws.com",
+                "https://sero-f-alb-2092902385.ap-northeast-2.elb.amazonaws.com",
+                "https://sero-erp.cloud",
+                "http://sero-erp.cloud",
+                "http://api.sero-erp.cloud",
+                "https://api.sero-erp.cloud"
+        ));
+
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
         configuration.setAllowedHeaders(List.of("*"));
         configuration.setAllowCredentials(true);

src/main/java/com/werp/sero/employee/command/domain/aggregate/Employee.java

@@ -1,5 +1,6 @@
 package com.werp.sero.employee.command.domain.aggregate;
 
+import com.fasterxml.jackson.annotation.JsonIgnore; // [추가] JSON 변환 시 순환참조 방지
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -9,6 +10,7 @@
 @NoArgsConstructor
 @Entity
 public class Employee {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
@@ -43,7 +45,7 @@ public class Employee {
     @Column(name = "created_at", nullable = false)
     private String createdAt;
 
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "dept_id")
     private Department department;
 }

src/main/java/com/werp/sero/employee/command/domain/repository/EmployeeRepository.java

@@ -2,12 +2,14 @@
 
 import com.werp.sero.employee.command.domain.aggregate.Employee;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 import java.util.Optional;
 
 public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
-    Optional<Employee> findByEmailAndStatus(final String email, final String status);
+    @Query("SELECT e FROM Employee e LEFT JOIN FETCH e.department WHERE e.email = :email AND e.status = :status")
+    Optional<Employee> findByEmailAndStatusWithFetchJoin(final String email, final String status);
 
     List<Employee> findByIdIn(final List<Integer> employeeIds);
 }

src/main/java/com/werp/sero/material/query/dto/MaterialListResponseDTO.java

@@ -22,6 +22,7 @@ public class MaterialListResponseDTO {
     private String status;
     private String baseUnit;
     private Long unitPrice;
+    private String imageUrl;
     private int safetyStock;
     private Integer cycleTime;
     private Integer rawMaterialCount;

src/main/java/com/werp/sero/material/query/service/MaterialQueryServiceImpl.java

@@ -8,6 +8,7 @@
 import com.werp.sero.material.query.dto.MaterialListResponseDTO;
 import com.werp.sero.material.query.dto.MaterialWithBomResponseDTO;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,6 +18,7 @@
 /**
  * 자재 Query Service 구현체 (조회 전용)
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -45,7 +47,22 @@ public List<MaterialListResponseDTO> getMaterialList(
         }
 
         // 3. 자재 목록 조회
-        return materialMapper.findByCondition(type, status, keyword);
+        System.out.println("===== DEBUG: Before MyBatis query =====");
+        List<MaterialListResponseDTO> results = materialMapper.findByCondition(type, status, keyword);
+        System.out.println("===== DEBUG: After MyBatis query =====");
+
+        // DEBUG: imageUrl 확인
+        if (!results.isEmpty()) {
+            System.out.println("===== DEBUG: Material imageUrl check =====");
+            System.out.println("First material ID: " + results.get(0).getId());
+            System.out.println("First material name: " + results.get(0).getName());
+            System.out.println("First material imageUrl: " + results.get(0).getImageUrl());
+            System.out.println("First material spec: " + results.get(0).getSpec());
+            System.out.println("First material baseUnit: " + results.get(0).getBaseUnit());
+            System.out.println("==========================================");
+        }
+
+        return results;
     }
 
     @Override