main 브렌치 최신화

.github/workflows/pr-reminder.yml

@@ -1,13 +1,15 @@
-name: PR Reminder
+  name: PR Reminder
 
-on:
-  schedule:
-    - cron: "0 0,5,8 * * *" # 아침 9시, 오후 2시, 오후 5시에 실행 (UTC 기준으로 설정해서 한국 시간에 맞춤)
-  workflow_dispatch:
+  on:
+    schedule:
+      - cron: "47 23,4,7,8,10 * * *" # 아침 8시 47분, 오후 2시 47분, 오후 4시 47분, 오후 5시 47분, 오후 7시 47분 에 실행 (UTC 기준으로 설정해서 한국 시간에 맞춤)
+    workflow_dispatch:
 
-jobs:
-  call-reusable-reminder:
-    uses: 33-Auto/.github/.github/workflows/reusable-pr-reminder.yml@main
-    secrets:
-      # 해당 시크릿은 조직의 시크릿에 저장되어 있음
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+  jobs:
+    call-reusable-reminder:
+      uses: 33-Auto/.github/.github/workflows/reusable-pr-reminder.yml@main
+      secrets:
+        # 해당 시크릿은 조직의 시크릿에 저장되어 있음
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      with:
+        SLACK_USER_MAP: ${{ vars.SLACK_USER_MAP }}

.github/workflows/trigger_infra.yml

@@ -0,0 +1,20 @@
+name: Trigger Infra CD
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  trigger-infra:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger infra repo deploy workflow
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.ORGANIZATION_TOKEN }}
+          # [중요] 아래 repository 값은 모든 앱이 공유하는 '중앙 인프라 리포지토리' 주소이다.
+          repository: 33-Auto/Sampoom-Management-Infra
+          event-type: deploy
+          # 'Sampoom-Management-Backend-Part'은 스크립트가 동적으로 치환할 자리표시자(placeholder)이다.
+          client-payload: '{"service":"Sampoom-Management-Backend-Part","branch":"main"}'

build.gradle

@@ -35,6 +35,8 @@ dependencies {
 
 	//Swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
+
+	implementation("com.opencsv:opencsv:5.9") // CSV 파싱용
 }
 
 tasks.named('test') {

src/main/java/com/sampoom/factory/api/bom/controller/BomController.java

@@ -0,0 +1,72 @@
+package com.sampoom.factory.api.bom.controller;
+
+import com.sampoom.factory.api.bom.dto.BomDetailResponseDto;
+import com.sampoom.factory.api.bom.dto.BomRequestDto;
+import com.sampoom.factory.api.bom.dto.BomResponseDto;
+import com.sampoom.factory.api.bom.service.BomService;
+import com.sampoom.factory.common.response.ApiResponse;
+import com.sampoom.factory.common.response.PageResponseDto;
+import com.sampoom.factory.common.response.SuccessStatus;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@Tag(name = "BOM", description = "BOM(Bill of Materials) 관련 API 입니다.")
+@RestController
+@RequestMapping("/bom")
+@RequiredArgsConstructor
+public class BomController {
+
+    private final BomService bomService;
+
+    @Operation(summary = "BOM 추가", description = "새로운 BOM을 등록합니다.")
+    @PostMapping
+    public ResponseEntity<ApiResponse<BomResponseDto>> createBom(@RequestBody BomRequestDto requestDto) {
+        return ApiResponse.success(SuccessStatus.CREATED, bomService.createBom(requestDto));
+    }
+
+    @Operation(summary = "BOM 목록 조회", description = "페이징 처리된 BOM 목록을 조회하고, 카테고리나 그룹으로 필터링합니다.")
+    @GetMapping
+    public ResponseEntity<ApiResponse<PageResponseDto<BomResponseDto>>> getBoms(
+            @RequestParam(required = false) Long categoryId,
+            @RequestParam(required = false) Long groupId,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size) {
+        return ApiResponse.success(SuccessStatus.OK, bomService.searchBoms(null, categoryId, groupId, page, size));
+    }
+
+    @Operation(summary = "BOM 상세 조회", description = "특정 BOM의 상세 정보를 조회합니다.")
+    @GetMapping("/{bomId}")
+    public ResponseEntity<ApiResponse<BomDetailResponseDto>> getBomDetail(@PathVariable Long bomId) {
+        return ApiResponse.success(SuccessStatus.OK, bomService.getBomDetail(bomId));
+    }
+
+    @Operation(summary = "BOM 수정", description = "특정 BOM 정보를 수정합니다.")
+    @PutMapping("/{bomId}")
+    public ResponseEntity<ApiResponse<BomResponseDto>> updateBom(
+            @PathVariable Long bomId,
+            @RequestBody BomRequestDto requestDto) {
+        return ApiResponse.success(SuccessStatus.OK, bomService.updateBom(bomId, requestDto));
+    }
+
+    @Operation(summary = "BOM 삭제", description = "특정 BOM을 삭제합니다.")
+    @DeleteMapping("/{bomId}")
+    public ResponseEntity<ApiResponse<Void>> deleteBom(@PathVariable Long bomId) {
+        bomService.deleteBom(bomId);
+        return ApiResponse.success_only(SuccessStatus.OK);
+    }
+
+    @Operation(summary = "BOM 검색", description = "부품 이름 또는 부품 코드로 BOM을 검색하고, 카테고리나 그룹으로 필터링합니다.")
+    @GetMapping("/search")
+    public ResponseEntity<ApiResponse<PageResponseDto<BomResponseDto>>> searchBoms(
+            @RequestParam(required = false) String keyword,
+            @RequestParam(required = false) Long categoryId,
+            @RequestParam(required = false) Long groupId,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size) {
+        return ApiResponse.success(SuccessStatus.OK,
+                bomService.searchBoms(keyword, categoryId, groupId, page, size));
+    }
+}

src/main/java/com/sampoom/factory/api/bom/dto/BomDetailResponseDto.java

@@ -0,0 +1,59 @@
+package com.sampoom.factory.api.bom.dto;
+
+import com.sampoom.factory.api.bom.entity.Bom;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BomDetailResponseDto {
+    private Long id;
+    private String partName;
+    private String partCode;
+    private Long partId;
+    private List<BomMaterialDto> materials;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class BomMaterialDto {
+        private Long id;
+        private Long materialId;
+        private String materialName;
+        private String materialCode;
+        private Long quantity;
+    }
+
+    public static BomDetailResponseDto from(Bom bom) {
+        List<BomMaterialDto> materialDtos = bom.getMaterials().stream()
+                .map(material -> BomMaterialDto.builder()
+                        .id(material.getId())
+                        .materialId(material.getMaterial().getId())
+                        .materialName(material.getMaterial().getName())
+                        .materialCode(material.getMaterial().getCode())
+                        .quantity(material.getQuantity())
+                        .build())
+                .collect(Collectors.toList());
+
+        return BomDetailResponseDto.builder()
+                .id(bom.getId())
+                .partId(bom.getPart().getId())
+                .partName(bom.getPart().getName())
+                .partCode(bom.getPart().getCode())
+                .materials(materialDtos)
+                .createdAt(bom.getCreatedAt())
+                .updatedAt(bom.getUpdatedAt())
+                .build();
+    }
+}

src/main/java/com/sampoom/factory/api/bom/dto/BomMaterialDto.java

@@ -0,0 +1,29 @@
+package com.sampoom.factory.api.bom.dto;
+
+import com.sampoom.factory.api.bom.entity.BomMaterial;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BomMaterialDto {
+    private Long id;              // BomMaterial 엔티티의 ID
+    private Long materialId;      // Material 엔티티의 ID
+    private String materialName;  // 자재명
+    private String materialCode;  // 자재 코드
+    private Long quantity;         // 수량
+
+    public static BomMaterialDto from(BomMaterial material) {
+        return BomMaterialDto.builder()
+                .id(material.getId())
+                .materialId(material.getMaterial().getId())
+                .materialName(material.getMaterial().getName())
+                .materialCode(material.getMaterial().getCode())
+                .quantity(material.getQuantity())
+                .build();
+    }
+}

src/main/java/com/sampoom/factory/api/bom/dto/BomRequestDto.java

@@ -0,0 +1,26 @@
+package com.sampoom.factory.api.bom.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BomRequestDto {
+    private Long partId;
+    private List<BomMaterialDto> materials;
+
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class BomMaterialDto {
+        private Long materialId;
+        private Long quantity;
+    }
+}

src/main/java/com/sampoom/factory/api/bom/dto/BomResponseDto.java

@@ -0,0 +1,40 @@
+package com.sampoom.factory.api.bom.dto;
+
+
+import com.sampoom.factory.api.bom.entity.Bom;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BomResponseDto {
+    private Long id;
+    private String partName;
+    private String partCode;
+    private Long partId;
+    private List<BomMaterialDto> materials;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+
+    public static BomResponseDto from(Bom bom) {
+        return BomResponseDto.builder()
+                .id(bom.getId())
+                .partId(bom.getPart().getId())
+                .partName(bom.getPart().getName())
+                .partCode(bom.getPart().getCode())
+                .materials(bom.getMaterials().stream()
+                        .map(BomMaterialDto::from)
+                        .collect(Collectors.toList()))
+                .createdAt(bom.getCreatedAt())
+                .updatedAt(bom.getUpdatedAt())
+                .build();
+    }
+}

src/main/java/com/sampoom/factory/api/bom/entity/Bom.java

@@ -0,0 +1,47 @@
+package com.sampoom.factory.api.bom.entity;
+
+import com.sampoom.factory.api.part.entity.Part;
+import com.sampoom.factory.common.entitiy.BaseTimeEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "bom")
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class Bom extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "bom_id")
+    private Long id;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "part_id", unique = true)
+    private Part part;
+
+    @OneToMany(mappedBy = "bom", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<BomMaterial> materials = new ArrayList<>();
+
+    public void addMaterial(BomMaterial bomMaterial) {
+        this.materials.add(bomMaterial);
+
+        if (bomMaterial.getBom() != this) {
+            bomMaterial.updateBom(this);
+        }
+    }
+
+    public void touchNow() { this.updatedAt = LocalDateTime.now(); }
+
+
+
+}
+
+

src/main/java/com/sampoom/factory/api/bom/entity/BomMaterial.java

@@ -0,0 +1,38 @@
+package com.sampoom.factory.api.bom.entity;
+
+import com.sampoom.factory.api.material.entity.Material;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Table(name = "bom_material") // 실제 테이블명이 'BOM-자재'가 아니라면 명확히 지정
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+public class BomMaterial {
+
+    @Id
+    @Column(name = "bom_material_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "bom_id", nullable = false)
+    private Bom bom;
+
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "material_id", nullable = false)
+    private Material material;
+
+    private Long quantity;
+
+    public void updateBom(Bom bom) {
+        this.bom = bom;
+    }
+
+
+
+}

src/main/java/com/sampoom/factory/api/bom/repository/BomMaterialRepository.java

@@ -0,0 +1,7 @@
+package com.sampoom.factory.api.bom.repository;
+
+import com.sampoom.factory.api.bom.entity.BomMaterial;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface BomMaterialRepository extends JpaRepository<BomMaterial,Long> {
+}